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

[MERGE] forward port of branch saas-6 up to f6eda2c

Browse Source
This commit is contained in:
Christophe Simonis
2016-05-13 12:59:04 +02:00
parent 613ee31f9c f6eda2c350
commit f1659a0dc9
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
@@ -189,7 +189,10 @@
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="pcg_445711"/>
<field name="account_id" ref="pcg_445711"/>
<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="tag_ids" eval="[(6,0,[ref('l10n_fr.tax_20_0')])]"/>
</record>
@@ -256,7 +259,10 @@
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="pcg_44566"/>
<field name="account_id" ref="pcg_44566"/>
<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="tag_ids" eval="[(6,0,[ref('l10n_fr.tax_ACH-20_0')])]"/>
</record>
openerp/tools/misc.py
+1 -1
View File
@@ -504,7 +504,7 @@ ALL_LANGUAGES = {
'lv_LV': u'Latvian / latviešu valoda',
'mk_MK': u'Macedonian / македонски јазик',
'mn_MN': u'Mongolian / монгол',
'my_MY': u'Burmese / မြန်မာဘာသာ',
'my_MM': u'Burmese / မြန်မာဘာသာ',
'nb_NO': u'Norwegian Bokmål / Norsk bokmål',
'nl_NL': u'Dutch / Nederlands',
'nl_BE': u'Dutch (BE) / Nederlands (BE)',