OpenERP Italia

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

  1. fix-bug-1174751-7
  2. Merge into 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.
lp:~elbati/openobject-italia/fix-bug-1174751-7 updated
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
1=== modified file 'l10n_it_vat_registries/invoice.py'
2--- l10n_it_vat_registries/invoice.py 2013-04-24 10:14:49 +0000
3+++ l10n_it_vat_registries/invoice.py 2013-04-30 13:33:29 +0000
4@@ -154,6 +154,8 @@
5 str_non_deductible or '',
6 'index': index,
7 'amount_total': invoice_amount_total,
8+ 'invoice_date': (move_line.invoice and move_line.invoice.date_invoice
9+ or move_line.date or ''),
10 }
11 res.append(tax_item)
12 iva = cur_pool.round(
13
14=== modified file 'l10n_it_vat_registries/templates/registro_iva_acquisti.mako'
15--- l10n_it_vat_registries/templates/registro_iva_acquisti.mako 2013-01-08 23:01:16 +0000
16+++ l10n_it_vat_registries/templates/registro_iva_acquisti.mako 2013-04-30 13:33:29 +0000
17@@ -79,7 +79,7 @@
18 </td><td class="left_without_line">
19 %endif
20 %if line['index']==0:
21- ${ formatLang(object.date,date=True) or '' | entity}
22+ ${ formatLang(line['invoice_date'],date=True) or '' | entity}
23 %endif
24 %if line['index']==0:
25 </td><td class="left_with_line">
26
27=== modified file 'l10n_it_vat_registries/templates/registro_iva_vendite.mako'
28--- l10n_it_vat_registries/templates/registro_iva_vendite.mako 2013-01-08 23:01:16 +0000
29+++ l10n_it_vat_registries/templates/registro_iva_vendite.mako 2013-04-30 13:33:29 +0000
30@@ -78,7 +78,7 @@
31 </td><td class="left_without_line">
32 %endif
33 %if line['index']==0:
34- ${ formatLang(object.date,date=True) or '' | entity}
35+ ${ formatLang(line['invoice_date'],date=True) or '' | entity}
36 %endif
37 %if line['index']==0:
38 </td><td class="left_with_line">

Subscribers

People subscribed via source and target branches