openerp-mexico-localization

Merge lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_diot_movement_in_debit_dev_luis into lp:openerp-mexico-localization/7.0

  1. 7.0_l10n_mx_diot_movement_in_debit_dev_luis
  2. Merge into 7.0
Proposed by Luis Torres - http://www.vauxoo.com
Status: Merged
Merged at revision: 308
Proposed branch: lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_diot_movement_in_debit_dev_luis
Merge into: lp:openerp-mexico-localization/7.0
Diff against target: 32 lines (+8/-5)
1 file modified
l10n_mx_diot_report/wizard/wizard_diot_report.py (+8/-5)
To merge this branch: bzr merge lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_diot_movement_in_debit_dev_luis
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
Isaac López Zúñiga Pending
Review via email: mp+188965@code.launchpad.net

Description of the change

Se agrego que cuando se concideren los movimientos para el DIOT, si estos tienen monto en el debe se reste el monto base.

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
1=== modified file 'l10n_mx_diot_report/wizard/wizard_diot_report.py'
2--- l10n_mx_diot_report/wizard/wizard_diot_report.py 2013-09-02 22:01:57 +0000
3+++ l10n_mx_diot_report/wizard/wizard_diot_report.py 2013-10-03 00:29:30 +0000
4@@ -139,20 +139,23 @@
5 continue
6 if line.date >= period.date_start and line.date <= period.date_stop:
7 amount_0 = amount_16 = amount_exe = amount_11 = amount_ret = 0
8+ amount_base = line.amount_base or 0
9+ if line.credit:
10+ amount_base = amount_base * -1
11 if line.tax_id_secondary.tax_category_id.name == 'IVA' and\
12 line.tax_id_secondary.amount == 0.16:
13- amount_16 = line.amount_base or 0
14+ amount_16 = amount_base or 0
15 if line.tax_id_secondary.tax_category_id.name == 'IVA' and\
16 line.tax_id_secondary.amount == 0.11:
17- amount_11 = line.amount_base or 0
18+ amount_11 = amount_base or 0
19 if line.tax_id_secondary.tax_category_id.name == 'IVA' and\
20 line.tax_id_secondary.amount == 0:
21- amount_0 = line.amount_base or 0
22+ amount_0 = amount_base or 0
23 if line.tax_id_secondary.tax_category_id.name == 'IVA-EXENTO'\
24 and line.tax_id_secondary.amount == 0:
25- amount_exe = line.amount_base or 0
26+ amount_exe = amount_base or 0
27 if line.tax_id_secondary.tax_category_id.name == 'IVA-RET':
28- amount_ret = line.credit or 0
29+ amount_ret = line.credit or line.debit * -1 or 0
30 if amount_0 + amount_16 + amount_exe + amount_11 + amount_ret == 0:
31 moves_amount_0.append(line.id)
32 if partner_vat in dic_move_line: