OpenERP Italia

Merge lp:~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

  1. adding_cf_piva_stampa_registri_iva
  2. Merge into italian-addons-7.0
Proposed by Andrea Cometa
Status: Needs review
Proposed branch: lp:~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva
Merge into: lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0
Diff against target: 231 lines (+46/-43)
4 files modified
l10n_it_vat_registries/reports.xml (+6/-6)
l10n_it_vat_registries/templates/registro_iva_acquisti.mako (+15/-14)
l10n_it_vat_registries/templates/registro_iva_corrispettivi.mako (+10/-9)
l10n_it_vat_registries/templates/registro_iva_vendite.mako (+15/-14)
To merge this branch: bzr merge lp:~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva
Reviewer Review Type Date Requested Status
Lorenzo Battistini Needs Fixing
giudalo (community) Approve
Review via email: mp+205115@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lorenzo Battistini (elbati) wrote :

Ciao Andrea, puoi descrivere a cosa servono le modifiche del diff?
Grazie

review: Needs Information
Reply
Revision history for this message
Andrea Cometa (scigghia) wrote :

ho aggiunto sotto ogni riga anche il codice fiscale e la partita iva del cliente, sebbene non siano necessarie possono tornare utili sulla stampa.
Inoltre ho spostato la colonna totale fattura in ultima posizione

Reply
Revision history for this message
giudalo (g-dalo) wrote :

Di funzionare, funziona.

Concordo con Davide che non siano dati obbligatori e penso anche io che andrebbe fatto un configuratore dei registri su che colonne si vuole. In effetti la nomativa non prevede neanche la stampa del numero di registrazione e del sezionale.
Il sole 24 ore dice :

Il registro deve riportare i seguenti dati:
- data di emissione;
- numero progressivo di emissione;
- indicazione del cliente, ditta, ragione sociale o nominativo, ovvero, nei casi di autofattura, del cedente o prestatore;
- base imponibile distinta per aliquota;
- Iva distinta per aliquota.
e per il registro acquisti aggiunge solo il numero protocollo.

review: Approve
Reply
lp:~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva updated
235. By Andrea Cometa

[fix] stampa registri iva, rimosso False quando non presente p\.iva o c\.f\.

Revision history for this message
Lorenzo Battistini (elbati) wrote :

Come mai CF e PIVA vengono stampati solo se
line['index']!=0
?

In caso la riga avesse un solo tax.code da stampare, CF e PIVA non verrebbero stampati credo

review: Needs Information
Reply
Revision history for this message
Andrea Cometa (scigghia) wrote :

in realtà vengono stampati ad ogni riga tranne la 0, ho fatto una prova con due aliquote.
ora correggo e faccio in modo di farli stampare solo se line['index'] == 1

Reply
lp:~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva updated
236. By Andrea Cometa

[fix] l10n_it_vat_registries\: stampa cf e piva solo una volta

Revision history for this message
Lorenzo Battistini (elbati) wrote :

On 02/08/2014 10:07 AM, Andrea Cometa wrote:
> in realtà vengono stampati ad ogni riga tranne la 0, ho fatto una prova con due aliquote.

E se ci fosse una sola aliquota?

Reply
Revision history for this message
Andrea Cometa (scigghia) wrote :

idem, il test è fatto con diverse fatture, tra cui una con due aliquote
devo solo allineare gli importi sulle righe>1

Reply
Revision history for this message
Lorenzo Battistini (elbati) wrote :

On 02/09/2014 06:31 PM, Andrea Cometa wrote:
> idem, il test è fatto con diverse fatture, tra cui una con due aliquote
> devo solo allineare gli importi sulle righe>1

Mi riferivo al caso in cui ci fosse un solo tax code da stampare (non una sola aliquota come dicevo). Nel caso di un solo tax code line['index'] non andrà a 1 e la PIVA non sarà stampata.
Ma assumendo che le imposte siano configurate come in l10n_it, questo non dovrebbe accadere.

Noto però che se

line['index']!=0
o
line['index']!=1

(ovvero dopo le prime due sottorighe di ogni riga del registro) il TD non viene stampato, quindi la riga della tabella ha una colonna in meno.

review: Needs Fixing
Reply
Revision history for this message
Andrea Cometa (scigghia) wrote :

io uso sempre l10n_it come pdc, non ho avuto modo di testarlo su altre configurazioni, ma lo farò a breve.
per quanto riguarda il TD l'ho notato e provvederò non appena possibile

Reply
Revision history for this message
Lorenzo Battistini (elbati) wrote :

This project is now hosted on https://github.com/OCA/l10n-italy. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Reply

Unmerged revisions

236. By Andrea Cometa

[fix] l10n_it_vat_registries\: stampa cf e piva solo una volta

235. By Andrea Cometa

[fix] stampa registri iva, rimosso False quando non presente p\.iva o c\.f\.

234. By Andrea Cometa

[imp] stampa codice fiscale e partita iva su ogni riga partner, spostato totale sull\'ultima colonna

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_it_vat_registries/reports.xml'
--- l10n_it_vat_registries/reports.xml 2013-05-09 15:34:05 +0000
+++ l10n_it_vat_registries/reports.xml 2014-02-08 09:10:47 +0000
@@ -21,7 +21,7 @@
21 }21 }
22 </script>22 </script>
23 </head>23 </head>
24 <body style="border:0; margin: 0;" onload="subst()">24 <body style="border:0; margin: 0; font:Arial;" onload="subst()">
25 <% setLang(company.partner_id.lang or "en_US") %>25 <% setLang(company.partner_id.lang or "en_US") %>
26 <h1>Registro I.V.A. Vendite</h1>26 <h1>Registro I.V.A. Vendite</h1>
27 <h3>${company.partner_id.name or ''|entity}</h3>27 <h3>${company.partner_id.name or ''|entity}</h3>
@@ -65,7 +65,7 @@
65 }65 }
66 </script>66 </script>
67 </head>67 </head>
68 <body style="border:0; margin: 0;" onload="subst()">68 <body style="border:0; margin: 0; font:Arial;" onload="subst()">
69 <table style="border-top: 1px solid black; width: 100%">69 <table style="border-top: 1px solid black; width: 100%">
70 <tr >70 <tr >
71 <td style="text-align:right;font-size:12;" width="95%">Page ${objects[0].period_id and objects[0].period_id.fiscalyear_id and objects[0].period_id.fiscalyear_id.name or ''|entity}/<span class="page"/></td><td style="text-align:left;font-size:12;"></td>71 <td style="text-align:right;font-size:12;" width="95%">Page ${objects[0].period_id and objects[0].period_id.fiscalyear_id and objects[0].period_id.fiscalyear_id.name or ''|entity}/<span class="page"/></td><td style="text-align:left;font-size:12;"></td>
@@ -102,7 +102,7 @@
102 }102 }
103 </script>103 </script>
104 </head>104 </head>
105 <body style="border:0; margin: 0;" onload="subst()">105 <body style="border:0; margin: 0; font:Arial;" onload="subst()">
106 <% setLang(company.partner_id.lang or "en_US") %>106 <% setLang(company.partner_id.lang or "en_US") %>
107 <h1>Registro I.V.A. Acquisti</h1>107 <h1>Registro I.V.A. Acquisti</h1>
108 <h3>${company.partner_id.name or ''|entity}</h3>108 <h3>${company.partner_id.name or ''|entity}</h3>
@@ -146,7 +146,7 @@
146 }146 }
147 </script>147 </script>
148 </head>148 </head>
149 <body style="border:0; margin: 0;" onload="subst()">149 <body style="border:0; margin: 0; font:Arial;" onload="subst()">
150 <table style="border-top: 1px solid black; width: 100%">150 <table style="border-top: 1px solid black; width: 100%">
151 <tr >151 <tr >
152 <td style="text-align:right;font-size:12;" width="95%">Page ${objects[0].period_id and objects[0].period_id.fiscalyear_id and objects[0].period_id.fiscalyear_id.name or ''|entity}/<span class="page"/></td><td style="text-align:left;font-size:12;"></td>152 <td style="text-align:right;font-size:12;" width="95%">Page ${objects[0].period_id and objects[0].period_id.fiscalyear_id and objects[0].period_id.fiscalyear_id.name or ''|entity}/<span class="page"/></td><td style="text-align:left;font-size:12;"></td>
@@ -183,7 +183,7 @@
183 }183 }
184 </script>184 </script>
185 </head>185 </head>
186 <body style="border:0; margin: 0;" onload="subst()">186 <body style="border:0; margin: 0; font:Arial;" onload="subst()">
187 <% setLang(company.partner_id.lang or "en_US") %>187 <% setLang(company.partner_id.lang or "en_US") %>
188 <h1>Registro I.V.A. Corrispettivi</h1>188 <h1>Registro I.V.A. Corrispettivi</h1>
189 <h3>${company.partner_id.name or ''|entity}</h3>189 <h3>${company.partner_id.name or ''|entity}</h3>
@@ -227,7 +227,7 @@
227 }227 }
228 </script>228 </script>
229 </head>229 </head>
230 <body style="border:0; margin: 0;" onload="subst()">230 <body style="border:0; margin: 0; font:Arial;" onload="subst()">
231 <table style="border-top: 1px solid black; width: 100%">231 <table style="border-top: 1px solid black; width: 100%">
232 <tr >232 <tr >
233 <td style="text-align:right;font-size:12;" width="95%">Page ${objects[0].period_id and objects[0].period_id.fiscalyear_id and objects[0].period_id.fiscalyear_id.name or ''|entity}/<span class="page"/></td><td style="text-align:left;font-size:12;"></td>233 <td style="text-align:right;font-size:12;" width="95%">Page ${objects[0].period_id and objects[0].period_id.fiscalyear_id and objects[0].period_id.fiscalyear_id.name or ''|entity}/<span class="page"/></td><td style="text-align:left;font-size:12;"></td>
234234
=== modified file 'l10n_it_vat_registries/templates/registro_iva_acquisti.mako'
--- l10n_it_vat_registries/templates/registro_iva_acquisti.mako 2013-08-22 11:09:52 +0000
+++ l10n_it_vat_registries/templates/registro_iva_acquisti.mako 2014-02-08 09:10:47 +0000
@@ -29,9 +29,9 @@
29 <th class="left_without_line">Numero fattura</th>29 <th class="left_without_line">Numero fattura</th>
30 <th class="left_without_line">Data fattura</th>30 <th class="left_without_line">Data fattura</th>
31 <th class="left_without_line">Sezionale</th>31 <th class="left_without_line">Sezionale</th>
32 <th class="right_without_line">Totale fattura</th>
33 <th class="right_without_line">Imposta</th>32 <th class="right_without_line">Imposta</th>
34 <th class="right_without_line">Importo</th>33 <th class="right_without_line">Importo</th>
34 <th class="right_without_line">Totale fattura</th>
35 <th></th>35 <th></th>
36 </tr>36 </tr>
37 </thead>37 </thead>
@@ -57,12 +57,12 @@
57 ${ counter | entity}57 ${ counter | entity}
58 %endif58 %endif
59 %if line['index']==0:59 %if line['index']==0:
60 </td><td class="left_with_line">60 </td><td class="left_with_line">${object.partner_id.name or ''| entity}
61 %else:61 %else:
62 </td><td class="left_without_line">62 %if line['index']==1:
63 %endif63 </td><td class="left_without_line" nowrap>${object.partner_id.fiscalcode and 'C.F.: ' or ''| entity}${object.partner_id.fiscalcode or ''| entity}
64 %if line['index']==0:64 <br/>${object.partner_id.vat and 'P.IVA: ' or ''| entity}${object.partner_id.vat or ''| entity}
65 ${object.partner_id.name or ''| entity}65 %endif
66 %endif66 %endif
67 %if line['index']==0:67 %if line['index']==0:
68 </td><td class="left_with_line">68 </td><td class="left_with_line">
@@ -96,14 +96,6 @@
96 %if line['index']==0:96 %if line['index']==0:
97 ${object.journal_id.name or ''| entity}97 ${object.journal_id.name or ''| entity}
98 %endif98 %endif
99 %if line['index']==0:
100 </td><td class="right_with_line">
101 %else:
102 </td><td class="right_without_line">
103 %endif
104 %if line['index']==0:
105 ${ formatLang(invoice_total(object)) | entity}
106 %endif
107 </td>99 </td>
108 %if line['index']==0:100 %if line['index']==0:
109 <td class="right_with_line">${ (line['tax_code_name']) or ''| entity}</td>101 <td class="right_with_line">${ (line['tax_code_name']) or ''| entity}</td>
@@ -115,6 +107,15 @@
115 %else:107 %else:
116 <td class="right_without_line">${ formatLang(line['amount'])| entity}</td>108 <td class="right_without_line">${ formatLang(line['amount'])| entity}</td>
117 %endif109 %endif
110 %if line['index']==0:
111 <td class="right_with_line">
112 %else:
113 <td class="right_without_line">
114 %endif
115 %if line['index']==0:
116 ${ formatLang(invoice_total(object)) | entity}
117 %endif
118 </td>
118 </tr>119 </tr>
119 %endfor120 %endfor
120 %endfor121 %endfor
121122
=== modified file 'l10n_it_vat_registries/templates/registro_iva_corrispettivi.mako'
--- l10n_it_vat_registries/templates/registro_iva_corrispettivi.mako 2013-08-22 11:09:52 +0000
+++ l10n_it_vat_registries/templates/registro_iva_corrispettivi.mako 2014-02-08 09:10:47 +0000
@@ -25,9 +25,9 @@
25 <th class="left_without_line">Numero</th>25 <th class="left_without_line">Numero</th>
26 <th class="left_without_line">Data registrazione</th>26 <th class="left_without_line">Data registrazione</th>
27 <th class="left_without_line">Sezionale</th>27 <th class="left_without_line">Sezionale</th>
28 <th class="right_without_line">Importo totale</th>
29 <th class="right_without_line">Imposta</th>28 <th class="right_without_line">Imposta</th>
30 <th class="right_without_line">Importo</th>29 <th class="right_without_line">Importo</th>
30 <th class="right_without_line">Importo totale</th>
31 <th></th>31 <th></th>
32 </tr>32 </tr>
33 </thead>33 </thead>
@@ -60,14 +60,6 @@
60 %if line['index']==0:60 %if line['index']==0:
61 ${object.journal_id.name or ''| entity}61 ${object.journal_id.name or ''| entity}
62 %endif62 %endif
63 %if line['index']==0:
64 </td><td class="right_with_line">
65 %else:
66 </td><td class="right_without_line">
67 %endif
68 %if line['index']==0:
69 ${ formatLang(invoice_total(object)) | entity}
70 %endif
71 </td>63 </td>
72 %if line['index']==0:64 %if line['index']==0:
73 <td class="right_with_line">${ (line['tax_code_name']) or ''| entity}</td>65 <td class="right_with_line">${ (line['tax_code_name']) or ''| entity}</td>
@@ -79,6 +71,15 @@
79 %else:71 %else:
80 <td class="right_without_line">${ formatLang(line['amount'])| entity}</td>72 <td class="right_without_line">${ formatLang(line['amount'])| entity}</td>
81 %endif73 %endif
74 %if line['index']==0:
75 <td class="right_with_line">
76 %else:
77 <td class="right_without_line">
78 %endif
79 %if line['index']==0:
80 ${ formatLang(invoice_total(object)) | entity}
81 %endif
82 </td>
82 </tr>83 </tr>
83 %endfor84 %endfor
84 %endfor85 %endfor
8586
=== modified file 'l10n_it_vat_registries/templates/registro_iva_vendite.mako'
--- l10n_it_vat_registries/templates/registro_iva_vendite.mako 2013-08-21 16:15:06 +0000
+++ l10n_it_vat_registries/templates/registro_iva_vendite.mako 2014-02-08 09:10:47 +0000
@@ -28,9 +28,9 @@
28 <th class="left_without_line">Numero fattura</th>28 <th class="left_without_line">Numero fattura</th>
29 <th class="left_without_line">Data fattura</th>29 <th class="left_without_line">Data fattura</th>
30 <th class="left_without_line">Sezionale</th>30 <th class="left_without_line">Sezionale</th>
31 <th class="right_without_line">Totale fattura</th>
32 <th class="right_without_line">Imposta</th>31 <th class="right_without_line">Imposta</th>
33 <th class="right_without_line">Importo</th>32 <th class="right_without_line">Importo</th>
33 <th class="right_without_line">Totale fattura</th>
34 <th></th>34 <th></th>
35 </tr>35 </tr>
36 </thead>36 </thead>
@@ -56,12 +56,12 @@
56 ${ counter | entity}56 ${ counter | entity}
57 %endif57 %endif
58 %if line['index']==0:58 %if line['index']==0:
59 </td><td class="left_with_line">59 </td><td class="left_with_line">${object.partner_id.name or ''| entity}
60 %else:60 %else:
61 </td><td class="left_without_line">61 %if line['index']==1:
62 %endif62 </td><td class="left_without_line" nowrap>${object.partner_id.fiscalcode and 'C.F.: ' or ''| entity}${object.partner_id.fiscalcode or ''| entity}
63 %if line['index']==0:63 <br/>${object.partner_id.vat and 'P.IVA: ' or ''| entity}${object.partner_id.vat or ''| entity}
64 ${object.partner_id.name or ''| entity}64 %endif
65 %endif65 %endif
66 %if line['index']==0:66 %if line['index']==0:
67 </td><td class="left_with_line">67 </td><td class="left_with_line">
@@ -87,14 +87,6 @@
87 %if line['index']==0:87 %if line['index']==0:
88 ${object.journal_id.name or ''| entity}88 ${object.journal_id.name or ''| entity}
89 %endif89 %endif
90 %if line['index']==0:
91 </td><td class="right_with_line">
92 %else:
93 </td><td class="right_without_line">
94 %endif
95 %if line['index']==0:
96 ${ formatLang(invoice_total(object)) | entity}
97 %endif
98 </td>90 </td>
99 %if line['index']==0:91 %if line['index']==0:
100 <td class="right_with_line">${ (line['tax_code_name']) or ''| entity}</td>92 <td class="right_with_line">${ (line['tax_code_name']) or ''| entity}</td>
@@ -106,6 +98,15 @@
106 %else:98 %else:
107 <td class="right_without_line">${ formatLang(line['amount'])| entity}</td>99 <td class="right_without_line">${ formatLang(line['amount'])| entity}</td>
108 %endif100 %endif
101 %if line['index']==0:
102 <td class="right_with_line">
103 %else:
104 <td class="right_without_line">
105 %endif
106 %if line['index']==0:
107 ${ formatLang(invoice_total(object)) | entity}
108 %endif
109 </td>
109 </tr>110 </tr>
110 %endfor111 %endfor
111 %endfor112 %endfor

Subscribers

People subscribed via source and target branches