diff --git a/br_nfe/models/invoice_eletronic.py b/br_nfe/models/invoice_eletronic.py index 3466e389f..708e39bc2 100644 --- a/br_nfe/models/invoice_eletronic.py +++ b/br_nfe/models/invoice_eletronic.py @@ -425,6 +425,7 @@ def _prepare_eletronic_invoice_item(self, item, invoice): if item.tem_difal: imposto['ICMSUFDest'] = { 'vBCUFDest': "%.02f" % item.icms_bc_uf_dest, + 'vBCFCPUFDest': "%.02f" % item.icms_bc_uf_dest, 'pFCPUFDest': "%.02f" % item.icms_aliquota_fcp_uf_dest, 'pICMSUFDest': "%.02f" % item.icms_aliquota_uf_dest, 'pICMSInter': "%.02f" % item.icms_aliquota_interestadual, diff --git a/br_sale_stock/models/sale.py b/br_sale_stock/models/sale.py index ff9bc042e..29888aa34 100644 --- a/br_sale_stock/models/sale.py +++ b/br_sale_stock/models/sale.py @@ -23,6 +23,14 @@ def _amount_all(self): order.total_despesas, }) + @api.multi + def _prepare_invoice(self): + res = super(SaleOrder, self)._prepare_invoice() + res['weight'] = sum( + [x.qty_to_invoice * x.product_id.weight for x in self.order_line]) + res['weight_net'] = res['weight'] + return res + def _calc_ratio(self, qty, total): if total > 0: return qty / total