Skip to content

Commit

Permalink
Merge pull request #1164 from TestMergeBot/13.0-automerge-f342370cab7…
Browse files Browse the repository at this point in the history 
…f8287a81f202863fef9015472952d

commit is created by 👷‍♂️ Merge Bot: https://odoo-devops.readthedocs.io/en/latest/git/github-merge-bot.html
  • Loading branch information
@itpp-bot
itpp-bot authored Nov 20, 2019
2 parents 39a463d + 10814c1 commit 9a1e6ab
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 43 deletions.
30 changes: 15 additions & 15 deletions pos_invoice_pay/i18n/pos_invoice_pay.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:894
#: code:addons/pos_invoice_pay/static/src/js/main.js:893
#, python-format
msgid "Can't validate selected invoice."
msgstr ""
Expand Down Expand Up @@ -98,8 +98,8 @@ msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:529
#: code:addons/pos_invoice_pay/static/src/js/main.js:557
#: code:addons/pos_invoice_pay/static/src/js/main.js:528
#: code:addons/pos_invoice_pay/static/src/js/main.js:556
#, python-format
msgid "Change Cashier"
msgstr ""
Expand Down Expand Up @@ -192,14 +192,14 @@ msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:893
#: code:addons/pos_invoice_pay/static/src/js/main.js:892
#, python-format
msgid "Error"
msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:1045
#: code:addons/pos_invoice_pay/static/src/js/main.js:1044
#, python-format
msgid "Excessive payment amount."
msgstr ""
Expand Down Expand Up @@ -249,7 +249,7 @@ msgid "Invoice No"
msgstr ""

#. module: pos_invoice_pay
#: code:addons/pos_invoice_pay/models.py:185
#: code:addons/pos_invoice_pay/models.py:181
#: model:ir.model.fields,field_description:pos_invoice_pay.field_pos_session__session_payments
#, python-format
msgid "Invoice Payments"
Expand Down Expand Up @@ -283,8 +283,8 @@ msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:743
#: code:addons/pos_invoice_pay/static/src/js/main.js:903
#: code:addons/pos_invoice_pay/static/src/js/main.js:742
#: code:addons/pos_invoice_pay/static/src/js/main.js:902
#, python-format
msgid "No invoice"
msgstr ""
Expand Down Expand Up @@ -560,8 +560,8 @@ msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:744
#: code:addons/pos_invoice_pay/static/src/js/main.js:904
#: code:addons/pos_invoice_pay/static/src/js/main.js:743
#: code:addons/pos_invoice_pay/static/src/js/main.js:903
#, python-format
msgid "There must be invoice selected."
msgstr ""
Expand Down Expand Up @@ -633,35 +633,35 @@ msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:1067
#: code:addons/pos_invoice_pay/static/src/js/main.js:1066
#, python-format
msgid "Wrong payment amount."
msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:1046
#: code:addons/pos_invoice_pay/static/src/js/main.js:1045
#, python-format
msgid "You can not validate the order with a change because difference account is not set. Please enter the exact payment amount."
msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:1060
#: code:addons/pos_invoice_pay/static/src/js/main.js:1059
#, python-format
msgid "You can not validate the order with zero payment amount."
msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:1068
#: code:addons/pos_invoice_pay/static/src/js/main.js:1067
#, python-format
msgid "You can only create positive payments."
msgstr ""

#. module: pos_invoice_pay
#. openerp-web
#: code:addons/pos_invoice_pay/static/src/js/main.js:1059
#: code:addons/pos_invoice_pay/static/src/js/main.js:1058
#, python-format
msgid "Zero payment amount."
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions pos_longpolling/i18n/pos_longpolling.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ msgstr ""

#. module: pos_longpolling
#. openerp-web
#: code:addons/pos_longpolling/static/src/js/longpolling.js:115
#: code:addons/pos_longpolling/static/src/js/longpolling.js:116
#: code:addons/pos_longpolling/static/src/js/PosConnection.js:115
#: code:addons/pos_longpolling/static/src/js/PosConnection.js:116
#, python-format
msgid "Longpolling Handling Error"
msgstr ""
Expand Down
8 changes: 4 additions & 4 deletions pos_multi_session/i18n/pos_multi_session.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ msgstr ""

#. module: pos_multi_session
#. openerp-web
#: code:addons/pos_multi_session/static/src/js/pos_multi_session.js:1065
#: code:addons/pos_multi_session/static/src/js/pos_multi_session.js:1069
#, python-format
msgid "No connection to the server."
msgstr ""
Expand Down Expand Up @@ -324,7 +324,7 @@ msgstr ""

#. module: pos_multi_session
#. openerp-web
#: code:addons/pos_multi_session/static/src/js/pos_multi_session.js:169
#: code:addons/pos_multi_session/static/src/js/pos_multi_session.js:167
#, python-format
msgid "Sync Orders"
msgstr ""
Expand All @@ -337,7 +337,7 @@ msgstr ""

#. module: pos_multi_session
#. openerp-web
#: code:addons/pos_multi_session/static/src/js/pos_multi_session.js:971
#: code:addons/pos_multi_session/static/src/js/pos_multi_session.js:975
#, python-format
msgid "There is a conflict during synchronization, try your action again"
msgstr ""
Expand All @@ -354,7 +354,7 @@ msgstr ""

#. module: pos_multi_session
#. openerp-web
#: code:addons/pos_multi_session/static/src/js/pos_multi_session.js:1022
#: code:addons/pos_multi_session/static/src/js/pos_multi_session.js:1026
#, python-format
msgid "Warning"
msgstr ""
Expand Down
28 changes: 14 additions & 14 deletions pos_order_cancel/i18n/pos_order_cancel.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/js/widgets.js:316
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:63
#: code:addons/pos_order_cancel/static/src/js/widgets.js:321
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:66
#, python-format
msgid "Apply"
msgstr ""
Expand All @@ -53,15 +53,15 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:35
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:59
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:38
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:62
#, python-format
msgid "Cancel"
msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:95
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:98
#, python-format
msgid "Cancel by"
msgstr ""
Expand Down Expand Up @@ -97,7 +97,7 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/js/widgets.js:83
#: code:addons/pos_order_cancel/static/src/js/widgets.js:88
#, python-format
msgid "Cancellation Reason"
msgstr ""
Expand Down Expand Up @@ -198,7 +198,7 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/js/widgets.js:222
#: code:addons/pos_order_cancel/static/src/js/widgets.js:227
#, python-format
msgid "Indicate the reason for cancellation."
msgstr ""
Expand Down Expand Up @@ -243,7 +243,7 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:76
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:79
#, python-format
msgid "Name"
msgstr ""
Expand All @@ -260,7 +260,7 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:39
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:42
#, python-format
msgid "Ok"
msgstr ""
Expand All @@ -277,7 +277,7 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/js/models.js:37
#: code:addons/pos_order_cancel/static/src/js/models.js:41
#, python-format
msgid "Order Deleting"
msgstr ""
Expand All @@ -294,7 +294,7 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:24
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:27
#, python-format
msgid "Other"
msgstr ""
Expand Down Expand Up @@ -351,15 +351,15 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/js/widgets.js:123
#: code:addons/pos_order_cancel/static/src/js/widgets.js:128
#, python-format
msgid "Quantity for Cancellation"
msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:9
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:12
#: code:addons/pos_order_cancel/static/src/xml/cancel_order.xml:15
#: model:ir.model.fields,field_description:pos_order_cancel.field_pos_cancelled_reason__name
#, python-format
msgid "Reason"
Expand Down Expand Up @@ -476,7 +476,7 @@ msgstr ""

#. module: pos_order_cancel
#. openerp-web
#: code:addons/pos_order_cancel/static/src/js/widgets.js:221
#: code:addons/pos_order_cancel/static/src/js/widgets.js:226
#, python-format
msgid "Warning"
msgstr ""
Expand Down
14 changes: 7 additions & 7 deletions pos_product_available/i18n/pos_product_available.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ msgstr ""
msgid "Open the payment screen"
msgstr ""

#. module: pos_product_available
#: model:ir.model,name:pos_product_available.model_pos_config
msgid "Point of Sale Configuration"
msgstr ""

#. module: pos_product_available
#. openerp-web
#: code:addons/pos_product_available/static/src/js/test_pos_quantities.js:87
Expand All @@ -65,17 +70,12 @@ msgid "Ready to launch your <b>point of sale</b>? <i>Click here</i>."
msgstr ""

#. module: pos_product_available
#: model:ir.model.fields,field_description:pos_product_available.field_pos_config_show_qtys
#: model:ir.model.fields,field_description:pos_product_available.field_pos_config__show_qtys
msgid "Show Product Qtys"
msgstr ""

#. module: pos_product_available
#: model:ir.model.fields,help:pos_product_available.field_pos_config_show_qtys
#: model:ir.model.fields,help:pos_product_available.field_pos_config__show_qtys
msgid "Show Product Qtys in POS"
msgstr ""

#. module: pos_product_available
#: model:ir.model,name:pos_product_available.model_pos_config
msgid "pos.config"
msgstr ""

41 changes: 40 additions & 1 deletion pos_product_available_negative/i18n/pos_product_available_negative.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ msgstr ""
msgid "<p>Click to start the point of sale interface. It <b>runs on tablets</b>, laptops, or industrial hardware.</p><p>Once the session launched, the system continues to run without an internet connection.</p>"
msgstr ""

#. module: pos_product_available_negative
#: model:ir.model.fields,help:pos_product_available_negative.field_pos_config__negative_order_manager_permission
msgid "Ask Managers Permission to proceed order with negative stock products"
msgstr ""

#. module: pos_product_available_negative
#. openerp-web
#: code:addons/pos_product_available_negative/static/src/js/test_pos_negative_qtys.js:57
Expand All @@ -32,6 +37,18 @@ msgstr ""
msgid "Group allows to sell products which are out of a stock."
msgstr ""

#. module: pos_product_available_negative
#. openerp-web
#: code:addons/pos_product_available_negative/static/src/js/pos.js:70
#, python-format
msgid "It's unavailable to add the product"
msgstr ""

#. module: pos_product_available_negative
#: model:ir.model.fields,field_description:pos_product_available_negative.field_pos_config__negative_order_manager_permission
msgid "Managers Permission"
msgstr ""

#. module: pos_product_available_negative
#: model:ir.model.fields,field_description:pos_product_available_negative.field_pos_config__negative_order_group_id
msgid "Negative Order Group"
Expand All @@ -51,11 +68,16 @@ msgstr ""

#. module: pos_product_available_negative
#. openerp-web
#: code:addons/pos_product_available_negative/static/src/js/pos.js:24
#: code:addons/pos_product_available_negative/static/src/js/pos.js:27
#, python-format
msgid "Order has out-of-stock product and must be approved by supervisor"
msgstr ""

#. module: pos_product_available_negative
#: model_terms:ir.ui.view,arch_db:pos_product_available_negative.view_pos_product_available_negative_config_form
msgid "Out of Stock Products"
msgstr ""

#. module: pos_product_available_negative
#: model:ir.model.fields,help:pos_product_available_negative.field_pos_order__negative_stock_user_id
msgid "Person who authorized a sale with a product which is out of a stock"
Expand All @@ -79,6 +101,23 @@ msgstr ""
msgid "Ready to launch your <b>point of sale</b>? <i>Click here</i>."
msgstr ""

#. module: pos_product_available_negative
#: model:ir.model.fields,field_description:pos_product_available_negative.field_pos_config__negative_order_warning
msgid "Show Warning"
msgstr ""

#. module: pos_product_available_negative
#: model:ir.model.fields,help:pos_product_available_negative.field_pos_config__negative_order_warning
msgid "Show Warning on adding out of stock products"
msgstr ""

#. module: pos_product_available_negative
#. openerp-web
#: code:addons/pos_product_available_negative/static/src/js/pos.js:69
#, python-format
msgid "The product is out of stock"
msgstr ""

#. module: pos_product_available_negative
#. openerp-web
#: code:addons/pos_product_available_negative/static/src/js/test_pos_negative_qtys.js:72
Expand Down

0 comments on commit 9a1e6ab

Please sign in to comment.