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
=== modified file 'l10n_it_vat_registries/__openerp__.py'
--- l10n_it_vat_registries/__openerp__.py 2013-05-03 09:57:03 +0000
+++ l10n_it_vat_registries/__openerp__.py 2013-12-01 10:11:00 +0000
@@ -22,7 +22,7 @@
22##############################################################################22##############################################################################
23{23{
24 'name': 'Italian Localisation - VAT Registries',24 'name': 'Italian Localisation - VAT Registries',
25 'version': '0.1',25 'version': '0.2',
26 'category': 'Localisation/Italy',26 'category': 'Localisation/Italy',
27 'description': """Accounting reports for Italian localization - VAT Registries\nhttp://wiki.openerp-italia.org/doku.php/moduli/l10n_it_tax_journal""",27 'description': """Accounting reports for Italian localization - VAT Registries\nhttp://wiki.openerp-italia.org/doku.php/moduli/l10n_it_tax_journal""",
28 'author': 'OpenERP Italian Community',28 'author': 'OpenERP Italian Community',
2929
=== modified file 'l10n_it_vat_registries/account.py'
--- l10n_it_vat_registries/account.py 2013-05-03 10:05:38 +0000
+++ l10n_it_vat_registries/account.py 2013-12-01 10:11:00 +0000
@@ -27,4 +27,5 @@
27 27
28 _columns = {28 _columns = {
29 'is_base': fields.boolean('Is base', help="This tax code is used for base amounts (field used by VAT registries)"),29 'is_base': fields.boolean('Is base', help="This tax code is used for base amounts (field used by VAT registries)"),
30 'exclude_from_registries': fields.boolean('Exclude from VAT registries'),
30 }31 }
3132
=== modified file 'l10n_it_vat_registries/account_view.xml'
--- l10n_it_vat_registries/account_view.xml 2013-05-03 10:05:38 +0000
+++ l10n_it_vat_registries/account_view.xml 2013-12-01 10:11:00 +0000
@@ -8,6 +8,7 @@
8 <field name="arch" type="xml">8 <field name="arch" type="xml">
9 <field name="sign" position="after">9 <field name="sign" position="after">
10 <field name="is_base"/>10 <field name="is_base"/>
11 <field name="exclude_from_registries"/>
11 </field>12 </field>
12 </field>13 </field>
13 </record>14 </record>
1415
=== modified file 'l10n_it_vat_registries/invoice.py'
--- l10n_it_vat_registries/invoice.py 2013-11-06 15:08:00 +0000
+++ l10n_it_vat_registries/invoice.py 2013-12-01 10:11:00 +0000
@@ -28,11 +28,11 @@
28_logger = logging.getLogger(__name__)28_logger = logging.getLogger(__name__)
2929
30class Parser(report_sxw.rml_parse):30class Parser(report_sxw.rml_parse):
31 31
32 def _tax_amounts_by_code(self, move):32 def _tax_amounts_by_code(self, move):
33 res={}33 res={}
34 for move_line in move.line_id:34 for move_line in move.line_id:
35 if move_line.tax_code_id and move_line.tax_amount:35 if move_line.tax_code_id and not move_line.tax_code_id.exclude_from_registries and move_line.tax_amount:
36 if not res.get(move_line.tax_code_id.id):36 if not res.get(move_line.tax_code_id.id):
37 res[move_line.tax_code_id.id] = 0.037 res[move_line.tax_code_id.id] = 0.0
38 self.localcontext['used_tax_codes'][move_line.tax_code_id.id] = True38 self.localcontext['used_tax_codes'][move_line.tax_code_id.id] = True

Subscribers

People subscribed via source and target branches