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

lacagette_addons/pos_meal_voucher/i18n/fr.po

@@ -312,6 +312,9 @@ msgstr "Attention, le montant éligible au paiement par titre restaurant( "
 #, python-format
 msgid " ) is under the amount input ( "
 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
 #, python-format
 msgid "Warning, the input amount of meal voucher is above the maximum amount of "
@@ -337,3 +340,16 @@ msgstr "Le ticket restaurant "
 #, python-format
 msgid " was already used"
 msgstr " a déjà été scanné"
+
+#: 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."
+

lacagette_addons/pos_meal_voucher/static/src/js/models.js

@@ -203,6 +203,10 @@ odoo.define("pos_meal_voucher.models", function (require) {
             return (
                 this.cashregister.journal.meal_voucher_type == "dematerialized") ;
         },
+        is_paper_meal_voucher: function() {
+            return (
+                this.cashregister.journal.meal_voucher_type == "paper") ;
+        },
 
     });
 

lacagette_addons/pos_meal_voucher/static/src/xml/pos_meal_voucher.xml

@@ -78,5 +78,10 @@
             </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>