Merge pull request #269 from kmee/oca/fix/tags_exportacao

[FIX] Tags exportacao
OCA · Apr 26, 2016 · 09f0b72 · 09f0b72
2 parents e6b48f1 + 4d0bde1
commit 09f0b72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/l10n_br_account_product/models/account_invoice.py b/l10n_br_account_product/models/account_invoice.py
@@ -212,6 +212,7 @@ def _compute_cfops(self):
     shipping_state_id = fields.Many2one(
         'res.country.state', 'Estado de Embarque')
     shipping_location = fields.Char('Local de Embarque', size=32)
+    expedition_location = fields.Char('Local de Despacho', size=32)
     nfe_purpose = fields.Selection(
         [('1', 'Normal'),
          ('2', 'Complementar'),

diff --git a/l10n_br_account_product/sped/nfe/document.py b/l10n_br_account_product/sped/nfe/document.py
@@ -596,10 +596,12 @@ def _total(self, invoice):
 
     def _export(self, invoice):
         "Informações de exportação"
-        self.nfe.infNFe.exporta.UFEmbarq.valor = (
+        self.nfe.infNFe.exporta.UFSaidaPais.valor = (
             invoice.shipping_state_id.code or '')
         self.nfe.infNFe.exporta.xLocEmbarq.valor = (
             invoice.shipping_location or '')
+        self.nfe.infNFe.exporta.xLocDespacho.valor = (
+            invoice.expedition_location or '')
 
     def get_NFe(self):
 

diff --git a/l10n_br_account_product/views/account_invoice_view.xml b/l10n_br_account_product/views/account_invoice_view.xml
@@ -84,6 +84,7 @@
 								<group name="shipping_info" string="Informações de Exportação">
 									<field name="shipping_state_id"/>
 									<field name="shipping_location"/>
+									<field name="expedition_location"/>
 								</group>
 								<group name="delivery_info">
 									<field name="carrier_name"/>