pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 10.0 up to 45e2ee0a9b

Browse Source
This commit is contained in:
Christophe Simonis
2018-05-22 15:19:10 +02:00
parent cabe0951af 45e2ee0a9b
commit 32a35ccda5
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_cr/data/l10n_cr_state_data.xml
+7 -7
View File
@@ -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>
addons/pos_mercury/static/src/js/pos_mercury.js
+1
View File
@@ -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'];