Merge lp:~agilebg/openobject-italia/imp-exclude-from-registries-7.0 into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

Proposed by Lorenzo Battistini
Status: Merged
Merged at revision: 230
Proposed branch: lp:~agilebg/openobject-italia/imp-exclude-from-registries-7.0
Merge into: lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0
Diff against target: 52 lines (+5/-3)
4 files modified
l10n_it_vat_registries/__openerp__.py (+1/-1)
l10n_it_vat_registries/account.py (+1/-0)
l10n_it_vat_registries/account_view.xml (+1/-0)
l10n_it_vat_registries/invoice.py (+2/-2)
To merge this branch: bzr merge lp:~agilebg/openobject-italia/imp-exclude-from-registries-7.0
Reviewer Review Type Date Requested Status
OpenERP Italia core devs Pending
Review via email: mp+197295@code.launchpad.net

Description of the change

Re-implemented removed feature "exclude from registries", usually for withholding tax removal from vat registries

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_it_vat_registries/__openerp__.py'
2--- l10n_it_vat_registries/__openerp__.py 2013-05-03 09:57:03 +0000
3+++ l10n_it_vat_registries/__openerp__.py 2013-12-01 10:11:00 +0000
4@@ -22,7 +22,7 @@
5 ##############################################################################
6 {
7 'name': 'Italian Localisation - VAT Registries',
8- 'version': '0.1',
9+ 'version': '0.2',
10 'category': 'Localisation/Italy',
11 'description': """Accounting reports for Italian localization - VAT Registries\nhttp://wiki.openerp-italia.org/doku.php/moduli/l10n_it_tax_journal""",
12 'author': 'OpenERP Italian Community',
13
14=== modified file 'l10n_it_vat_registries/account.py'
15--- l10n_it_vat_registries/account.py 2013-05-03 10:05:38 +0000
16+++ l10n_it_vat_registries/account.py 2013-12-01 10:11:00 +0000
17@@ -27,4 +27,5 @@
18
19 _columns = {
20 'is_base': fields.boolean('Is base', help="This tax code is used for base amounts (field used by VAT registries)"),
21+ 'exclude_from_registries': fields.boolean('Exclude from VAT registries'),
22 }
23
24=== modified file 'l10n_it_vat_registries/account_view.xml'
25--- l10n_it_vat_registries/account_view.xml 2013-05-03 10:05:38 +0000
26+++ l10n_it_vat_registries/account_view.xml 2013-12-01 10:11:00 +0000
27@@ -8,6 +8,7 @@
28 <field name="arch" type="xml">
29 <field name="sign" position="after">
30 <field name="is_base"/>
31+ <field name="exclude_from_registries"/>
32 </field>
33 </field>
34 </record>
35
36=== modified file 'l10n_it_vat_registries/invoice.py'
37--- l10n_it_vat_registries/invoice.py 2013-11-06 15:08:00 +0000
38+++ l10n_it_vat_registries/invoice.py 2013-12-01 10:11:00 +0000
39@@ -28,11 +28,11 @@
40 _logger = logging.getLogger(__name__)
41
42 class Parser(report_sxw.rml_parse):
43-
44+
45 def _tax_amounts_by_code(self, move):
46 res={}
47 for move_line in move.line_id:
48- if move_line.tax_code_id and move_line.tax_amount:
49+ if move_line.tax_code_id and not move_line.tax_code_id.exclude_from_registries and move_line.tax_amount:
50 if not res.get(move_line.tax_code_id.id):
51 res[move_line.tax_code_id.id] = 0.0
52 self.localcontext['used_tax_codes'][move_line.tax_code_id.id] = True

Subscribers

People subscribed via source and target branches