Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0-diot_changes-dev-julio into lp:addons-vauxoo/7.0

  1. 7.0-diot_changes-dev-julio
  2. Merge into 7.0
Proposed by Julio Serna-http://www.vauxoo.com
Status: Merged
Merged at revision: 934
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-diot_changes-dev-julio
Merge into: lp:addons-vauxoo/7.0
Diff against target: 39 lines (+6/-5)
2 files modified
account_update_amount_tax_in_move_lines/wizard/update_amount_base_tax_wizard.py (+5/-4)
account_voucher_tax/account_voucher.py (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-diot_changes-dev-julio
Reviewer Review Type Date Requested Status
Isaac López Zúñiga Pending
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+195305@code.launchpad.net

Description of the change

Agrega condición en las validaciones cuando el impuesto es IVA-PART y en los impuestos exento

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_update_amount_tax_in_move_lines/wizard/update_amount_base_tax_wizard.py'
--- account_update_amount_tax_in_move_lines/wizard/update_amount_base_tax_wizard.py 2013-10-24 00:06:21 +0000
+++ account_update_amount_tax_in_move_lines/wizard/update_amount_base_tax_wizard.py 2013-11-14 20:33:56 +0000
@@ -85,7 +85,7 @@
85 company_id = self.pool.get('res.company')._company_default_get(cr, uid,85 company_id = self.pool.get('res.company')._company_default_get(cr, uid,
86 'update.amount.tax.wizard', context=context)86 'update.amount.tax.wizard', context=context)
87 category_iva_ids = acc_tax_category_obj.search(cr, uid, [\87 category_iva_ids = acc_tax_category_obj.search(cr, uid, [\
88 ('name', 'in', ('IVA', 'IVA-EXENTO', 'IVA-RET'))], context=context)88 ('name', 'in', ('IVA', 'IVA-EXENTO', 'IVA-RET', 'IVA-PART'))], context=context)
89 tax_ids = acc_tax_obj.search(cr, uid, [89 tax_ids = acc_tax_obj.search(cr, uid, [
90 ('company_id', '=' ,company_id),90 ('company_id', '=' ,company_id),
91 ('type_tax_use', '=', 'purchase'),91 ('type_tax_use', '=', 'purchase'),
@@ -111,9 +111,10 @@
111 SET amount_base = %s111 SET amount_base = %s
112 WHERE id = %s""", (abs(amount_base/amount_tax), move.id))112 WHERE id = %s""", (abs(amount_base/amount_tax), move.id))
113 else:113 else:
114 cr.execute("""UPDATE account_move_line114 if amount_base:
115 SET amount_base = %s115 cr.execute("""UPDATE account_move_line
116 WHERE id = %s""", (amount_base, move.id))116 SET amount_base = %s
117 WHERE id = %s""", (amount_base, move.id))
117 lines_incorects_ids = move_line_obj.search(cr, uid, [('company_id', '=', company_id),118 lines_incorects_ids = move_line_obj.search(cr, uid, [('company_id', '=', company_id),
118 ('amount_base', '!=', False), ('tax_id_secondary', '=', False)], context=context)119 ('amount_base', '!=', False), ('tax_id_secondary', '=', False)], context=context)
119 for line in lines_incorects_ids:120 for line in lines_incorects_ids:
120121
=== modified file 'account_voucher_tax/account_voucher.py'
--- account_voucher_tax/account_voucher.py 2013-11-01 19:08:32 +0000
+++ account_voucher_tax/account_voucher.py 2013-11-14 20:33:56 +0000
@@ -405,7 +405,7 @@
405 amount_base = 0405 amount_base = 0
406 tax_secondary = False406 tax_secondary = False
407 if line_tax and line_tax.tax_category_id and line_tax.tax_category_id.name in (\407 if line_tax and line_tax.tax_category_id and line_tax.tax_category_id.name in (\
408 'IVA', 'IVA-EXENTO', 'IVA-RET'):408 'IVA', 'IVA-EXENTO', 'IVA-RET', 'IVA-PART'):
409 amount_base = line_tax.tax_category_id.value_tax and\409 amount_base = line_tax.tax_category_id.value_tax and\
410 reference_amount/line_tax.tax_category_id.value_tax\410 reference_amount/line_tax.tax_category_id.value_tax\
411 or amount_base_tax411 or amount_base_tax