openobject-italia-core-devs team mailing list archive
-
openobject-italia-core-devs team
-
Mailing list archive
-
Message #02138
[Merge] lp:~agilebg/openobject-italia/7.0-bug-1295743-elbati into lp:openobject-italia/7.0
Lorenzo Battistini - Agile BG has proposed merging lp:~agilebg/openobject-italia/7.0-bug-1295743-elbati into lp:openobject-italia/7.0.
Requested reviews:
OpenERP Italia core devs (openobject-italia-core-devs)
Related bugs:
Bug #1295743 in OpenERP Italia: "l10n_it_partially_deductible_vat - wrong test"
https://bugs.launchpad.net/openobject-italia/+bug/1295743
For more details, see:
https://code.launchpad.net/~agilebg/openobject-italia/7.0-bug-1295743-elbati/+merge/212211
--
https://code.launchpad.net/~agilebg/openobject-italia/7.0-bug-1295743-elbati/+merge/212211
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~agilebg/openobject-italia/7.0-bug-1295743-elbati into lp:openobject-italia/7.0.
=== modified file 'l10n_it_partially_deductible_vat/__openerp__.py'
--- l10n_it_partially_deductible_vat/__openerp__.py 2013-01-29 22:03:33 +0000
+++ l10n_it_partially_deductible_vat/__openerp__.py 2014-03-21 17:29:36 +0000
@@ -2,9 +2,10 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2011
+# Copyright (C) 2011-2014
# Associazione OpenERP Italia (<http://www.openerp-italia.org>)
-# Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+# Copyright (C) 2012-2014 Agile Business Group sagl
+# (<http://www.agilebg.com>)
# Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
#
# This program is free software: you can redistribute it and/or modify
=== modified file 'l10n_it_partially_deductible_vat/test/account_tax.xml'
--- l10n_it_partially_deductible_vat/test/account_tax.xml 2013-01-08 22:58:30 +0000
+++ l10n_it_partially_deductible_vat/test/account_tax.xml 2014-03-21 17:29:36 +0000
@@ -2,15 +2,42 @@
<openerp>
<data noupdate="1">
+ <record id="tax_code_credit_20" model="account.tax.code">
+ <field name="name">IVA a credito 20%</field>
+ </record>
+
+ <record id="tax_base_code_credit_20" model="account.tax.code">
+ <field name="name">IVA a credito 20% (imponibile)</field>
+ </record>
+
+ <record id="tax_code_credit_20_50" model="account.tax.code">
+ <field name="name">IVA a credito 20% det 50%</field>
+ </record>
+
+ <record id="tax_base_code_credit_20_50" model="account.tax.code">
+ <field name="name">IVA a credito 20% det 50%(imponibile)</field>
+ </record>
+
+ <record id="tax_code_credit_20_10" model="account.tax.code">
+ <field name="name">IVA a credito 20% det 10%</field>
+ </record>
+
+ <record id="tax_base_code_credit_20_10" model="account.tax.code">
+ <field name="name">IVA a credito 20% det 10%(imponibile)</field>
+ </record>
+
<record id="tax_20" model="account.tax">
<field name="name">20 %</field>
<field name="amount">0.2</field>
+ <field name="base_code_id" ref="tax_base_code_credit_20"></field>
+ <field name="tax_code_id" ref="tax_code_credit_20"></field>
</record>
<record id="tax_20I5" model="account.tax">
<field name="name">IVA al 20% detraibile al 50%</field>
<field name="amount">0.2</field>
<field name="child_depend">1</field>
+ <field name="base_code_id" ref="tax_base_code_credit_20_50"></field>
</record>
<record id="tax_20I5b" model="account.tax">
@@ -24,12 +51,14 @@
<field name="amount">0</field>
<field name="type">balance</field>
<field name="parent_id" ref="tax_20I5"></field>
+ <field name="tax_code_id" ref="tax_code_credit_20_50"></field>
</record>
<record id="tax_2010" model="account.tax">
<field name="name">IVA al 20% detraibile al 10%</field>
<field name="amount">0.2</field>
<field name="child_depend">1</field>
+ <field name="base_code_id" ref="tax_base_code_credit_20_10"></field>
</record>
<record id="tax_2010b" model="account.tax">
@@ -43,6 +72,7 @@
<field name="amount">0</field>
<field name="type">balance</field>
<field name="parent_id" ref="tax_2010"></field>
+ <field name="tax_code_id" ref="tax_code_credit_20_10"></field>
</record>
</data>
=== modified file 'l10n_it_partially_deductible_vat/test/tax_computation.yml'
--- l10n_it_partially_deductible_vat/test/tax_computation.yml 2013-01-08 22:58:30 +0000
+++ l10n_it_partially_deductible_vat/test/tax_computation.yml 2014-03-21 17:29:36 +0000
@@ -3,12 +3,9 @@
-
!record {model: account.invoice, id: account_invoice_customer0}:
account_id: account.a_recv
- address_contact_id: base.res_partner_address_zen
- address_invoice_id: base.res_partner_address_zen
company_id: base.main_company
currency_id: base.EUR
date_invoice: !eval time.strftime('%Y-%m-%d')
- vertical_comp: 1
invoice_line:
- account_id: account.a_sale
name: '123.57'
@@ -35,12 +32,9 @@
-
!record {model: account.invoice, id: account_invoice_customer1}:
account_id: account.a_recv
- address_contact_id: base.res_partner_address_zen
- address_invoice_id: base.res_partner_address_zen
company_id: base.main_company
currency_id: base.EUR
date_invoice: !eval time.strftime('%Y-%m-%d')
- vertical_comp: 1
invoice_line:
- account_id: account.a_sale
name: '123.57'
@@ -74,12 +68,9 @@
-
!record {model: account.invoice, id: account_invoice_customer3}:
account_id: account.a_recv
- address_contact_id: base.res_partner_address_zen
- address_invoice_id: base.res_partner_address_zen
company_id: base.main_company
currency_id: base.EUR
date_invoice: !eval time.strftime('%Y-%m-%d')
- vertical_comp: 1
invoice_line:
- account_id: account.a_sale
name: '123.57'
@@ -113,12 +104,9 @@
-
!record {model: account.invoice, id: account_invoice_customer2}:
account_id: account.a_recv
- address_contact_id: base.res_partner_address_zen
- address_invoice_id: base.res_partner_address_zen
company_id: base.main_company
currency_id: base.EUR
date_invoice: !eval time.strftime('%Y-%m-%d')
- vertical_comp: 1
invoice_line:
- account_id: account.a_sale
name: '100.03'
Follow ups