fix: Merge conflicts with master

2023-02-22 17:38:49 +01:00
parent 935870e010 8e5ebc9a1d
commit e1b92e9b04
272 changed files with 91077 additions and 3303 deletions
@@ -576,7 +576,7 @@ Object {
            "note": null,
            "quantity": 1,
            "reason_id": null,
-            "received_quantity": null,
+            "received_quantity": 1,
            "requested_quantity": 1,
            "return_id": Any<String>,
          },
@@ -724,7 +724,7 @@ Object {
        "note": null,
        "quantity": 1,
        "reason_id": null,
-        "received_quantity": null,
+        "received_quantity": 1,
        "requested_quantity": 1,
        "return_id": Any<String>,
      },