odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] account,account_followup,l10n_{ch,es,pt,us,ve}: correct or remove wrong fields in <record> creation 

bzr revid: chs@openerp.com-20131031184321-2nqqpxowhg03wt4t
This commit is contained in:
Christophe Simonis 2013-10-31 19:43:21 +01:00
parent c1e6ff9445
commit a8eebfe6b4
7 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/data/account_data.xml
View File

@ -16,7 +16,6 @@
</record>
<record id="account_payment_term_line_immediate" model="account.payment.term.line">
<field name="name">Immediate Payment</field>
<field name="value">balance</field>
<field eval="0" name="days"/>
<field eval="0" name="days2"/>

2
addons/account_followup/account_followup_data.xml
View File

@ -162,7 +162,7 @@ ${object.get_followup_table_html() | safe}
<field name="sequence">0</field>
<field name="delay">15</field>
<field name="followup_id" ref="demo_followup1"/>
<field name="send-email">True</field>
<field name="send_email">True</field>
<field name="description">
Dear %(partner_name)s,

3
addons/l10n_ch/sterchi_chart/account.xml
View File

@ -177,14 +177,12 @@
<record model="account.account.type" id="account_type_receivable">
<field name="name">Bilan : Debiteurs</field>
<field name="code">receivable</field>
<field name="partner_account" eval="True"/>
<field name="close_method">unreconciled</field>
<field name="report_type">none</field>
</record>
<record model="account.account.type" id="account_type_payable">
<field name="name">Bilan : Fournisseurs</field>
<field name="code">payable</field>
<field name="partner_account" eval="True"/>
<field name="close_method">unreconciled</field>
<field name="report_type">none</field>
</record>
@ -11809,7 +11807,6 @@
<field name="property_account_income" ref="ch_3200"/>
<field name="property_account_income_opening" ref="ch_2990"/>
<field name="property_account_expense_opening" ref="ch_2990"/>
<field name="property_reserve_and_surplus_account" ref="ch_2991"/>
<field name="code_digits" eval="0"/>
<field name="spoken_languages" eval="'it_IT;de_DE'"/>
</record>

2
addons/l10n_es/taxes_data_assoc.xml
View File

@ -44,7 +44,6 @@
<!-- Exentas IVA -->
<record id="base_assoc_sop_ex" model="account.tax.code.template">
<field name="name">Base adquisiciones exentas</field>
<field name="company_id" model="res.company" search="[]"/>
<field name="parent_id" ref="vat_code_chart_assoc_root"/>
<field name="code">--</field>
<field name="sign">1.0</field>
@ -53,7 +52,6 @@
<record id="base_assoc_rep_ex" model="account.tax.code.template">
<field name="name">Base ventas exentas</field>
<field name="code">--</field>
<field name="company_id" model="res.company" search="[]"/>
<field name="parent_id" ref="vat_code_chart_assoc_root"/>
<field name="sign">1.0</field>
</record>

1
addons/l10n_pt/account_chart_template.xml
View File

@ -15,7 +15,6 @@
<field name="property_account_income" ref="chart_711"/>
<field name="property_account_income_categ" ref="chart_711"/>
<field name="property_account_expense_categ" ref="chart_311"/>
<field name="property_reserve_and_surplus_account" ref="chart_811"/>
</record>
<record id="pt_chart_template_value" model="ir.values">
<field name="name">Portugal - Template do Plano de Contas SNC</field>

9
addons/l10n_us/account_chart_template.xml
View File

@ -6,7 +6,6 @@
<field name="name">Basic Chart of Account</field>
<field name="visible" eval="False" />
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_basic_value" model="ir.values">
<field name="name">Basic Chart of Account</field>
@ -20,7 +19,6 @@
<field name="name">Cost of Goods sold</field>
<field name="visible" eval="False" />
<field name="parent_id" ref="account_chart_template_basic"/>
<field name="currency_id" ref="base.USD"/>
<field name="complete_tax_set" eval="False" />
</record>
<record id="account_chart_template_cogs_value" model="ir.values">
@ -34,7 +32,6 @@
<record id="account_chart_template_advertising" model="account.chart.template">
<field name="name">Advertising</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_cogs"/>
</record>
<record id="account_chart_template_advertising_value" model="ir.values">
@ -48,7 +45,6 @@
<record id="account_chart_template_agriculture" model="account.chart.template">
<field name="name">Agriculture</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_basic"/>
</record>
<record id="account_chart_template_agriculture_value" model="ir.values">
@ -62,7 +58,6 @@
<record id="account_chart_template_construction" model="account.chart.template">
<field name="name">Construction Trades (Plumber, Electrician, HVAC, etc.)</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_cogs"/>
</record>
<record id="account_chart_template_construction_value" model="ir.values">
@ -76,7 +71,6 @@
<record id="account_chart_template_financial_service" model="account.chart.template">
<field name="name">Financial Services other than Accounting or Bookkeeping</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_cogs"/>
</record>
<record id="account_chart_template_financial_service_value" model="ir.values">
@ -90,7 +84,6 @@
<record id="account_chart_template_general_service" model="account.chart.template">
<field name="name">General Service-Based Business</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_cogs"/>
</record>
<record id="account_chart_template_general_service_value" model="ir.values">
@ -104,7 +97,6 @@
<record id="account_chart_template_legal_service" model="account.chart.template">
<field name="name">Legal Services</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_basic"/>
</record>
<record id="account_chart_template_legal_service_value" model="ir.values">
@ -118,7 +110,6 @@
<record id="account_chart_template_general_product" model="account.chart.template">
<field name="name">General Product-Based Business</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_basic"/>
</record>
<record id="account_chart_template_general_product_value" model="ir.values">

28
addons/l10n_ve/data/account_tax.xml
View File

@ -7,8 +7,8 @@
<field name="amount">0.00000</field>
<field name="type">percent</field>
<field name="type_tax_use">all</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="account_collected_id" ref="account_activa_account_2172003"/>
<field name="account_paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -21,8 +21,8 @@
<field name="amount">0.120000</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="account_collected_id" ref="account_activa_account_2172003"/>
<field name="account_paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -34,8 +34,8 @@
<field name="amount">0.080000</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="account_collected_id" ref="account_activa_account_2172003"/>
<field name="account_paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -47,8 +47,8 @@
<field name="amount">0.220000</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="account_collected_id" ref="account_activa_account_2172003"/>
<field name="account_paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -60,8 +60,8 @@
<field name="amount">0.120000</field>
<field name="type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="collected_id" ref="account_activa_account_1151004"/>
<field name="paid_id" ref="account_activa_account_1151004"/>
<field name="account_collected_id" ref="account_activa_account_1151004"/>
<field name="account_paid_id" ref="account_activa_account_1151004"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -73,8 +73,8 @@
<field name="amount">0.080000</field>
<field name="type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="collected_id" ref="account_activa_account_1151004"/>
<field name="paid_id" ref="account_activa_account_1151004"/>
<field name="account_collected_id" ref="account_activa_account_1151004"/>
<field name="account_paid_id" ref="account_activa_account_1151004"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -86,8 +86,8 @@
<field name="amount">0.220000</field>
<field name="type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="collected_id" ref="account_activa_account_1151004"/>
<field name="paid_id" ref="account_activa_account_1151004"/>
<field name="account_collected_id" ref="account_activa_account_1151004"/>
<field name="account_paid_id" ref="account_activa_account_1151004"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>