Skip to content

Commit 36d15d8

Browse files
ucswiftucswift
authored
Merge pull request #395 from Resgrid/develop
Develop
2 parents 443333f + f844247 commit 36d15d8

38 files changed

Lines changed: 650 additions & 106 deletions

‎Core/Resgrid.Localization/Areas/User/Inventory/Inventory.ar.resx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<data name="AddedOn" xml:space="preserve"><value>أضيف في</value></data>
1111
<data name="AddInventoryTypeButton" xml:space="preserve"><value>إضافة نوع مخزون</value></data>
1212
<data name="AdjustInventory" xml:space="preserve"><value>تعديل المخزون</value></data>
13+
<data name="AdjustmentAmountRequired" xml:space="preserve"><value>يجب تقديم تعديل مخزون غير صفري (العدد/الكمية).</value></data>
1314
<data name="Amount" xml:space="preserve"><value>الكمية</value></data>
1415
<data name="Batch" xml:space="preserve"><value>الدفعة</value></data>
1516
<data name="BatchSerialNumber" xml:space="preserve"><value>الرقم التسلسلي للدفعة</value></data>
@@ -18,6 +19,7 @@
1819
<data name="EditInventoryTypeButton" xml:space="preserve"><value>تعديل نوع المخزون</value></data>
1920
<data name="ForItemsNoExpiry" xml:space="preserve"><value>للعناصر التي لا تنتهي صلاحيتها</value></data>
2021
<data name="Group" xml:space="preserve"><value>المجموعة</value></data>
22+
<data name="InventoryByUnitHeader" xml:space="preserve"><value>المخزون حسب الوحدة</value></data>
2123
<data name="InventoryHistoryHeader" xml:space="preserve"><value>سجل المخزون</value></data>
2224
<data name="InventoryTypesHeader" xml:space="preserve"><value>أنواع المخزون</value></data>
2325
<data name="ItemExpiresDays" xml:space="preserve"><value>تنتهي صلاحية العنصر بعد (أيام)</value></data>

‎Core/Resgrid.Localization/Areas/User/Inventory/Inventory.de.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<data name="AdjustInventoryHeader" xml:space="preserve">
8080
<value>Inventar anpassen</value>
8181
</data>
82+
<data name="AdjustmentAmountRequired" xml:space="preserve">
83+
<value>Sie müssen eine von null abweichende Bestandsanpassung angeben (Anzahl/Menge).</value>
84+
</data>
8285
<data name="Amount" xml:space="preserve">
8386
<value>Menge</value>
8487
</data>
@@ -112,6 +115,9 @@
112115
<data name="Group" xml:space="preserve">
113116
<value>Gruppe</value>
114117
</data>
118+
<data name="InventoryByUnitHeader" xml:space="preserve">
119+
<value>Inventar nach Einheit</value>
120+
</data>
115121
<data name="InventoryHistoryHeader" xml:space="preserve">
116122
<value>Inventarverlauf</value>
117123
</data>

‎Core/Resgrid.Localization/Areas/User/Inventory/Inventory.en.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@
138138
<data name="AdjustInventoryHeader" xml:space="preserve">
139139
<value>Adjust Inventory</value>
140140
</data>
141+
<data name="AdjustmentAmountRequired" xml:space="preserve">
142+
<value>You must supply a non-zero inventory adjustment (count/amount).</value>
143+
</data>
141144
<data name="Amount" xml:space="preserve">
142145
<value>Amount</value>
143146
</data>
@@ -171,6 +174,9 @@
171174
<data name="Group" xml:space="preserve">
172175
<value>Group</value>
173176
</data>
177+
<data name="InventoryByUnitHeader" xml:space="preserve">
178+
<value>Inventory by Unit</value>
179+
</data>
174180
<data name="InventoryHistoryHeader" xml:space="preserve">
175181
<value>Inventory History</value>
176182
</data>

‎Core/Resgrid.Localization/Areas/User/Inventory/Inventory.es.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<data name="AdjustInventoryHeader" xml:space="preserve">
8080
<value>Ajustar inventario</value>
8181
</data>
82+
<data name="AdjustmentAmountRequired" xml:space="preserve">
83+
<value>Debe proporcionar un ajuste de inventario distinto de cero (cantidad).</value>
84+
</data>
8285
<data name="Amount" xml:space="preserve">
8386
<value>Cantidad</value>
8487
</data>
@@ -112,6 +115,9 @@
112115
<data name="Group" xml:space="preserve">
113116
<value>Grupo</value>
114117
</data>
118+
<data name="InventoryByUnitHeader" xml:space="preserve">
119+
<value>Inventario por unidad</value>
120+
</data>
115121
<data name="InventoryHistoryHeader" xml:space="preserve">
116122
<value>Historial de inventario</value>
117123
</data>

‎Core/Resgrid.Localization/Areas/User/Inventory/Inventory.fr.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<data name="AdjustInventoryHeader" xml:space="preserve">
8080
<value>Ajuster l'inventaire</value>
8181
</data>
82+
<data name="AdjustmentAmountRequired" xml:space="preserve">
83+
<value>Vous devez fournir un ajustement d'inventaire non nul (nombre/quantité).</value>
84+
</data>
8285
<data name="Amount" xml:space="preserve">
8386
<value>Quantité</value>
8487
</data>
@@ -112,6 +115,9 @@
112115
<data name="Group" xml:space="preserve">
113116
<value>Groupe</value>
114117
</data>
118+
<data name="InventoryByUnitHeader" xml:space="preserve">
119+
<value>Inventaire par unité</value>
120+
</data>
115121
<data name="InventoryHistoryHeader" xml:space="preserve">
116122
<value>Historique de l'inventaire</value>
117123
</data>

‎Core/Resgrid.Localization/Areas/User/Inventory/Inventory.it.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<data name="AdjustInventoryHeader" xml:space="preserve">
8080
<value>Rettifica inventario</value>
8181
</data>
82+
<data name="AdjustmentAmountRequired" xml:space="preserve">
83+
<value>È necessario fornire una rettifica di inventario diversa da zero (conteggio/quantità).</value>
84+
</data>
8285
<data name="Amount" xml:space="preserve">
8386
<value>Quantità</value>
8487
</data>
@@ -112,6 +115,9 @@
112115
<data name="Group" xml:space="preserve">
113116
<value>Gruppo</value>
114117
</data>
118+
<data name="InventoryByUnitHeader" xml:space="preserve">
119+
<value>Inventario per unità</value>
120+
</data>
115121
<data name="InventoryHistoryHeader" xml:space="preserve">
116122
<value>Cronologia inventario</value>
117123
</data>

‎Core/Resgrid.Localization/Areas/User/Inventory/Inventory.pl.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<data name="AdjustInventoryHeader" xml:space="preserve">
8080
<value>Dostosuj inwentarz</value>
8181
</data>
82+
<data name="AdjustmentAmountRequired" xml:space="preserve">
83+
<value>Musisz podać niezerową korektę stanu magazynowego (liczba/ilość).</value>
84+
</data>
8285
<data name="Amount" xml:space="preserve">
8386
<value>Ilość</value>
8487
</data>
@@ -112,6 +115,9 @@
112115
<data name="Group" xml:space="preserve">
113116
<value>Grupa</value>
114117
</data>
118+
<data name="InventoryByUnitHeader" xml:space="preserve">
119+
<value>Inwentarz według jednostki</value>
120+
</data>
115121
<data name="InventoryHistoryHeader" xml:space="preserve">
116122
<value>Historia inwentarza</value>
117123
</data>

‎Core/Resgrid.Localization/Areas/User/Inventory/Inventory.sv.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<data name="AdjustInventoryHeader" xml:space="preserve">
8080
<value>Justera lager</value>
8181
</data>
82+
<data name="AdjustmentAmountRequired" xml:space="preserve">
83+
<value>Du måste ange en lagerjustering som inte är noll (antal/mängd).</value>
84+
</data>
8285
<data name="Amount" xml:space="preserve">
8386
<value>Antal</value>
8487
</data>
@@ -112,6 +115,9 @@
112115
<data name="Group" xml:space="preserve">
113116
<value>Grupp</value>
114117
</data>
118+
<data name="InventoryByUnitHeader" xml:space="preserve">
119+
<value>Inventering per enhet</value>
120+
</data>
115121
<data name="InventoryHistoryHeader" xml:space="preserve">
116122
<value>Lagerhistorik</value>
117123
</data>

‎Core/Resgrid.Localization/Areas/User/Inventory/Inventory.uk.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<data name="AdjustInventoryHeader" xml:space="preserve">
8080
<value>Коригувати інвентар</value>
8181
</data>
82+
<data name="AdjustmentAmountRequired" xml:space="preserve">
83+
<value>Ви повинні вказати ненульове коригування запасів (кількість).</value>
84+
</data>
8285
<data name="Amount" xml:space="preserve">
8386
<value>Кількість</value>
8487
</data>
@@ -112,6 +115,9 @@
112115
<data name="Group" xml:space="preserve">
113116
<value>Група</value>
114117
</data>
118+
<data name="InventoryByUnitHeader" xml:space="preserve">
119+
<value>Інвентар за підрозділом</value>
120+
</data>
115121
<data name="InventoryHistoryHeader" xml:space="preserve">
116122
<value>Історія інвентарю</value>
117123
</data>

‎Core/Resgrid.Model/Providers/IAuditEventProvider.cs‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)