Merge branch '10.0' into 10.0-documentos-relacionados

Trust-Code · Jan 6, 2017 · 39e866d · 39e866d
2 parents c96f8ad + 25c9d39
commit 39e866d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/br_account/models/account_fiscal_position.py b/br_account/models/account_fiscal_position.py
@@ -71,6 +71,9 @@ class AccountFiscalPositionTaxRule(models.Model):
 class AccountFiscalPosition(models.Model):
     _inherit = 'account.fiscal.position'
 
+    account_id = fields.Many2one(
+        'account.account', string="Conta Contábil",
+        help="Conta Contábil a ser utilizada na fatura.")
     note = fields.Text(u'Observações')
 
     icms_tax_rule_ids = fields.One2many(

diff --git a/br_account/models/account_invoice.py b/br_account/models/account_invoice.py
@@ -199,6 +199,11 @@ def _onchange_fiscal_document_id(self):
             [('fiscal_document_id', '=', self.fiscal_document_id.id)])
         self.document_serie_id = series and series[0].id or False
 
+    @api.onchange('fiscal_position_id')
+    def _onchange_br_account_fiscal_position_id(self):
+        if self.fiscal_position_id and self.fiscal_position_id.account_id:
+            self.account_id = self.fiscal_position_id.account_id.id
+
     @api.model
     def invoice_line_move_line_get(self):
         res = super(AccountInvoice, self).invoice_line_move_line_get()

diff --git a/br_account/views/account_fiscal_position_view.xml b/br_account/views/account_fiscal_position_view.xml
@@ -83,6 +83,11 @@
         <field name="model">account.fiscal.position</field>
         <field name="inherit_id" ref="account.view_account_position_form"/>
         <field name="arch" type="xml">
+            <xpath expr="//page[@name='account_mapping']/group" position="before">
+                <group>
+                    <field name="account_id" placeholder="Esta conta vai ser usada para faturamento" />
+                </group>
+            </xpath>
             <field name="vat_required" position="attributes" >
                 <attribute name="invisible">1</attribute>
             </field>

diff --git a/br_sale/models/sale.py b/br_sale/models/sale.py
@@ -25,6 +25,13 @@ def _amount_all(self):
                                    for l in order.order_line),
             })
 
+    @api.multi
+    def _prepare_invoice(self):
+        res = super(SaleOrder, self)._prepare_invoice()
+        if self.fiscal_position_id and self.fiscal_position_id.account_id:
+            res['account_id'] = self.fiscal_position_id.account_id.id
+        return res
+
     total_bruto = fields.Float(
         string='Total Bruto ( = )', readonly=True, compute='_amount_all',
         digits=dp.get_precision('Account'), store=True)
@@ -288,5 +295,4 @@ def _prepare_invoice_line(self, qty):
         res['issqn_aliquota'] = issqn.amount or 0.0
 
         res['ii_aliquota'] = ii.amount or 0.0
-
         return res