openobject-italia-core-devs team mailing list archive
-
openobject-italia-core-devs team
-
Mailing list archive
-
Message #01953
[Merge] lp:~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva into lp:openobject-italia/7.0
Andrea Cometa has proposed merging lp:~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva into lp:openobject-italia/7.0.
Requested reviews:
OpenERP Italia core devs (openobject-italia-core-devs)
For more details, see:
https://code.launchpad.net/~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva/+merge/205115
--
https://code.launchpad.net/~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva/+merge/205115
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~scigghia/openobject-italia/adding_cf_piva_stampa_registri_iva into lp:openobject-italia/7.0.
=== 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-06 10:32:13 +0000
@@ -21,7 +21,7 @@
}
</script>
</head>
- <body style="border:0; margin: 0;" onload="subst()">
+ <body style="border:0; margin: 0; font:Arial;" onload="subst()">
<% setLang(company.partner_id.lang or "en_US") %>
<h1>Registro I.V.A. Vendite</h1>
<h3>${company.partner_id.name or ''|entity}</h3>
@@ -65,7 +65,7 @@
}
</script>
</head>
- <body style="border:0; margin: 0;" onload="subst()">
+ <body style="border:0; margin: 0; font:Arial;" onload="subst()">
<table style="border-top: 1px solid black; width: 100%">
<tr >
<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 @@
}
</script>
</head>
- <body style="border:0; margin: 0;" onload="subst()">
+ <body style="border:0; margin: 0; font:Arial;" onload="subst()">
<% setLang(company.partner_id.lang or "en_US") %>
<h1>Registro I.V.A. Acquisti</h1>
<h3>${company.partner_id.name or ''|entity}</h3>
@@ -146,7 +146,7 @@
}
</script>
</head>
- <body style="border:0; margin: 0;" onload="subst()">
+ <body style="border:0; margin: 0; font:Arial;" onload="subst()">
<table style="border-top: 1px solid black; width: 100%">
<tr >
<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 @@
}
</script>
</head>
- <body style="border:0; margin: 0;" onload="subst()">
+ <body style="border:0; margin: 0; font:Arial;" onload="subst()">
<% setLang(company.partner_id.lang or "en_US") %>
<h1>Registro I.V.A. Corrispettivi</h1>
<h3>${company.partner_id.name or ''|entity}</h3>
@@ -227,7 +227,7 @@
}
</script>
</head>
- <body style="border:0; margin: 0;" onload="subst()">
+ <body style="border:0; margin: 0; font:Arial;" onload="subst()">
<table style="border-top: 1px solid black; width: 100%">
<tr >
<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>
=== 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-06 10:32:13 +0000
@@ -29,9 +29,9 @@
<th class="left_without_line">Numero fattura</th>
<th class="left_without_line">Data fattura</th>
<th class="left_without_line">Sezionale</th>
- <th class="right_without_line">Totale fattura</th>
<th class="right_without_line">Imposta</th>
<th class="right_without_line">Importo</th>
+ <th class="right_without_line">Totale fattura</th>
<th></th>
</tr>
</thead>
@@ -57,12 +57,10 @@
${ counter | entity}
%endif
%if line['index']==0:
- </td><td class="left_with_line">
+ </td><td class="left_with_line">${object.partner_id.name or ''| entity}
%else:
- </td><td class="left_without_line">
- %endif
- %if line['index']==0:
- ${object.partner_id.name or ''| entity}
+ </td><td class="left_without_line" nowrap>${object.partner_id.fiscalcode and 'C.F.: '| entity}${object.partner_id.fiscalcode or ''| entity}
+ <br/>${object.partner_id.vat and 'P.IVA: '| entity}${object.partner_id.vat or ''| entity}
%endif
%if line['index']==0:
</td><td class="left_with_line">
@@ -96,14 +94,6 @@
%if line['index']==0:
${object.journal_id.name or ''| entity}
%endif
- %if line['index']==0:
- </td><td class="right_with_line">
- %else:
- </td><td class="right_without_line">
- %endif
- %if line['index']==0:
- ${ formatLang(invoice_total(object)) | entity}
- %endif
</td>
%if line['index']==0:
<td class="right_with_line">${ (line['tax_code_name']) or ''| entity}</td>
@@ -115,6 +105,15 @@
%else:
<td class="right_without_line">${ formatLang(line['amount'])| entity}</td>
%endif
+ %if line['index']==0:
+ <td class="right_with_line">
+ %else:
+ <td class="right_without_line">
+ %endif
+ %if line['index']==0:
+ ${ formatLang(invoice_total(object)) | entity}
+ %endif
+ </td>
</tr>
%endfor
%endfor
=== 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-06 10:32:13 +0000
@@ -25,9 +25,9 @@
<th class="left_without_line">Numero</th>
<th class="left_without_line">Data registrazione</th>
<th class="left_without_line">Sezionale</th>
- <th class="right_without_line">Importo totale</th>
<th class="right_without_line">Imposta</th>
<th class="right_without_line">Importo</th>
+ <th class="right_without_line">Importo totale</th>
<th></th>
</tr>
</thead>
@@ -60,14 +60,6 @@
%if line['index']==0:
${object.journal_id.name or ''| entity}
%endif
- %if line['index']==0:
- </td><td class="right_with_line">
- %else:
- </td><td class="right_without_line">
- %endif
- %if line['index']==0:
- ${ formatLang(invoice_total(object)) | entity}
- %endif
</td>
%if line['index']==0:
<td class="right_with_line">${ (line['tax_code_name']) or ''| entity}</td>
@@ -79,6 +71,15 @@
%else:
<td class="right_without_line">${ formatLang(line['amount'])| entity}</td>
%endif
+ %if line['index']==0:
+ <td class="right_with_line">
+ %else:
+ <td class="right_without_line">
+ %endif
+ %if line['index']==0:
+ ${ formatLang(invoice_total(object)) | entity}
+ %endif
+ </td>
</tr>
%endfor
%endfor
=== 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-06 10:32:13 +0000
@@ -28,9 +28,9 @@
<th class="left_without_line">Numero fattura</th>
<th class="left_without_line">Data fattura</th>
<th class="left_without_line">Sezionale</th>
- <th class="right_without_line">Totale fattura</th>
<th class="right_without_line">Imposta</th>
<th class="right_without_line">Importo</th>
+ <th class="right_without_line">Totale fattura</th>
<th></th>
</tr>
</thead>
@@ -56,12 +56,10 @@
${ counter | entity}
%endif
%if line['index']==0:
- </td><td class="left_with_line">
+ </td><td class="left_with_line">${object.partner_id.name or ''| entity}
%else:
- </td><td class="left_without_line">
- %endif
- %if line['index']==0:
- ${object.partner_id.name or ''| entity}
+ </td><td class="left_without_line" nowrap>${object.partner_id.fiscalcode and 'C.F.: '| entity}${object.partner_id.fiscalcode or ''| entity}
+ <br/>${object.partner_id.vat and 'P.IVA: '| entity}${object.partner_id.vat or ''| entity}
%endif
%if line['index']==0:
</td><td class="left_with_line">
@@ -87,14 +85,6 @@
%if line['index']==0:
${object.journal_id.name or ''| entity}
%endif
- %if line['index']==0:
- </td><td class="right_with_line">
- %else:
- </td><td class="right_without_line">
- %endif
- %if line['index']==0:
- ${ formatLang(invoice_total(object)) | entity}
- %endif
</td>
%if line['index']==0:
<td class="right_with_line">${ (line['tax_code_name']) or ''| entity}</td>
@@ -106,6 +96,15 @@
%else:
<td class="right_without_line">${ formatLang(line['amount'])| entity}</td>
%endif
+ %if line['index']==0:
+ <td class="right_with_line">
+ %else:
+ <td class="right_without_line">
+ %endif
+ %if line['index']==0:
+ ${ formatLang(invoice_total(object)) | entity}
+ %endif
+ </td>
</tr>
%endfor
%endfor
Follow ups
