openerp-mexico-localization

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

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

Description of the change

Se cambio que se concidere el credito y las cuentas correctas en los movimientos a mostrar en el diot

To post a comment you must log in.
lp:~vauxoo/openerp-mexico-localization/7.0-diot_ret_dev_luis updated
252. By Luis Torres - http://www.vauxoo.com

[MERGE]oml

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-08-13 19:07:49 +0000
3+++ l10n_mx_diot_report/wizard/wizard_diot_report.py 2013-08-13 23:10:34 +0000
4@@ -83,13 +83,10 @@
5 acc_move_line_obj = self.pool.get('account.move.line')
6 acc_tax_obj = self.pool.get('account.tax')
7 acc_tax_category_obj = self.pool.get('account.tax.category')
8- acc_journal_obj = self.pool.get('account.journal')
9 this = self.browse(cr, uid, ids)[0]
10 period = this.period_id
11 matrix_row = []
12 amount_exe = 0
13- #~ journal_ids = acc_journal_obj.search(cr, uid, [('type', 'not in',
14- #~ ('purchase', 'sale'))], context=context)
15 category_iva_ids = acc_tax_category_obj.search(cr, uid, [
16 ('name', 'in', ('IVA', 'IVA-EXENTO', 'IVA-RET'))], context=context)
17 tax_purchase_ids = acc_tax_obj.search(cr, uid, [
18@@ -97,16 +94,10 @@
19 ('tax_category_id', 'in', category_iva_ids)], context=context)
20 account_ids_tax = []
21 for tax in acc_tax_obj.browse(cr, uid, tax_purchase_ids, context=context):
22- if tax.tax_category_id and tax.tax_category_id.name == 'IVA-RET':
23- if tax.account_collected_id:
24- account_ids_tax.append(tax.account_collected_id.id)
25- else:
26- if tax.account_paid_voucher_id:
27- account_ids_tax.append(tax.account_paid_voucher_id.id)
28+ account_ids_tax.append(tax.account_paid_voucher_id.id)
29 move_lines_diot = acc_move_line_obj.search(cr, uid, [
30 ('period_id', '=', period.id),
31 ('tax_id_secondary', 'in', tax_purchase_ids),
32- #~ ('journal_id', 'in', journal_ids),
33 ('account_id', 'in', account_ids_tax)])
34 dic_move_line = {}
35 partner_ids_to_fix = []
36@@ -155,7 +146,7 @@
37 and line.tax_id_secondary.amount == 0:
38 amount_exe = line.amount_base or 0
39 if line.tax_id_secondary.tax_category_id.name == 'IVA-RET':
40- amount_ret = line.debit or 0
41+ amount_ret = line.credit or 0
42 if partner_vat in dic_move_line:
43 line_move = dic_move_line[partner_vat]
44 line_move[7] = line_move[7] + amount_16