Merge lp:~elbati/openobject-italia/fix-bug-1174751-7 into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

Proposed by Lorenzo Battistini
Status: Merged
Merged at revision: 214
Proposed branch: lp:~elbati/openobject-italia/fix-bug-1174751-7
Merge into: lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0
Diff against target: 38 lines (+4/-2)
3 files modified
l10n_it_vat_registries/invoice.py (+2/-0)
l10n_it_vat_registries/templates/registro_iva_acquisti.mako (+1/-1)
l10n_it_vat_registries/templates/registro_iva_vendite.mako (+1/-1)
To merge this branch: bzr merge lp:~elbati/openobject-italia/fix-bug-1174751-7
Reviewer Review Type Date Requested Status
OpenERP Italia core devs Pending
Review via email: mp+161601@code.launchpad.net
To post a comment you must log in.
212. By Lorenzo Battistini

[fix] using move date when missing invoice date

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_it_vat_registries/invoice.py'
--- l10n_it_vat_registries/invoice.py 2013-04-24 10:14:49 +0000
+++ l10n_it_vat_registries/invoice.py 2013-04-30 13:33:29 +0000
@@ -154,6 +154,8 @@
154 str_non_deductible or '',154 str_non_deductible or '',
155 'index': index,155 'index': index,
156 'amount_total': invoice_amount_total,156 'amount_total': invoice_amount_total,
157 'invoice_date': (move_line.invoice and move_line.invoice.date_invoice
158 or move_line.date or ''),
157 }159 }
158 res.append(tax_item)160 res.append(tax_item)
159 iva = cur_pool.round(161 iva = cur_pool.round(
160162
=== modified file 'l10n_it_vat_registries/templates/registro_iva_acquisti.mako'
--- l10n_it_vat_registries/templates/registro_iva_acquisti.mako 2013-01-08 23:01:16 +0000
+++ l10n_it_vat_registries/templates/registro_iva_acquisti.mako 2013-04-30 13:33:29 +0000
@@ -79,7 +79,7 @@
79 </td><td class="left_without_line">79 </td><td class="left_without_line">
80 %endif80 %endif
81 %if line['index']==0:81 %if line['index']==0:
82 ${ formatLang(object.date,date=True) or '' | entity}82 ${ formatLang(line['invoice_date'],date=True) or '' | entity}
83 %endif83 %endif
84 %if line['index']==0:84 %if line['index']==0:
85 </td><td class="left_with_line">85 </td><td class="left_with_line">
8686
=== modified file 'l10n_it_vat_registries/templates/registro_iva_vendite.mako'
--- l10n_it_vat_registries/templates/registro_iva_vendite.mako 2013-01-08 23:01:16 +0000
+++ l10n_it_vat_registries/templates/registro_iva_vendite.mako 2013-04-30 13:33:29 +0000
@@ -78,7 +78,7 @@
78 </td><td class="left_without_line">78 </td><td class="left_without_line">
79 %endif79 %endif
80 %if line['index']==0:80 %if line['index']==0:
81 ${ formatLang(object.date,date=True) or '' | entity}81 ${ formatLang(line['invoice_date'],date=True) or '' | entity}
82 %endif82 %endif
83 %if line['index']==0:83 %if line['index']==0:
84 </td><td class="left_with_line">84 </td><td class="left_with_line">

Subscribers

People subscribed via source and target branches