Skip to content

Commit 1341f5a

Browse files
committed
Merge PR #323 into 18.0
Signed-off-by pedrobaeza
2 parents 161cfcc + 3ccd0dd commit 1341f5a

5 files changed

Lines changed: 55 additions & 40 deletions

File tree

intrastat_product/README.rst

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ reporting.
3838
It should be used in combination with country-specific Intrastat Product
3939
reporting modules such as:
4040

41-
- *l10n_fr_intrastat_product*: the module for the *Déclaration d'Echange
42-
de Biens* (DEB) for France
43-
- *l10n_be_intrastat_product*: the module for the Intrastat Product
44-
Declaration for Belgium
41+
- *l10n_fr_intrastat_product*: the module for the *Déclaration
42+
d'Echange de Biens* (DEB) for France
43+
- *l10n_be_intrastat_product*: the module for the Intrastat Product
44+
Declaration for Belgium
4545

4646
These country-specific modules can be found in the OCA localization for
4747
those countries.
@@ -94,40 +94,40 @@ We recommend to start by copying an existing module, e.g.
9494
l10n_be_intrastat_product and adapt the code for the specific needs of
9595
your country.
9696

97-
- Declaration Object
97+
- Declaration Object
9898

99-
Create a new class as follows:
99+
Create a new class as follows:
100100

101-
.. code:: python
101+
.. code:: python
102102
103-
class L10nCcIntrastatProductDeclaration(models.Model):
104-
_name = 'l10n.cc.intrastat.product.declaration'
105-
_description = "Intrastat Product Declaration for YourCountry"
106-
_inherit = ['intrastat.product.declaration', 'mail.thread']
103+
class L10nCcIntrastatProductDeclaration(models.Model):
104+
_name = 'l10n.cc.intrastat.product.declaration'
105+
_description = "Intrastat Product Declaration for YourCountry"
106+
_inherit = ['intrastat.product.declaration', 'mail.thread']
107107
108-
whereby cc = your country code
108+
whereby cc = your country code
109109

110-
- Computation & Declaration Lines
110+
- Computation & Declaration Lines
111111

112-
Create also new objects inheriting from the Computation and
113-
Declaration Line Objects so that you can add methods or customise the
114-
methods from the base modules (make a PR when the customization or new
115-
method is required for multiple countries).
112+
Create also new objects inheriting from the Computation and
113+
Declaration Line Objects so that you can add methods or customise the
114+
methods from the base modules (make a PR when the customization or
115+
new method is required for multiple countries).
116116

117-
Adapt also the parent_id fields of the newly created objects (cf.
118-
l10n_be_intrastat_product as example).
117+
Adapt also the parent_id fields of the newly created objects (cf.
118+
l10n_be_intrastat_product as example).
119119

120-
- XML Files: Menu, Action, Views
120+
- XML Files: Menu, Action, Views
121121

122-
Cf. l10n_be_istrastat_product as example, replace "be" by your Country
123-
Code.
122+
Cf. l10n_be_istrastat_product as example, replace "be" by your
123+
Country Code.
124124

125125
**Other functionality added by this module:**
126126

127-
- Compute the Intrastat Lines in an invoice. For this, your user needs
128-
to be in the "Technical / Invoice Intrastat Transaction Details"
129-
group. Go to the "Intrastat transaction details" tab and press
130-
**Compute**
127+
- Compute the Intrastat Lines in an invoice. For this, your user needs
128+
to be in the "Technical / Invoice Intrastat Transaction Details"
129+
group. Go to the "Intrastat transaction details" tab and press
130+
**Compute**
131131

132132
Known issues / Roadmap
133133
======================
@@ -162,16 +162,17 @@ Authors
162162
Contributors
163163
------------
164164

165-
- Alexis de Lattre, Akretion <alexis.delattre@akretion.com>
165+
- Alexis de Lattre, Akretion <alexis.delattre@akretion.com>
166166

167-
- Luc De Meyer, Noviat <info@noviat.com>
167+
- Luc De Meyer, Noviat <info@noviat.com>
168168

169-
- Denis Roussel <denis.roussel@acsone.eu>
169+
- Denis Roussel <denis.roussel@acsone.eu>
170170

171-
- Tecnativa <`www.tecnativa.com\\> <http://www.tecnativa.com\>>`__:
171+
- Tecnativa <`www.tecnativa.com\\> <http://www.tecnativa.com\>>`__:
172172

173-
- João Marques
174-
- Víctor Martínez
173+
- João Marques
174+
- Víctor Martínez
175+
- Juan Carlos Oñate
175176

176177
Maintainers
177178
-----------

intrastat_product/models/intrastat_product_declaration.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,6 @@ def delete_xml(self):
921921
self.ensure_one()
922922
self.xml_attachment_id and self.xml_attachment_id.unlink()
923923

924-
@api.model
925924
def _xls_computation_line_fields(self):
926925
"""
927926
Update list in custom module to add/drop columns or change order
@@ -947,7 +946,6 @@ def _xls_computation_line_fields(self):
947946
"invoice",
948947
]
949948

950-
@api.model
951949
def _xls_declaration_line_fields(self):
952950
"""
953951
Update list in custom module to add/drop columns or change order

intrastat_product/readme/CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88

99
> - João Marques
1010
> - Víctor Martínez
11+
> - Juan Carlos Oñate

intrastat_product/static/description/index.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ <h1>Intrastat Product</h1>
380380
<p>It should be used in combination with country-specific Intrastat Product
381381
reporting modules such as:</p>
382382
<ul class="simple">
383-
<li><em>l10n_fr_intrastat_product</em>: the module for the <em>Déclaration d’Echange
384-
de Biens</em> (DEB) for France</li>
383+
<li><em>l10n_fr_intrastat_product</em>: the module for the <em>Déclaration
384+
d’Echange de Biens</em> (DEB) for France</li>
385385
<li><em>l10n_be_intrastat_product</em>: the module for the Intrastat Product
386386
Declaration for Belgium</li>
387387
</ul>
@@ -451,14 +451,14 @@ <h2><a class="toc-backref" href="#toc-entry-3">Usage</a></h2>
451451
<li><p class="first">Computation &amp; Declaration Lines</p>
452452
<p>Create also new objects inheriting from the Computation and
453453
Declaration Line Objects so that you can add methods or customise the
454-
methods from the base modules (make a PR when the customization or new
455-
method is required for multiple countries).</p>
454+
methods from the base modules (make a PR when the customization or
455+
new method is required for multiple countries).</p>
456456
<p>Adapt also the parent_id fields of the newly created objects (cf.
457457
l10n_be_intrastat_product as example).</p>
458458
</li>
459459
<li><p class="first">XML Files: Menu, Action, Views</p>
460-
<p>Cf. l10n_be_istrastat_product as example, replace “be” by your Country
461-
Code.</p>
460+
<p>Cf. l10n_be_istrastat_product as example, replace “be” by your
461+
Country Code.</p>
462462
</li>
463463
</ul>
464464
<p><strong>Other functionality added by this module:</strong></p>
@@ -509,6 +509,7 @@ <h3><a class="toc-backref" href="#toc-entry-8">Contributors</a></h3>
509509
<ul class="simple">
510510
<li>João Marques</li>
511511
<li>Víctor Martínez</li>
512+
<li>Juan Carlos Oñate</li>
512513
</ul>
513514
</blockquote>
514515
</li>

intrastat_product/views/intrastat_product_declaration.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,4 +521,18 @@
521521
</list>
522522
</field>
523523
</record>
524+
<record
525+
id="intrastat_product_intrastat_product_declaration_action"
526+
model="ir.actions.act_window"
527+
>
528+
<field name="name">Intrastat Product Declaration</field>
529+
<field name="res_model">intrastat.product.declaration</field>
530+
<field name="view_mode">list,form,graph,pivot</field>
531+
</record>
532+
<menuitem
533+
id="intrastat_product_intrastat_product_declaration_menu"
534+
parent="intrastat_base.menu_intrastat_base_root"
535+
action="intrastat_product_intrastat_product_declaration_action"
536+
sequence="10"
537+
/>
524538
</odoo>

0 commit comments

Comments
 (0)