Fix errors and coding style (from tests and pyflakes)

account_voucher_ar.py

@@ -52,10 +52,12 @@ class AccountVoucher(metaclass=PoolMeta):
                 'depends': ['voucher_type', 'state'],
                 },
             'recalculate': {
-                'invisible': And(
+                'invisible': Or(
+                    Eval('voucher_type') != 'payment',
                     Eval('state') != 'calculated',
                     Eval('amount_to_pay', 0) > Eval('amount', 0)),
-                'depends': ['state', 'amount_to_pay', 'amount'],
+                'depends': ['voucher_type', 'state', 'amount_to_pay',
+                    'amount'],
                 },
             'draft': {
                 'invisible': Eval('state') != 'calculated',

company.py

@@ -39,7 +39,8 @@ class CompanyWithholdingIIBB(ModelSQL):
     company = fields.Many2One('company.company', 'Company',
         ondelete='CASCADE', required=True)
     regimen = fields.Many2One('account.retencion', 'Régimen',
-        ondelete='CASCADE', required=True)
+        ondelete='CASCADE', required=True,
+        context={'company': Eval('company', -1)}, depends={'company'})
 
 
 class CompanyPerceptionIIBB(ModelSQL):
@@ -49,4 +50,5 @@ class CompanyPerceptionIIBB(ModelSQL):
     company = fields.Many2One('company.company', 'Company',
         ondelete='CASCADE', required=True)
     regimen = fields.Many2One('account.tax', 'Régimen',
-        ondelete='CASCADE', required=True)
+        ondelete='CASCADE', required=True,
+        context={'company': Eval('company', -1)}, depends={'company'})

invoice.py

@@ -136,7 +136,8 @@ class InvoiceLine(metaclass=PoolMeta):
     ganancias_regimen = fields.Many2One('account.retencion',
         'Régimen Ganancias',
         domain=[('type', '=', 'efectuada'), ('tax', '=', 'gana')],
-        states={'invisible': Eval('invoice_type') != 'in'})
+        states={'invisible': Eval('invoice_type') != 'in'},
+        context={'company': Eval('company', -1)}, depends={'company'})
 
     @fields.depends('product', 'invoice', '_parent_invoice.type',
         'invoice_type')

tests/scenario_account_retencion_ar.rst

@@ -56,10 +56,21 @@ Create chart of accounts::
     >>> account_tax = accounts['tax']
     >>> account_cash = accounts['cash']
 
+Create tax groups::
+
+    >>> TaxGroup = Model.get('account.tax.group')
+    >>> tax_group = TaxGroup()
+    >>> tax_group.name = 'gravado'
+    >>> tax_group.code = 'gravado'
+    >>> tax_group.kind = 'both'
+    >>> tax_group.afip_kind = 'gravado'
+    >>> tax_group.save()
+
 Create tax::
 
     >>> TaxCode = Model.get('account.tax.code')
     >>> tax = create_tax(Decimal('.10'))
+    >>> tax.group = tax_group
     >>> tax.save()
     >>> invoice_base_code = create_tax_code(tax, 'base', 'invoice')
     >>> invoice_base_code.save()
@@ -155,10 +166,12 @@ Create Retenciones::
     >>> retencion_soportada = Retencion(name='Retencion soportada')
     >>> retencion_soportada.account = account_tax
     >>> retencion_soportada.type = 'soportada'
+    >>> retencion_soportada.tax = 'iva'
     >>> retencion_soportada.save()
     >>> retencion_efectuada = Retencion(name='Retencion efectuada')
     >>> retencion_efectuada.account = account_tax
     >>> retencion_efectuada.type = 'efectuada'
+    >>> retencion_efectuada.tax = 'iva'
     >>> retencion_efectuada.sequence = create_retencion_sequence()
     >>> retencion_efectuada.save()
 
@@ -168,7 +181,7 @@ Create invoice::
     >>> InvoiceLine = Model.get('account.invoice.line')
     >>> invoice = Invoice()
     >>> invoice.party = party
-    >>> invoice.payment_term = None
+    >>> invoice.payment_term = payment_term
     >>> line = InvoiceLine()
     >>> invoice.lines.append(line)
     >>> line.product = product

tests/tools.py

@@ -15,7 +15,7 @@ def create_retencion_sequence(company=None, config=None):
         company = get_company()
 
     retencion_seq_type, = SequenceType.find([
-        ('name', '=', 'Account Retencion'),
+        ('name', '=', 'Tax Withholding'),
         ], limit=1)
     retencion_seq = Sequence(
         name='Retencion',