Skip to content

Commit

Permalink
Added sequence (progressivo) to quinquies and quater reports, fixed h…
Browse files Browse the repository at this point in the history 
…eader on mod1 reports (#111)

Fixed layout removing header, changed label on title of mod1 quater and mod1 quinquies

[FIX] Typo in mod1 quater and mod1 quinquies intrastat statements
  • Loading branch information
@LorenzoC0 @eLBati
LorenzoC0 authored and eLBati committed Jul 5, 2024
1 parent 7bfa2ee commit 6ab9778
Show file tree
Hide file tree
Showing 10 changed files with 99 additions and 42 deletions.
10 changes: 8 additions & 2 deletions l10n_it_intrastat_statement/report/intrastat_mod1_bis.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<t t-call="web.html_container">
<t t-translation="off">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<t t-if="not o" t-set="o" t-value="doc" />
<div
class="article"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
>
<div class="page">
<div class="row">
<div class="col-3">
Expand Down Expand Up @@ -189,7 +195,7 @@
</div>
</div>
</div>
</t>
</div>
</t>
</t>
</t>
Expand Down
10 changes: 8 additions & 2 deletions l10n_it_intrastat_statement/report/intrastat_mod1_ter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@
<t t-call="web.html_container">
<t t-translation="off">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<t t-if="not o" t-set="o" t-value="doc" />
<div
class="article"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
>
<div class="page">
<div class="row">
<div class="col-3">
Expand Down Expand Up @@ -179,7 +185,7 @@
</div>
</div>
</div>
</t>
</div>
</t>
</t>
</t>
Expand Down
10 changes: 8 additions & 2 deletions l10n_it_intrastat_statement/report/report_intrastat_mod1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<t t-call="web.html_container">
<t t-translation="off">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<t t-if="not o" t-set="o" t-value="doc" />
<div
class="article"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
>
<div class="page" style="font-size: 10px">
<div class="row">
<div class="col-2">
Expand Down Expand Up @@ -213,7 +219,7 @@
</tr>
</table>
</div>
</t>
</div>
</t>
</t>
</t>
Expand Down
22 changes: 14 additions & 8 deletions l10n_it_intrastat_statement/report/report_intrastat_mod1_quater.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<t t-call="web.html_container">
<t t-translation="off">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<t t-if="not o" t-set="o" t-value="doc" />
<div
class="article"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
>
<div class="page">
<div class="row">
<div class="col-3">
Expand All @@ -16,8 +22,8 @@
<div class="col-7 col-offset-3">
<table class="table text-center table-bordered">
<td>
<b>RIEPILOGO DEGLI ACQUISTI INTRACOMUNITARI
<br />DI BENI E DEI SERVIZI RICEVUTI</b>
<b>RIEPILOGO DELLE CESSIONI INTRACOMUNITARIE
<br />DI BENI E DEI SERVIZI RESI</b>
</td>
<td>Mod. INTRA-1 Quater</td>
</table>
Expand Down Expand Up @@ -60,7 +66,7 @@
<table class="table table-bordered">
<thead class="fondo">
<tr>
<!-- <th></th> -->
<th />
<th
colspan="2"
class="text-center"
Expand All @@ -76,7 +82,7 @@
<th />
</tr>
<tr>
<!-- <th class="text-center">PROGR.</th> -->
<th class="text-center">PROGR.</th>
<th class="text-center">STATO</th>
<th class="text-center">CODICE IVA</th>
<th
Expand Down Expand Up @@ -109,14 +115,14 @@
<td>7</td>
<td>8</td>
<td>9</td>
<!-- <td>10</td> -->
<td>10</td>
</tr>
<t t-set="total" t-value="0" />
<tr
t-foreach="o.sale_section3_ids"
t-as="l"
>
<!-- <td t-esc="l.progressive"></td> -->
<td t-esc="l.sequence" />
<td><span
t-field="l.country_partner_id.code"
/></td>
Expand Down Expand Up @@ -159,7 +165,7 @@
</div>
</div>
</div>
</t>
</div>
</t>
</t>
</t>
Expand Down
22 changes: 14 additions & 8 deletions l10n_it_intrastat_statement/report/report_intrastat_mod1_quinquies.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<t t-call="web.html_container">
<t t-translation="off">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<t t-if="not o" t-set="o" t-value="doc" />
<div
class="article"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
>
<div class="page">
<div class="row">

Expand All @@ -17,8 +23,8 @@
<div class="col-7 col-offset-3">
<table class="table text-center table-bordered">
<td>
<b>RIEPILOGO DEGLI ACQUISTI INTRACOMUNITARI
<br />DI BENI E DEI SERVIZI RICEVUTI</b>
<b>RIEPILOGO DELLE CESSIONI INTRACOMUNITARIE
<br />DI BENI E DEI SERVIZI RESI</b>
</td>
<td>Mod. INTRA-1 Quinquies</td>
</table>
Expand Down Expand Up @@ -62,7 +68,7 @@
<table class="table table-bordered">
<thead class="fondo">
<tr>
<!-- <th></th> -->
<th />
<th
colspan="4"
class="text-center"
Expand All @@ -82,7 +88,7 @@
<th />
</tr>
<tr>
<!-- <th class="text-center">PROGR.</th> -->
<th class="text-center">PROGR.</th>
<th
class="text-center"
>SEZIONE DOGANALE</th>
Expand Down Expand Up @@ -129,14 +135,14 @@
<td>11</td>
<td>12</td>
<td>13</td>
<!-- <td>14</td> -->
<td>14</td>
</tr>
<t t-set="total" t-value="0" />
<tr
t-foreach="o.sale_section4_ids"
t-as="l"
>
<!-- <td t-esc="l.progressive"></td> -->
<td t-esc="l.sequence" />
<td><span
t-field="l.intrastat_custom_id"
/></td>
Expand Down Expand Up @@ -187,7 +193,7 @@
</div>
</div>
</div>
</t>
</div>
</t>
</t>
</t>
Expand Down
10 changes: 8 additions & 2 deletions l10n_it_intrastat_statement/report/report_intrastat_mod2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<t t-call="web.html_container">
<t t-translation="off">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<t t-if="not o" t-set="o" t-value="doc" />
<div
class="article"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
>
<div class="page" style="font-size: 10px">
<div class="row">
<div class="col-2">
Expand Down Expand Up @@ -212,7 +218,7 @@
</tr>
</table>
</div>
</t>
</div>
</t>
</t>
</t>
Expand Down
10 changes: 8 additions & 2 deletions l10n_it_intrastat_statement/report/report_intrastat_mod2_bis.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<t t-call="web.html_container">
<t t-translation="off">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<t t-if="not o" t-set="o" t-value="doc" />
<div
class="article"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
>
<div class="page">
<div class="row">

Expand Down Expand Up @@ -197,7 +203,7 @@
</div>
</div>
</div>
</t>
</div>
</t>
</t>
</t>
Expand Down
18 changes: 12 additions & 6 deletions l10n_it_intrastat_statement/report/report_intrastat_mod2_quater.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<t t-call="web.html_container">
<t t-translation="off">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<t t-if="not o" t-set="o" t-value="doc" />
<div
class="article"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
>
<div class="page">
<div class="row">

Expand Down Expand Up @@ -62,7 +68,7 @@
<table class="table table-bordered">
<thead class="fondo">
<tr>
<!-- <th></th> -->
<th />
<th
colspan="2"
class="text-center"
Expand All @@ -79,7 +85,7 @@
<th />
</tr>
<tr>
<!-- <th class="text-center">PROGR.</th> -->
<th class="text-center">PROGR.</th>
<th class="text-center">STATO</th>
<th class="text-center">CODICE IVA</th>
<th
Expand Down Expand Up @@ -116,14 +122,14 @@
<td>8</td>
<td>9</td>
<td>10</td>
<!-- <td>11</td> -->
<td>11</td>
</tr>
<t t-set="total" t-value="0" />
<tr
t-foreach="o.purchase_section3_ids"
t-as="l"
>
<!-- <td t-esc="l.progressive"></td> -->
<td t-esc="l.sequence" />
<td><span
t-field="l.country_partner_id.code"
/></td>
Expand Down Expand Up @@ -170,7 +176,7 @@
</div>
</div>
</div>
</t>
</div>
</t>
</t>
</t>
Expand Down
18 changes: 12 additions & 6 deletions l10n_it_intrastat_statement/report/report_intrastat_mod2_quinquies.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
<t t-call="web.html_container">
<t t-translation="off">
<t t-foreach="docs" t-as="o">
<t t-call="web.internal_layout">
<t t-if="not o" t-set="o" t-value="doc" />
<div
class="article"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
>
<div class="page">
<div class="row">

Expand Down Expand Up @@ -62,7 +68,7 @@
<table class="table table-bordered">
<thead class="fondo">
<tr>
<!-- <th></th> -->
<th />
<th
colspan="4"
class="text-center"
Expand All @@ -83,7 +89,7 @@
<th />
</tr>
<tr>
<!-- <th class="text-center">PROGR.</th> -->
<th class="text-center">PROGR.</th>
<th
class="text-center"
>SEZIONE DOGANALE</th>
Expand Down Expand Up @@ -134,14 +140,14 @@
<td>12</td>
<td>13</td>
<td>14</td>
<!-- <td>15</td> -->
<td>15</td>
</tr>
<t t-set="total" t-value="0" />
<tr
t-foreach="o.purchase_section4_ids"
t-as="l"
>
<!-- <td t-esc="l.progressive"></td> -->
<td t-esc="l.sequence" />
<td><span
t-field="l.intrastat_custom_id"
/></td>
Expand Down Expand Up @@ -193,7 +199,7 @@
</div>
</div>
</div>
</t>
</div>
</t>
</t>
</t>
Expand Down
Loading

0 comments on commit 6ab9778

Please sign in to comment.