Merge remote-tracking branch 'upstream/master'

2020-05-29 16:22:13 +06:30
parent f4823d82f8 c4fbb79af0
commit c6628ecae3
27 changed files with 1820 additions and 84 deletions
--- a/assets/local/localization_en.json
+++ b/assets/local/localization_en.json
@@ -493,6 +493,9 @@
    "staff.update":"Update",

    "shipment.title":"Shipments",
-    "shipment.add":"New shipment"
+    "shipment.add":"New shipment",
    
+    "pickup.title": "Pickups",
+    "pickup.new": "New Pickup",
+    "pickup.edit.title": "Pickup"
 }