Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto merge TestMergeBot:13.0-automerge-f342370cab7f8287a81f202863fef9015472952d-13.0 #1164

Merged
merged 13 commits into from
Nov 20, 2019
Merged

Auto merge TestMergeBot:13.0-automerge-f342370cab7f8287a81f202863fef9015472952d-13.0 #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cc3a58c
:book: added note about unsupported module
Oct 23, 2019
56fd878
Update README.rst
Nov 8, 2019
6d78db3
:book: Updated note about unsupported module
Nov 8, 2019
0e856b4
:alien: Update pos_invoice_pay.pot
i18n-bot Nov 19, 2019
dab729d
:alien: Update pos_longpolling.pot
i18n-bot Nov 19, 2019
092b35a
:alien: Update pos_multi_session.pot
i18n-bot Nov 19, 2019
5ef3bbb
:alien: Update pos_multi_session_restaurant.pot
i18n-bot Nov 19, 2019
6795c73
:alien: Update pos_order_cancel.pot
i18n-bot Nov 19, 2019
817a213
:alien: Update pos_product_available.pot
i18n-bot Nov 19, 2019
f7d5194
:alien: Update pos_product_available_negative.pot
i18n-bot Nov 19, 2019
f342370
Merge pull request #1137 from NigmatullinAN/12.0
itpp-bot Nov 19, 2019
78e8140
:x: no need for pos_order_receipt_custom
ilmir-k Nov 20, 2019
10814c1
:peace_symbol: unnecessary pot file
ilmir-k Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions pos_invoice_pay/i18n/pos_invoice_pay.pot
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
142 changes: 0 additions & 142 deletions pos_multi_session_restaurant/i18n/pos_multi_session_restaurant.pot
View file
Open in desktop

This file was deleted.

Loading