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

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9529 rev-id: mat@openerp.com-20131018120428-2vdmdm2th8rz57zr 

bzr revid: dle@openerp.com-20131018121236-zp221von16vekthp
This commit is contained in:
Denis Ledoux 2013-10-18 14:12:36 +02:00
parent 77caeeeba5 e66a4b9e2d
commit 1a555475cc
15 changed files with 1119 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/account/__openerp__.py
View File

@ -153,12 +153,11 @@ for a particular financial year and for preparation of vouchers there is a modul
'test/account_period_close.yml',
'test/account_use_model.yml',
'test/account_validate_account_move.yml',
'test/account_fiscalyear_close.yml',
#'test/account_bank_statement.yml',
#'test/account_cash_statement.yml',
'test/test_edi_invoice.yml',
'test/account_report.yml',
'test/account_fiscalyear_close_state.yml', #last test, as it will definitively close the demo fiscalyear
'test/account_fiscalyear_close.yml', #last test, as it will definitively close the demo fiscalyear
],
'installable': True,
'auto_install': False,

3
addons/account/partner.py
View File

@ -113,7 +113,8 @@ class res_partner(osv.osv):
LEFT JOIN account_account a ON (l.account_id=a.id)
WHERE a.type IN ('receivable','payable')
AND l.partner_id IN %s
AND l.reconcile_id IS NULL
AND (l.reconcile_id IS NULL OR
reconcile_id in (SELECT id FROM account_move_reconcile WHERE opening_reconciliation is TRUE))
AND """ + query + """
GROUP BY l.partner_id, a.type
""",

43
addons/account/test/account_fiscalyear_close.yml
View File

@ -17,7 +17,23 @@
fiscalyear_id: account_fiscalyear_fiscalyear0
name: !eval "'OP %s' %(datetime.now().year+1)"
special: 1
-
I create a new account invoice a the partner in current fiscalyear
-
!record {model: account.invoice, id: account_invoice_current1}:
partner_id: base.res_partner_2
invoice_line:
- partner_id: base.res_partner_2
quantity: 1.0
price_unit: 15.00
name: Bying stuff
-
I validate it the invoice
-
!python {model: account.invoice}: |
import netsvc
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.invoice', ref('account.account_invoice_current1'), 'invoice_open', cr)
-
I made modification in journal so it can move entries
-
@ -41,9 +57,30 @@
report_name: End of Fiscal Year Entry
-
I clicked on create Button
-
!python {model: account.fiscalyear.close}: |
self.data_save(cr, uid, [ref("account_fiscalyear_close_0")], {"lang": 'en_US',
"active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close")],
"tz": False, "active_id": ref("account.menu_wizard_fy_close"), })
"tz": False, "active_id": ref("account.menu_wizard_fy_close"), })
-
I close the previous fiscalyear
-
!record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
fy_id: data_fiscalyear
-
I clicked on Close States Button to close fiscalyear
-
!python {model: account.fiscalyear.close.state}: |
self.data_save(cr, uid, [ref("account_fiscalyear_close_state_0")], {"lang": 'en_US',
"active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close_state")],
"tz": False, "active_id": ref("account.menu_wizard_fy_close_state"), })
-
I check that the fiscalyear state is now "Done"
-
!assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}:
- state == 'done'
-
I check that the past accounts are taken into account in partner credit
-
!assert {model: res.partner, id: base.res_partner_2}:
- credit == 15.0, "Total Receivable does not takes unreconciled previous moves"

19
addons/account/test/account_fiscalyear_close_state.yml
View File

@ -1,19 +0,0 @@
-
I run the Close a Fiscalyear wizard to close the demo fiscalyear
-
!record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
fy_id: data_fiscalyear
-
I clicked on Close States Button to close fiscalyear
-
!python {model: account.fiscalyear.close.state}: |
self.data_save(cr, uid, [ref("account_fiscalyear_close_state_0")], {"lang": 'en_US',
"active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close_state")],
"tz": False, "active_id": ref("account.menu_wizard_fy_close_state"), })
-
I check that the fiscalyear state is now "Done"
-
!assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}:
- state == 'done'

1
addons/hr/hr_view.xml
View File

@ -133,6 +133,7 @@
<record model="ir.ui.view" id="hr_kanban_view_employees">
<field name="name">HR - Employess Kanban</field>
<field name="model">hr.employee</field>
<field name="priority">10</field>
<field name="arch" type="xml">
<kanban>
<field name="last_login"/>

143
addons/l10n_fr/fr_fiscal_templates.xml
View File

@ -28,38 +28,53 @@
<!-- Zone Intracommunautaire B2B -->
<!-- ventes -->
<!-- 19,6% -->
<!-- Taux Normal -->
<record id="fp_tax_template_intraeub2b_vt_normale" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_normale" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- 8,5% -->
<record id="fp_tax_template_intraeub2b_vt_normale_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_normale_temp" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- Taux DOM-TOM -->
<record id="fp_tax_template_intraeub2b_vt_specifique" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_specifique" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- 7% -->
<record id="fp_tax_template_intraeub2b_vt_specifique_1" model="account.fiscal.position.tax.template">
<!-- Taux Intermédiaire -->
<record id="fp_tax_template_intraeub2b_vt_intermediaire" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_specifique_1" />
<field name="tax_src_id" ref="tva_intermediaire" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- 5,5% -->
<record id="fp_tax_template_intraeub2b_vt_intermediaire_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_intermediaire_temp" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- Taux réduit -->
<record id="fp_tax_template_intraeub2b_vt_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_reduite" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- 2,1% -->
<record id="fp_tax_template_intraeub2b_vt_reduite_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_reduite_temp" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- Taux super réduit -->
<record id="fp_tax_template_intraeub2b_vt_super_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_super_reduite" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- achats -->
<!-- 19,6% -->
<!-- Taux Normal -->
<record id="fp_tax_template_intraeub2b_ha_normale_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_normale" />
@ -70,7 +85,18 @@
<field name="tax_src_id" ref="tva_acq_normale" />
<field name="tax_dest_id" ref="tva_acq_intra_normale" />
</record>
<!-- 8,5% -->
<record id="fp_tax_template_intraeub2b_ha_normale_deduc_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_normale_temp" />
<field name="tax_dest_id" ref="tva_intra_normale_temp" />
</record>
<record id="fp_tax_template_intraeub2b_ha_normale_acq_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_normale_temp" />
<field name="tax_dest_id" ref="tva_acq_intra_normale_temp" />
</record>
<!-- Taux DOM-TOM -->
<record id="fp_tax_template_intraeub2b_ha_specifique_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_specifique" />
@ -81,18 +107,29 @@
<field name="tax_src_id" ref="tva_acq_specifique" />
<field name="tax_dest_id" ref="tva_acq_intra_specifique" />
</record>
<!-- 7% -->
<record id="fp_tax_template_intraeub2b_ha_specifique_1_deduc" model="account.fiscal.position.tax.template">
<!-- Taux Intermédiaire -->
<record id="fp_tax_template_intraeub2b_ha_intermediaire_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_specifique_1" />
<field name="tax_dest_id" ref="tva_intra_specifique_1" />
<field name="tax_src_id" ref="tva_acq_intermediaire" />
<field name="tax_dest_id" ref="tva_intra_intermediaire" />
</record>
<record id="fp_tax_template_intraeub2b_ha_specifique_1_acq" model="account.fiscal.position.tax.template">
<record id="fp_tax_template_intraeub2b_ha_intermediaire_acq" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_specifique_1" />
<field name="tax_dest_id" ref="tva_acq_intra_specifique_1" />
<field name="tax_src_id" ref="tva_acq_intermediaire" />
<field name="tax_dest_id" ref="tva_acq_intra_intermediaire" />
</record>
<!-- 5,5% -->
<record id="fp_tax_template_intraeub2b_ha_intermediaire_deduc_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_intermediaire_temp" />
<field name="tax_dest_id" ref="tva_intra_intermediaire_temp" />
</record>
<record id="fp_tax_template_intraeub2b_ha_intermediaire_acq_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_intermediaire_temp" />
<field name="tax_dest_id" ref="tva_acq_intra_intermediaire_temp" />
</record>
<!-- Taux réduit -->
<record id="fp_tax_template_intraeub2b_ha_reduite_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_reduite" />
@ -103,7 +140,18 @@
<field name="tax_src_id" ref="tva_acq_reduite" />
<field name="tax_dest_id" ref="tva_acq_intra_reduite" />
</record>
<!-- 2,1% -->
<record id="fp_tax_template_intraeub2b_ha_reduite_deduc_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_reduite_temp" />
<field name="tax_dest_id" ref="tva_intra_reduite_temp" />
</record>
<record id="fp_tax_template_intraeub2b_ha_reduite_acq_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_reduite_temp" />
<field name="tax_dest_id" ref="tva_acq_intra_reduite_temp" />
</record>
<!-- Taux super réduit -->
<record id="fp_tax_template_intraeub2b_ha_super_reduite_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_super_reduite" />
@ -117,31 +165,46 @@
<!-- Import/Export + DOM/TOM -->
<!-- ventes -->
<!-- 19,6% -->
<!-- Taux Normal -->
<record id="fp_tax_template_impexp_vt_normale" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_normale" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 8,5% -->
<record id="fp_tax_template_impexp_vt_normale_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_normale_temp" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- Taux DOM-TOM -->
<record id="fp_tax_template_impexp_vt_specifique" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_specifique" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 7% -->
<record id="fp_tax_template_impexp_vt_specifique_1" model="account.fiscal.position.tax.template">
<!-- Taux Intermédiare -->
<record id="fp_tax_template_impexp_vt_intermediaire" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_specifique_1" />
<field name="tax_src_id" ref="tva_intermediaire" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 5,5% -->
<record id="fp_tax_template_impexp_vt_intermediaire_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_intermediaire_temp" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- Taux Réduit -->
<record id="fp_tax_template_impexp_vt_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_reduite" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 2,1% -->
<record id="fp_tax_template_impexp_vt_reduite_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_reduite_temp" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- Taux super réduit -->
<record id="fp_tax_template_impexp_vt_super_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_super_reduite" />
@ -149,31 +212,47 @@
</record>
<!-- achats -->
<!-- 19,6% -->
<!-- Taux Normal -->
<record id="fp_tax_template_impexp_ha_normale" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_normale" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- 8,5% -->
<record id="fp_tax_template_impexp_ha_normale_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_normale_temp" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- Taux DOM-TOM -->
<record id="fp_tax_template_impexp_ha_specifique" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_specifique" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- 7% -->
<record id="fp_tax_template_impexp_ha_specifique_1" model="account.fiscal.position.tax.template">
<!-- Taux Intermédiare -->
<record id="fp_tax_template_impexp_ha_intermediaire" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_specifique_1" />
<field name="tax_src_id" ref="tva_acq_intermediaire" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- 5,5% -->
<record id="fp_tax_template_impexp_ha_intermediaire_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_intermediaire_temp" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- Taux Réduit -->
<record id="fp_tax_template_impexp_ha_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_reduite" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- 2,1% -->
<record id="fp_tax_template_impexp_ha_reduite_temp" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_reduite_temp" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- Taux super réduit -->
<record id="fp_tax_template_impexp_ha_super_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_super_reduite" />

200
addons/l10n_fr/fr_pcg_taxes.xml
View File

@ -4,11 +4,11 @@
<!--
Définition des Tax Codes
Version du fichier : 07-05-2012
Version du fichier : 30-09-2013
-->
<!--
Tax Code Configuration (version générique)
Tax Code Configuration
-->
<record id="vat_code_chart_root" model="account.tax.code.template">
<field name="name">Plan de Taxes France</field>
@ -20,24 +20,42 @@
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_col_200_ht">
<field name="name">Base H.T. 20.0%</field>
<field name="code">TVA collectée 20.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA collectée 19.6% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
</record>
<record model="account.tax.code.template" id="tax_col_85_ht">
<field name="name">Base H.T. 8.5%</field>
<field name="code">TVA collectée 8.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_100_ht">
<field name="name">Base H.T. 10.0%</field>
<field name="code">TVA collectée 10.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA collectée 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_50_ht">
<field name="name">Base H.T. 5.0%</field>
<field name="code">TVA collectée 5.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA collectée 5.5% (Base H.T.)</field>
@ -57,6 +75,12 @@
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_col_200">
<field name="name">TVA 20.0%</field>
<field name="code">TVA collectée 20.0%</field>
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA collectée 19.6%</field>
@ -68,6 +92,12 @@
<field name="code">TVA collectée 8.5%</field>
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_100">
<field name="name">TVA 10.0%</field>
<field name="code">TVA collectée 10.0%</field>
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_70">
<field name="name">TVA 7.0%</field>
@ -75,6 +105,12 @@
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_50">
<field name="name">TVA 5.0%</field>
<field name="code">TVA collectée 5.0%</field>
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA collectée 5.5%</field>
@ -88,14 +124,18 @@
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_ht">
<field name="name">Base H.T. TVA acquittée</field>
<field name="code">c)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_acq_200_ht">
<field name="name">Base H.T. 20.0%</field>
<field name="code">TVA acquittée 20.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA acquittée 19.6% (Base H.T.)</field>
@ -108,12 +148,24 @@
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_100_ht">
<field name="name">Base H.T. 10.0%</field>
<field name="code">TVA acquittée 10.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA acquittée 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_50_ht">
<field name="name">Base H.T. 5.0%</field>
<field name="code">TVA acquittée 5.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA acquittée 5.5% (Base H.T.)</field>
@ -133,6 +185,12 @@
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_acq_200">
<field name="name">TVA 20.0%</field>
<field name="code">TVA acquittée 20.0%</field>
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA acquittée 19.6%</field>
@ -145,12 +203,24 @@
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_100">
<field name="name">TVA 10.0%</field>
<field name="code">TVA acquittée 10.0%</field>
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_70">
<field name="name">TVA 7.0%</field>
<field name="code">TVA acquittée 7.0%</field>
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_50">
<field name="name">TVA 5.0%</field>
<field name="code">TVA acquittée 5.0%</field>
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA acquittée 5.5%</field>
@ -171,7 +241,13 @@
<field name="code">e)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
</record>
<record model="account.tax.code.template" id="tax_imm_200_ht">
<field name="name">Base H.T. 20.0%</field>
<field name="code">TVA acquittée sur immobilisations 20.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA acquittée sur immobilisations 19.6% (Base H.T.)</field>
@ -184,12 +260,24 @@
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_100_ht">
<field name="name">Base H.T. 10.0%</field>
<field name="code">TVA acquittée sur immobilisations 10.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA acquittée sur immobilisations 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_50_ht">
<field name="name">Base H.T. 5.0%</field>
<field name="code">TVA acquittée sur immobilisations 5.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA acquittée sur immobilisations 5.5% (Base H.T.)</field>
@ -209,7 +297,13 @@
<field name="code">f)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
</record>
<record model="account.tax.code.template" id="tax_imm_200">
<field name="name">TVA 20.0%</field>
<field name="code">TVA acquittée sur immobilisations 20.0%</field>
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA acquittée sur immobilisations 19.6%</field>
@ -222,12 +316,24 @@
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_100">
<field name="name">TVA 10.0%</field>
<field name="code">TVA acquittée sur immobilisations 10.0%</field>
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_70">
<field name="name">TVA 7.0%</field>
<field name="code">TVA acquittée sur immobilisations 7.0%</field>
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_50">
<field name="name">TVA 5.0%</field>
<field name="code">TVA acquittée sur immobilisations 5.0%</field>
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA acquittée sur immobilisations 5.5%</field>
@ -246,7 +352,13 @@
<field name="code">g)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
</record>
<record model="account.tax.code.template" id="tax_intra_200_ht">
<field name="name">Base H.T. 20.0%</field>
<field name="code">TVA due intracommunautaire 20.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA due intracommunautaire 19.6% (Base H.T.)</field>
@ -259,12 +371,24 @@
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_100_ht">
<field name="name">Base H.T. 10.0%</field>
<field name="code">TVA due intracommunautaire 10.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA due intracommunautaire 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_50_ht">
<field name="name">Base H.T. 5.0%</field>
<field name="code">TVA due intracommunautaire 5.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA due intracommunautaire 5.5% (Base H.T.)</field>
@ -283,7 +407,13 @@
<field name="code">h)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
</record>
<record model="account.tax.code.template" id="tax_intra_200">
<field name="name">TVA 20.0%</field>
<field name="code">TVA due intracommunautaire 20.0%</field>
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA due intracommunautaire 19.6%</field>
@ -296,12 +426,24 @@
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_100">
<field name="name">TVA 10.0%</field>
<field name="code">TVA due intracommunautaire 10.0%</field>
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_70">
<field name="name">TVA 7.0%</field>
<field name="code">TVA due intracommunautaire 7.0%</field>
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_50">
<field name="name">TVA 5.0%</field>
<field name="code">TVA due intracommunautaire 5.0%</field>
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA due intracommunautaire 5.5%</field>
@ -321,7 +463,13 @@
<field name="code">i)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_200_ht">
<field name="name">Base H.T. 20.0%</field>
<field name="code">TVA déductible intracommunautaire 20.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA déductible intracommunautaire 19.6% (Base H.T.)</field>
@ -334,12 +482,24 @@
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_100_ht">
<field name="name">Base H.T. 10.0%</field>
<field name="code">TVA déductible intracommunautaire 10.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA déductible intracommunautaire 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_50_ht">
<field name="name">Base H.T. 5.0%</field>
<field name="code">TVA déductible intracommunautaire 5.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA déductible intracommunautaire 5.5% (Base H.T.)</field>
@ -358,7 +518,13 @@
<field name="code">j)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_200">
<field name="name">TVA 20.0%</field>
<field name="code">TVA déductible intracommunautaire 20.0%</field>
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA déductible intracommunautaire 19.6%</field>
@ -371,12 +537,24 @@
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_100">
<field name="name">TVA 10.0%</field>
<field name="code">TVA déductible intracommunautaire 10.0%</field>
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_70">
<field name="name">TVA 7.0%</field>
<field name="code">TVA déductible intracommunautaire 7.0%</field>
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_50">
<field name="name">TVA 5.0%</field>
<field name="code">TVA déductible intracommunautaire 5.0%</field>
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA déductible intracommunautaire 5.5%</field>

419
addons/l10n_fr/fr_tax.xml
View File

@ -9,6 +9,28 @@
<!-- VENTES Tax excluded from price -->
<record model="account.tax.template" id="tva_normale">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 20,0%</field>
<field name="description">20.0</field>
<field name="amount" eval="0.200"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_col_200_ht"/>
<field name="base_sign" eval="1"/>
<field name="tax_code_id" ref="tax_col_200"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445711"/>
<field name="account_paid_id" ref="pcg_445711"/>
<field name="ref_base_code_id" ref="tax_col_200_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_200"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="1"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_normale_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 19,6%</field>
<field name="description">19.6</field>
@ -26,7 +48,7 @@
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_196"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="0"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
@ -52,7 +74,29 @@
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_specifique_1">
<record model="account.tax.template" id="tva_intermediaire">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 10,0%</field>
<field name="description">10.0</field>
<field name="amount" eval="0.10"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_col_100_ht"/>
<field name="base_sign" eval="1"/>
<field name="tax_code_id" ref="tax_col_100"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445712"/>
<field name="account_paid_id" ref="pcg_445712"/>
<field name="ref_base_code_id" ref="tax_col_100_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_100"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_intermediaire_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 7,0%</field>
<field name="description">7.0</field>
@ -63,8 +107,8 @@
<field name="tax_code_id" ref="tax_col_70"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445713"/>
<field name="account_paid_id" ref="pcg_445713"/>
<field name="account_collected_id" ref="pcg_445712"/>
<field name="account_paid_id" ref="pcg_445712"/>
<field name="ref_base_code_id" ref="tax_col_70_ht"/>
<field name="ref_base_sign" eval="-1"/>
@ -75,6 +119,28 @@
</record>
<record model="account.tax.template" id="tva_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 5,0%</field>
<field name="description">5.0</field>
<field name="amount" eval="0.050"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_col_50_ht"/>
<field name="base_sign" eval="1"/>
<field name="tax_code_id" ref="tax_col_50"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445713"/>
<field name="account_paid_id" ref="pcg_445713"/>
<field name="ref_base_code_id" ref="tax_col_50_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_50"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_reduite_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 5,5%</field>
<field name="description">5.5</field>
@ -85,8 +151,8 @@
<field name="tax_code_id" ref="tax_col_55"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445712"/>
<field name="account_paid_id" ref="pcg_445712"/>
<field name="account_collected_id" ref="pcg_445713"/>
<field name="account_paid_id" ref="pcg_445713"/>
<field name="ref_base_code_id" ref="tax_col_55_ht"/>
<field name="ref_base_sign" eval="-1"/>
@ -121,6 +187,28 @@
<!-- ACHATS Tax excluded from price -->
<record model="account.tax.template" id="tva_acq_normale">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 20,0%</field>
<field name="description">ACH-20.0</field>
<field name="amount" eval="0.200"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_200_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_200"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_200_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_200"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="1"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_normale_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 19,6%</field>
<field name="description">ACH-19.6</field>
@ -138,7 +226,7 @@
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_196"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="0"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
@ -164,7 +252,29 @@
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_specifique_1">
<record model="account.tax.template" id="tva_acq_intermediaire">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 10,0%</field>
<field name="description">ACH-10.0</field>
<field name="amount" eval="0.10"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_100_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_100"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_100_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_100"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intermediaire_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 7,0%</field>
<field name="description">ACH-7.0</field>
@ -187,6 +297,28 @@
</record>
<record model="account.tax.template" id="tva_acq_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 5,0%</field>
<field name="description">ACH-5.0</field>
<field name="amount" eval="0.050"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_50_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_50"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_50_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_50"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_reduite_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 5,5%</field>
<field name="description">ACH-5.5</field>
@ -233,6 +365,29 @@
<!-- ACHATS Tax included in price -->
<record model="account.tax.template" id="tva_acq_normale_TTC">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 20,0% TTC</field>
<field name="description">ACH-20.0-TTC</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="0.200"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_200_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_200"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_200_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_200"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_normale_TTC_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 19,6% TTC</field>
<field name="description">ACH-19.6-TTC</field>
@ -278,7 +433,30 @@
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_specifique_1_TTC">
<record model="account.tax.template" id="tva_acq_intermediaire_TTC">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 10,0% TTC</field>
<field name="description">ACH-10.0-TTC</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="0.10"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_100_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_100"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_100_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_100"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intermediaire_TTC_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 7,0% TTC</field>
<field name="description">ACH-7.0-TTC</field>
@ -302,6 +480,29 @@
</record>
<record model="account.tax.template" id="tva_acq_reduite_TTC">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 5,0% TTC</field>
<field name="description">ACH-5.0-TTC</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="0.050"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_50_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_50"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_50_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_50"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_reduite_TTC_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible (achat) 5,5% TTC</field>
<field name="description">ACH-5.5-TTC</field>
@ -351,6 +552,28 @@
<!-- ImmoBILISATIONS (achats) -->
<record model="account.tax.template" id="tva_imm_normale">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd./immobilisation (achat) 20,0%</field>
<field name="description">IMMO-20.0</field>
<field name="amount" eval="0.200"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_imm_200_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_imm_200"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44562"/>
<field name="account_paid_id" ref="pcg_44562"/>
<field name="ref_base_code_id" ref="tax_imm_200_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_imm_200"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_imm_normale_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd./immobilisation (achat) 19,6%</field>
<field name="description">IMMO-19.6</field>
@ -394,7 +617,29 @@
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_imm_specifique_1">
<record model="account.tax.template" id="tva_imm_intermediaire">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd./immobilisation (achat) 10,0%</field>
<field name="description">IMMO-10.0</field>
<field name="amount" eval="0.10"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_imm_100_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_imm_100"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44562"/>
<field name="account_paid_id" ref="pcg_44562"/>
<field name="ref_base_code_id" ref="tax_imm_100_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_imm_100"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_imm_intermediaire_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd./immobilisation (achat) 7,0%</field>
<field name="description">IMMO-7.0</field>
@ -417,6 +662,28 @@
</record>
<record model="account.tax.template" id="tva_imm_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd./immobilisation (achat) 5,0%</field>
<field name="description">IMMO-5.0</field>
<field name="amount" eval="0.050"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_imm_50_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_imm_50"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44562"/>
<field name="account_paid_id" ref="pcg_44562"/>
<field name="ref_base_code_id" ref="tax_imm_50_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_imm_50"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_imm_reduite_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd./immobilisation (achat) 5,5%</field>
<field name="description">IMMO-5.5</field>
@ -463,6 +730,28 @@
<!-- VENTES INTRACOMMUNAUTAIRE -->
<record model="account.tax.template" id="tva_intra_normale">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due s/ acq. intracommunautaire (achat) 20,0%</field> <!-- ventes -->
<field name="description">ACH_UE_due-20.0</field>
<field name="amount" eval="-0.200"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_200_ht"/>
<field name="base_sign" eval="-1" />
<field name="tax_code_id" ref="tax_intra_200"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445201"/>
<field name="account_paid_id" ref="pcg_445201"/>
<field name="ref_base_code_id" ref="tax_intra_200_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_200"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_intra_normale_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due s/ acq. intracommunautaire (achat) 19,6%</field> <!-- ventes -->
<field name="description">ACH_UE_due-19.6</field>
@ -506,7 +795,29 @@
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_intra_specifique_1">
<record model="account.tax.template" id="tva_intra_intermediaire">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due s/ acq. intracommunautaire (achat) 10,0%</field>
<field name="description">ACH_UE_due-10.0</field>
<field name="amount" eval="-0.10"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_100_ht"/>
<field name="base_sign" eval="-1" />
<field name="tax_code_id" ref="tax_intra_100"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445202"/>
<field name="account_paid_id" ref="pcg_445202"/>
<field name="ref_base_code_id" ref="tax_intra_100_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_100"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_intra_intermediaire_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due s/ acq. intracommunautaire (achat) 7,0%</field>
<field name="description">ACH_UE_due-7.0</field>
@ -517,8 +828,8 @@
<field name="tax_code_id" ref="tax_intra_70"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445203"/>
<field name="account_paid_id" ref="pcg_445203"/>
<field name="account_collected_id" ref="pcg_445202"/>
<field name="account_paid_id" ref="pcg_445202"/>
<field name="ref_base_code_id" ref="tax_intra_70_ht"/>
<field name="ref_base_sign" eval="1"/>
@ -529,6 +840,28 @@
</record>
<record model="account.tax.template" id="tva_intra_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due s/ acq. intracommunautaire (achat) 5,0%</field>
<field name="description">ACH_UE_due-5.0</field>
<field name="amount" eval="-0.050"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_50_ht"/>
<field name="base_sign" eval="-1" />
<field name="tax_code_id" ref="tax_intra_50"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445203"/>
<field name="account_paid_id" ref="pcg_445203"/>
<field name="ref_base_code_id" ref="tax_intra_50_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_50"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_intra_reduite_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due s/ acq. intracommunautaire (achat) 5,5%</field>
<field name="description">ACH_UE_due-5.5</field>
@ -539,8 +872,8 @@
<field name="tax_code_id" ref="tax_intra_55"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445202"/>
<field name="account_paid_id" ref="pcg_445202"/>
<field name="account_collected_id" ref="pcg_445203"/>
<field name="account_paid_id" ref="pcg_445203"/>
<field name="ref_base_code_id" ref="tax_intra_55_ht"/>
<field name="ref_base_sign" eval="1"/>
@ -575,6 +908,24 @@
<!-- ACHATS INTRACOMMUNAUTAIRE -->
<record model="account.tax.template" id="tva_acq_intra_normale">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd. s/ acq. intracommunautaire (achat) 20,0%</field>
<field name="description">ACH_UE_ded.-20.0</field>
<field name="amount" eval="0.200"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="tax_intra_acq_200"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_445662"/>
<field name="account_paid_id" ref="pcg_445662"/>
<field name="ref_tax_code_id" ref="tax_intra_acq_200"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intra_normale_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd. s/ acq. intracommunautaire (achat) 19,6%</field>
<field name="description">ACH_UE_ded.-19.6</field>
@ -610,7 +961,25 @@
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intra_specifique_1">
<record model="account.tax.template" id="tva_acq_intra_intermediaire">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd. s/ acq. intracommunautaire (achat) 10,0%</field>
<field name="description">ACH_UE_ded.-10.0</field>
<field name="amount" eval="0.10"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="tax_intra_acq_100"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_445662"/>
<field name="account_paid_id" ref="pcg_445662"/>
<field name="ref_tax_code_id" ref="tax_intra_acq_100"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intra_intermediaire_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd. s/ acq. intracommunautaire (achat) 7,0%</field>
<field name="description">ACH_UE_ded.-7.0</field>
@ -629,6 +998,24 @@
</record>
<record model="account.tax.template" id="tva_acq_intra_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd. s/ acq. intracommunautaire (achat) 5,0%</field>
<field name="description">ACH_UE_ded.-5.0</field>
<field name="amount" eval="0.050"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="tax_intra_acq_50"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_445662"/>
<field name="account_paid_id" ref="pcg_445662"/>
<field name="ref_tax_code_id" ref="tax_intra_acq_50"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intra_reduite_temp">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déd. s/ acq. intracommunautaire (achat) 5,5%</field>
<field name="description">ACH_UE_ded.-5.5</field>

12
addons/l10n_fr/plan_comptable_general.xml
View File

@ -3584,7 +3584,7 @@
</record>
<record id="pcg_445201" model="account.account.template">
<field name="name">TVA due intracommunautaire 19,6%</field>
<field name="name">TVA due intracommunautaire (Taux Normal)</field>
<field name="code">445201</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
@ -3592,7 +3592,7 @@
</record>
<record id="pcg_445202" model="account.account.template">
<field name="name">TVA due intracommunautaire 5,5%</field>
<field name="name">TVA due intracommunautaire (Taux Intermédiaire)</field>
<field name="code">445202</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
@ -3600,7 +3600,7 @@
</record>
<record id="pcg_445203" model="account.account.template">
<field name="name">TVA due intracommunautaire (autre taux)</field>
<field name="name">TVA due intracommunautaire (Autre taux)</field>
<field name="code">445203</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
@ -3712,7 +3712,7 @@
</record>
<record id="pcg_445711" model="account.account.template">
<field name="name">TVA collectée 19,6%</field>
<field name="name">TVA collectée (Taux Normal)</field>
<field name="code">445711</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
@ -3720,7 +3720,7 @@
</record>
<record id="pcg_445712" model="account.account.template">
<field name="name">TVA collectée 5,5%</field>
<field name="name">TVA collectée (Taux Intermédiaire)</field>
<field name="code">445712</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
@ -3728,7 +3728,7 @@
</record>
<record id="pcg_445713" model="account.account.template">
<field name="name">TVA collectée (autre taux)</field>
<field name="name">TVA collectée (Autre taux)</field>
<field name="code">445713</field>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>

3
addons/mrp_repair/mrp_repair.py
View File

@ -517,8 +517,9 @@ class mrp_repair(osv.osv):
'location_dest_id': move.location_dest_id.id,
'tracking_id': False,
'prodlot_id': move.prodlot_id and move.prodlot_id.id or False,
'state': 'done',
'state': 'assigned',
})
move_obj.action_done(cr, uid, [move_id], context=context)
repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context)
if repair.deliver_bool:
pick_name = seq_obj.get(cr, uid, 'stock.picking.out')

2
addons/point_of_sale/point_of_sale.py
View File

@ -271,7 +271,7 @@ class pos_session(osv.osv):
# open if there is no session in 'opening_control', 'opened', 'closing_control' for one user
domain = [
('state', 'not in', ('closed','closing_control')),
('user_id', '=', uid)
('user_id', '=', session.user_id.id)
]
count = self.search_count(cr, uid, domain, context=context)
if count>1:

3
addons/portal_hr_employees/hr_employee_view.xml
View File

@ -33,8 +33,9 @@
</record>
<record model="ir.ui.view" id="portal_hr_kanban_view_employees">
<field name="name">HR - Employees Kanban</field>
<field name="name">HR - Employees Kanban (Portal)</field>
<field name="model">hr.employee</field>
<field name="priority">32</field>
<field name="inherit_id" eval="False"/>
<field name="arch" type="xml">
<kanban create="false">

16
addons/procurement/procurement.py
View File

@ -127,6 +127,22 @@ class procurement_order(osv.osv):
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'procurement.order', context=c)
}
def message_track(self, cr, uid, ids, tracked_fields, initial_values, context=None):
""" Overwrite message_track to avoid tracking more than once the confirm-exception loop
Add '_first_pass_done_' to the note field only the first time stuck in exception state
Will avoid getting furthur confirmed and exception change of state messages
TODO: this hack is necessary for a stable version but should be avoided for the next release.
Instead find a more elegant way to prevent redundant messages or entirely stop tracking states on procurement orders
"""
for proc in self.browse(cr, uid, ids, context=context):
if not proc.note or '_first_pass_done_' not in proc.note or proc.state not in ('confirmed', 'exception'):
super(procurement_order, self).message_track(cr, uid, [proc.id], tracked_fields, initial_values, context=context)
if proc.state == 'exception':
cr.execute("""UPDATE procurement_order set note = CONCAT(note, %s) WHERE id = %s""", ('_first_pass_done_',proc.id))
return True
def unlink(self, cr, uid, ids, context=None):
procurements = self.read(cr, uid, ids, ['state'], context=context)
unlink_ids = []

480
addons/product/product_demo.xml
View File

File diff suppressed because it is too large Load Diff

17
addons/stock/stock.py
View File

@ -401,14 +401,15 @@ class stock_location(osv.osv):
uom_rounding = uom_obj.browse(cr, uid, context.get('uom'), context=context).rounding
locations_ids = self.search(cr, uid, [('location_id', 'child_of', ids)])
# Fetch only the locations in which this product has ever been processed (in or out)
cr.execute("""SELECT l.id FROM stock_location l WHERE l.id in %s AND
EXISTS (SELECT 1 FROM stock_move m WHERE m.product_id = %s
AND ((state = 'done' AND m.location_dest_id = l.id)
OR (state in ('done','assigned') AND m.location_id = l.id)))
""", (tuple(locations_ids), product_id,))
for id in [i for (i,) in cr.fetchall()]:
if locations_ids:
# Fetch only the locations in which this product has ever been processed (in or out)
cr.execute("""SELECT l.id FROM stock_location l WHERE l.id in %s AND
EXISTS (SELECT 1 FROM stock_move m WHERE m.product_id = %s
AND ((state = 'done' AND m.location_dest_id = l.id)
OR (state in ('done','assigned') AND m.location_id = l.id)))
""", (tuple(locations_ids), product_id,))
locations_ids = [i for (i,) in cr.fetchall()]
for id in locations_ids:
if lock:
try:
# Must lock with a separate select query because FOR UPDATE can't be used with