Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'Hotfix-BuildFrudis' into develop

Browse Source 
Finish Hotfix-BuildFrudis

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	.idea/runConfigurations/app.xml
This commit is contained in:
Giuseppe Scorrano
2019-09-12 12:45:25 +02:00
parent 565b465462 0cd3d85321
commit e51c8a73ce
16 changed files with 217 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -83,7 +83,9 @@ android {
abortOnError false
}
dynamicFeatures = [":dynamic__base",":dynamic_vgalimenti",":dynamic_ime"]
dynamicFeatures = [":dynamic__base",":dynamic_vgalimenti",":dynamic_ime",":dynamic_frudis"]
}
dependencies {

79
app/src/main/res/values/strings.xml
View File

@@ -1,23 +1,51 @@
<resources>
<plurals name="references">
<item quantity="one">reference</item>
<item quantity="other">references</item>
</plurals>
<plurals name="articles">
<item quantity="one">item</item>
<item quantity="other">items</item>
</plurals>
<plurals name="available_articles">
<item quantity="one">ordered item</item>
<item quantity="other">ordered items</item>
</plurals>
<plurals name="already_registered_lu">
<item quantity="one">already registered LU</item>
<item quantity="other">already registered LUs</item>
</plurals>
<plurals name="loaded_orders_message">
<item quantity="one"><![CDATA[<b>%d</b> order selected]]></item>
<item quantity="other"><![CDATA[<b>%d</b> orders selected]]></item>
</plurals>
<plurals name="pieces">
<item quantity="one">@string/piece</item>
<item quantity="other">pieces</item>
</plurals>
<!-- Generic strings -->
<plurals name="item_package">
<item quantity="one">package</item>
<item quantity="other">packages</item>
</plurals>
<string name="app_name" translatable="false">Integry WMS</string>
<string name="integry" translatable="false">Integry</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="action_settings">Settings</string>
<string name="action_customize_server_settings">Custom company settings</string>
<!-- Generic strings -->
<string name="action_customize_server_settings">Custom company settings</string>
<string name="waiting">Waiting</string>
<string name="loading">Loading</string>
<string name="completed">Completed</string>
<string name="search">Search...</string>
<string name="login">Login</string>
<string name="permission_request_message">Permissions are required for app to work properly</string>
<string name="ord_acq_testata"><![CDATA[#<b>%s</b> of <b>%s</b>]]></string>
<string name="ord_ven_testata"><![CDATA[#<b>%s</b> of <b>%s</b>]]></string>
<string name="ord_ven_testata_data_cons"><![CDATA[Ship <b>%s</b>]]></string>
@@ -43,47 +71,19 @@
<string name="action_create_ul">Create new LU</string>
<string name="action_insert_quantity">Insert quantity</string>
<string name="action_show_created_ul">Show already created LU</string>
<!-- SETTINGS -->
<string name="action_recover_ul">Recover LU</string>
<string name="action_print_ul">Print LU</string>
<string name="action_print">Print</string>
<string name="confirm">Confirm</string>
<string name="hint_additional_notes">Additional notes</string>
<string name="dialog_message_additional_notes">Enter any additional notes in your logistics unit</string>
<string name="logistic_unit">LU</string>
<!-- SETTINGS -->
<string name="general_settings">General settings</string>
<plurals name="references">
<item quantity="one">reference</item>
<item quantity="other">references</item>
</plurals>
<plurals name="articles">
<item quantity="one">item</item>
<item quantity="other">items</item>
</plurals>
<plurals name="available_articles">
<item quantity="one">ordered item</item>
<item quantity="other">ordered items</item>
</plurals>
<plurals name="already_registered_lu">
<item quantity="one">already registered LU</item>
<item quantity="other">already registered LUs</item>
</plurals>
<plurals name="loaded_orders_message">
<item quantity="one"><![CDATA[<b>%d</b> order selected]]></item>
<item quantity="other"><![CDATA[<b>%d</b> orders selected]]></item>
</plurals>
<plurals name="pieces">
<item quantity="one">@string/piece</item>
<item quantity="other">pieces</item>
</plurals>
<plurals name="item_package">
<item quantity="one">package</item>
<item quantity="other">packages</item>
</plurals>
<string name="action_close_ul">Close LU</string>
<string name="already_read_articles">Submitted items</string>
<string name="orders">Orders</string>
@@ -253,6 +253,7 @@
<string name="shipped_on">Shipped %s</string>
<string name="delivered_on">Delivered on %s</string>
<string name="title_dynamic_frudis">Frudis customizations</string>
<string name="batch_lot_not_enabled">Batch lot <b>%s</b> is inactive. Continue?</string>