openerp-mexico-localization

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

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

Description of the change

Se quito dentro de los movimientos que deben aparecer en el reporte que busque los que están conciliados,

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

[IMP][l10n_mx_diot_report]Change values in sum list

244. By Luis Torres - http://www.vauxoo.com

[IMP][l10n_mx_diot_report]Added that only take movements that have account of payment

245. By Luis Torres - http://www.vauxoo.com

[FIX][l10n_mx_diot_report]Repair in tax by 'RET-IVA' take the amount paid, and not the amount base, that is the correct way

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-07-24 22:47:29 +0000
3+++ l10n_mx_diot_report/wizard/wizard_diot_report.py 2013-08-01 17:23:38 +0000
4@@ -83,20 +83,31 @@
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 ('type_tax_use', '=', 'purchase'),
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 move_lines_diot = acc_move_line_obj.search(cr, uid, [
29 ('period_id', '=', period.id),
30 ('tax_id_secondary', 'in', tax_purchase_ids),
31- '|', ('reconcile_id', '!=', False),
32- ('reconcile_partial_id', '!=', False)])
33+ ('journal_id', 'in', journal_ids),
34+ ('account_id', 'in', account_ids_tax)])
35 dic_move_line = {}
36 partner_ids_to_fix = []
37 moves_without_partner = []
38@@ -133,18 +144,18 @@
39 amount_0 = amount_16 = amount_exe = amount_11 = amount_ret = 0
40 if line.tax_id_secondary.tax_category_id.name == 'IVA' and\
41 line.tax_id_secondary.amount == 0.16:
42- amount_16 = line.amount_base
43+ amount_16 = line.amount_base or 0
44 if line.tax_id_secondary.tax_category_id.name == 'IVA' and\
45 line.tax_id_secondary.amount == 0.11:
46- amount_11 = line.amount_base
47+ amount_11 = line.amount_base or 0
48 if line.tax_id_secondary.tax_category_id.name == 'IVA' and\
49 line.tax_id_secondary.amount == 0:
50- amount_0 = line.amount_base
51+ amount_0 = line.amount_base or 0
52 if line.tax_id_secondary.tax_category_id.name == 'IVA-EXENTO'\
53 and line.tax_id_secondary.amount == 0:
54- amount_exe = line.amount_base
55+ amount_exe = line.amount_base or 0
56 if line.tax_id_secondary.tax_category_id.name == 'IVA-RET':
57- amount_ret = line.amount_base
58+ amount_ret = line.debit or 0
59 if partner_vat in dic_move_line:
60 line_move = dic_move_line[partner_vat]
61 line_move[7] = line_move[7] + amount_16
62@@ -223,7 +234,7 @@
63 'show_pipe', ], delimiter='|')
64 for diot in dic_move_line:
65 diot_list = dic_move_line.get(diot, False)
66- if diot_list and sum(diot_list[7:11]) == 0:
67+ if diot_list and sum(diot_list[7:12]) == 0:
68 partner_ids_tax_0.append(self.pool.get('res.partner').search(
69 cr, uid, [('vat_split', '=', diot)])[0])
70 if partner_ids_tax_0: