Commit ae3e4f87 by François C.

Merge branch 'dev_cooperatic' into '2245-made-paper-meal-vouhcer-usable-once'

# Conflicts:
#   lacagette_addons/pos_meal_voucher/i18n/fr.po
#   lacagette_addons/pos_meal_voucher/static/src/js/screens.js
parents 5db467b0 2d9688f3
...@@ -312,6 +312,9 @@ msgstr "Attention, le montant éligible au paiement par titre restaurant( " ...@@ -312,6 +312,9 @@ msgstr "Attention, le montant éligible au paiement par titre restaurant( "
#, python-format #, python-format
msgid " ) is under the amount input ( " msgid " ) is under the amount input ( "
msgstr " ) est inférieur à la valeur du/des ticket(s)( " msgstr " ) est inférieur à la valeur du/des ticket(s)( "
#. module: pos_meal_voucher
#. openerp-web
#: code:addons/pos_meal_voucher/static/src/js/screens.js:110 #: code:addons/pos_meal_voucher/static/src/js/screens.js:110
#, python-format #, python-format
msgid "Warning, the input amount of meal voucher is above the maximum amount of " msgid "Warning, the input amount of meal voucher is above the maximum amount of "
...@@ -336,4 +339,17 @@ msgstr "Le ticket restaurant " ...@@ -336,4 +339,17 @@ msgstr "Le ticket restaurant "
#: code:addons/pos_meal_voucher/static/src/js/screens.js: #: code:addons/pos_meal_voucher/static/src/js/screens.js:
#, python-format #, python-format
msgid " was already used" msgid " was already used"
msgstr " a déjà été scanné" msgstr " a déjà été scanné"
\ No newline at end of file
#: code:addons/pos_meal_voucher/static/src/js/screens.js:196
#, python-format
msgid "Meal Voucher ticket"
msgstr "Chèque restaurant"
#. module: pos_meal_voucher
#. openerp-web
#: code:addons/pos_meal_voucher/static/src/js/screens.js:197
#, python-format
msgid "To add a meal voucher ticket close this window and scan the ticket. If the ticket can't be read please enter the code"
msgstr "Pour ajouter un chèque restaurant merci de fermer cette fenêtre et scanner le chèque. Si le chèque est illisible veuillez rentrer le code à la main."
...@@ -203,6 +203,10 @@ odoo.define("pos_meal_voucher.models", function (require) { ...@@ -203,6 +203,10 @@ odoo.define("pos_meal_voucher.models", function (require) {
return ( return (
this.cashregister.journal.meal_voucher_type == "dematerialized") ; this.cashregister.journal.meal_voucher_type == "dematerialized") ;
}, },
is_paper_meal_voucher: function() {
return (
this.cashregister.journal.meal_voucher_type == "paper") ;
},
}); });
......
...@@ -78,5 +78,10 @@ ...@@ -78,5 +78,10 @@
</t> </t>
</t> </t>
</t> </t>
<t t-extend="TextInputPopupWidget">
<t t-jquery="p.title" t-operation="after">
<p class="body"><t t-esc=" widget.options.body || '' "/></p>
</t>
</t>
</templates> </templates>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment