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

[MERGE] forward port of branch 8.0 up to 5e18f5a

Browse Source
This commit is contained in:
Christophe Simonis
2016-05-13 12:54:34 +02:00
parent 19a77d948d 5e18f5a080
commit f6eda2c350
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_fr/fr_tax.xml
+8 -2
View File
@@ -26,7 +26,10 @@
<field name="ref_base_sign" eval="-1"/> <field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_200"/> <field name="ref_tax_code_id" ref="tax_col_200"/>
<field name="ref_tax_sign" eval="-1"/> <field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="10"/> <!-- use sequence="9" instead of sequence="10" to make it
the default tax in the wizard
"Set Your Accounting Options" (wizard.multi.charts.accounts) -->
<field name="sequence" eval="9"/>
<field name="type_tax_use">sale</field> <field name="type_tax_use">sale</field>
</record> </record>
@@ -138,7 +141,10 @@
<field name="ref_base_sign" eval="1"/> <field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_200"/> <field name="ref_tax_code_id" ref="tax_acq_200"/>
<field name="ref_tax_sign" eval="1"/> <field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/> <!-- use sequence="9" instead of sequence="10" to make it
the default tax in the wizard
"Set Your Accounting Options" (wizard.multi.charts.accounts) -->
<field name="sequence" eval="9"/>
<field name="type_tax_use">purchase</field> <field name="type_tax_use">purchase</field>
</record> </record>
openerp/tools/misc.py
+1 -1
View File
@@ -534,7 +534,7 @@ ALL_LANGUAGES = {
'lv_LV': u'Latvian / latviešu valoda', 'lv_LV': u'Latvian / latviešu valoda',
'mk_MK': u'Macedonian / македонски јазик', 'mk_MK': u'Macedonian / македонски јазик',
'mn_MN': u'Mongolian / монгол', 'mn_MN': u'Mongolian / монгол',
'my_MY': u'Burmese / မြန်မာဘာသာ', 'my_MM': u'Burmese / မြန်မာဘာသာ',
'nb_NO': u'Norwegian Bokmål / Norsk bokmål', 'nb_NO': u'Norwegian Bokmål / Norsk bokmål',
'nl_NL': u'Dutch / Nederlands', 'nl_NL': u'Dutch / Nederlands',
'nl_BE': u'Dutch (BE) / Nederlands (BE)', 'nl_BE': u'Dutch (BE) / Nederlands (BE)',