Merge branch '10.0' into 10.0-fix-numeracao-nota-compra

Trust-Code · Dec 30, 2016 · 1db496b · 1db496b
2 parents ebcced1 + 795965b
commit 1db496b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/br_account/models/account_fiscal_position.py b/br_account/models/account_fiscal_position.py
@@ -95,8 +95,7 @@ class AccountFiscalPosition(models.Model):
         'account.fiscal.position.tax.rule', 'fiscal_position_id',
         string="Regras II", domain=[('domain', '=', 'ii')])
 
-    def _filter_rules(self, fpos_id, type_tax, partner,
-                      product, state):
+    def _filter_rules(self, fpos_id, type_tax, partner, product, state):
         rule_obj = self.env['account.fiscal.position.tax.rule']
         domain = [('fiscal_position_id', '=', fpos_id),
                   ('domain', '=', type_tax)]
@@ -121,8 +120,9 @@ def _filter_rules(self, fpos_id, type_tax, partner,
                     rules_points[rule.id] -= 1
                 if len(rule.state_ids) > 0:
                     rules_points[rule.id] -= 1
-
             greater_rule = max([(v, k) for k, v in rules_points.items()])
+            if greater_rule[0] <= 0:
+                return {}
             rules = [rules.browse(greater_rule[1])]
 
             return {

diff --git a/br_nfe/models/invoice_eletronic.py b/br_nfe/models/invoice_eletronic.py
@@ -587,9 +587,9 @@ def action_send_eletronic_invoice(self):
 
     @api.multi
     def action_cancel_document(self, context=None, justificativa=None):
-        super(InvoiceEletronic, self).action_cancel_document()
         if self.model not in ('55', '65'):
-            return
+            return super(InvoiceEletronic, self).action_cancel_document(
+                justificativa=justificativa)
 
         if not justificativa:
             return {

diff --git a/br_nfe/wizard/cancel_nfe.py b/br_nfe/wizard/cancel_nfe.py
@@ -3,6 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import api, fields, models
+from odoo.exceptions import UserError
 
 
 class CancelNFe(models.TransientModel):
@@ -16,3 +17,5 @@ def action_cancel_nfe(self):
         if self.edoc_id and len(self.justificativa) > 15:
             self.edoc_id.action_cancel_document(
                 justificativa=self.justificativa)
+        else:
+            raise UserError(u"Justificativa deve ter mais de 15 caracteres")
diff --git a/br_nfe/wizard/carta_correcao_eletronica.xml b/br_nfe/wizard/carta_correcao_eletronica.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <record model="ir.ui.view" id="view_wizard_cancel_nfe">
+    <record model="ir.ui.view" id="view_wizard_carta_correcao_nfe">
         <field name="name">wizard.carta.correcao.eletronica</field>
         <field name="model">wizard.carta.correcao.eletronica</field>
         <field name="arch" type="xml">

diff --git a/br_nfse/models/invoice_eletronic.py b/br_nfse/models/invoice_eletronic.py
@@ -257,9 +257,9 @@ def action_send_eletronic_invoice(self):
 
     @api.multi
     def action_cancel_document(self, context=None, justificativa=None):
-        super(InvoiceEletronic, self).action_cancel_document()
         if self.model not in ('001'):
-            return
+            return super(InvoiceEletronic, self).action_cancel_document(
+                justificativa=justificativa)
 
         cert = self.company_id.with_context({'bin_size': False}).nfe_a1_file
         cert_pfx = base64.decodestring(cert)