audrius/intrastat-extrastat
1
0
Fork 1
mirror of https://github.com/OCA/intrastat-extrastat.git synced 2025-02-16 17:13:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63 from OCA/pass-declaration-to-xls-template

Browse Source 
[10.0][FIX]pass declaration to xls template
This commit is contained in:
Luc De Meyer
2019-02-08 14:39:36 +01:00
committed by GitHub
parent 68363f8ef6 30fe798580
commit fb35878f65
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intrastat_product/report/intrastat_product_report_xls.py
View File

@@ -23,7 +23,7 @@ class IntrastatProductDeclarationXlsx(AbstractReportXlsx):
self.env.cr, IR_TRANSLATION_NAME, 'report', lang, src) or src
return val
def _get_template(self):
def _get_template(self, declaration):
template = {
'product': {
@@ -40,7 +40,7 @@ class IntrastatProductDeclarationXlsx(AbstractReportXlsx):
'product_origin_country': {
'header': {
'type': 'string',
'value': self._('Country of Origin of the Product'),
'value': self._('Product C/O'),
},
'line': {
'type': 'string',
@@ -194,7 +194,7 @@ class IntrastatProductDeclarationXlsx(AbstractReportXlsx):
},
}
template.update(
self.env['intrastat.product.declaration']._xls_template())
declaration._xls_template())
return template
@@ -209,7 +209,7 @@ class IntrastatProductDeclarationXlsx(AbstractReportXlsx):
return declaration
def _get_ws_params(self, wb, data, declaration):
template = self._get_template()
template = self._get_template(declaration)
if self.env.context.get('computation_lines'):
wl = declaration._xls_computation_line_fields()
report = 'computation'

8
intrastat_product/views/intrastat_product_declaration.xml
View File

@@ -54,7 +54,9 @@
context="{'computation_lines': 1}"/>
</header>
<group name="computation_lines">
<field name="computation_line_ids" nolabel="1"/>
<field name="computation_line_ids"
context="{'type': type, 'reporting_level': reporting_level}"
nolabel="1"/>
</group>
</page>
<page string="Declaration Lines">
@@ -63,7 +65,9 @@
context="{'declaration_lines': 1}"/>
</header>
<group name="declaration_lines">
<field name="declaration_line_ids" nolabel="1"/>
<field name="declaration_line_ids"
context="{'type': type, 'reporting_level': reporting_level}"
nolabel="1"/>
</group>
</page>
<page string="Notes">