openobject-italia-core-devs team mailing list archive
-
openobject-italia-core-devs team
-
Mailing list archive
-
Message #01831
[Merge] lp:~agilebg/openobject-italia/imp-exclude-from-registries-7.0 into lp:openobject-italia/7.0
Lorenzo Battistini - Agile BG has proposed merging lp:~agilebg/openobject-italia/imp-exclude-from-registries-7.0 into lp:openobject-italia/7.0.
Requested reviews:
OpenERP Italia core devs (openobject-italia-core-devs)
For more details, see:
https://code.launchpad.net/~agilebg/openobject-italia/imp-exclude-from-registries-7.0/+merge/197295
Re-implemented removed feature "exclude from registries", usually for withholding tax removal from vat registries
--
https://code.launchpad.net/~agilebg/openobject-italia/imp-exclude-from-registries-7.0/+merge/197295
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~agilebg/openobject-italia/imp-exclude-from-registries-7.0 into lp:openobject-italia/7.0.
=== 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 @@
##############################################################################
{
'name': 'Italian Localisation - VAT Registries',
- 'version': '0.1',
+ 'version': '0.2',
'category': 'Localisation/Italy',
'description': """Accounting reports for Italian localization - VAT Registries\nhttp://wiki.openerp-italia.org/doku.php/moduli/l10n_it_tax_journal""",
'author': 'OpenERP Italian Community',
=== 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 @@
_columns = {
'is_base': fields.boolean('Is base', help="This tax code is used for base amounts (field used by VAT registries)"),
+ 'exclude_from_registries': fields.boolean('Exclude from VAT registries'),
}
=== 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 @@
<field name="arch" type="xml">
<field name="sign" position="after">
<field name="is_base"/>
+ <field name="exclude_from_registries"/>
</field>
</field>
</record>
=== 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 @@
_logger = logging.getLogger(__name__)
class Parser(report_sxw.rml_parse):
-
+
def _tax_amounts_by_code(self, move):
res={}
for move_line in move.line_id:
- if move_line.tax_code_id and move_line.tax_amount:
+ if move_line.tax_code_id and not move_line.tax_code_id.exclude_from_registries and move_line.tax_amount:
if not res.get(move_line.tax_code_id.id):
res[move_line.tax_code_id.id] = 0.0
self.localcontext['used_tax_codes'][move_line.tax_code_id.id] = True
Follow ups