[MERGE] forward port branch 10.0 up to 45e2ee0a9b4

2 files changed, 8 insertions, 7 deletions

diff --git a/addons/l10n_cr/data/l10n_cr_state_data.xml b/addons/l10n_cr/data/l10n_cr_state_data.xml
index 3c523f44634..3271193c42d 100644
--- a/addons/l10n_cr/data/l10n_cr_state_data.xml
+++ b/addons/l10n_cr/data/l10n_cr_state_data.xml
@@ -5,37 +5,37 @@
         Update states
         -->
         <record id="state_SJ" model="res.country.state">
-            <field name="code">SJ</field>
+            <field name="code">CR-SJ</field>
             <field name="name">San Jos&#233;</field>
             <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_A" model="res.country.state">
-            <field name="code">A</field>
+            <field name="code">CR-A</field>
             <field name="name">Alajuela</field>
             <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_H" model="res.country.state">
-            <field name="code">H</field>
+            <field name="code">CR-H</field>
             <field name="name">Heredia</field>
             <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_C" model="res.country.state">
-            <field name="code">C</field>
+            <field name="code">CR-C</field>
             <field name="name">Cartago</field>
             <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_P" model="res.country.state">
-            <field name="code">P</field>
+            <field name="code">CR-P</field>
             <field name="name">Puntarenas</field>
             <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_G" model="res.country.state">
-            <field name="code">G</field>
+            <field name="code">CR-G</field>
             <field name="name">Guanacaste</field>
             <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_L" model="res.country.state">
-            <field name="code">L</field>
+            <field name="code">CR-L</field>
             <field name="name">Lim&#243;n</field>
             <field name="country_id" ref="base.cr"/>
         </record>
diff --git a/addons/pos_mercury/static/src/js/pos_mercury.js b/addons/pos_mercury/static/src/js/pos_mercury.js
index 3a1f47b5ee2..b284237a496 100644
--- a/addons/pos_mercury/static/src/js/pos_mercury.js
+++ b/addons/pos_mercury/static/src/js/pos_mercury.js
@@ -440,6 +440,7 @@ PaymentScreenWidget.include({
                     order.selected_paymentline.paid = true;
                     order.selected_paymentline.mercury_swipe_pending = false;
                     order.selected_paymentline.mercury_amount = response.authorize;
+                    order.selected_paymentline.set_amount(response.authorize);
                     order.selected_paymentline.mercury_card_number = decodedMagtek['number'];
                     order.selected_paymentline.mercury_card_brand = response.card_type;
                     order.selected_paymentline.mercury_card_owner_name = decodedMagtek['name'];