Merge lp:~vauxoo/openerp-venezuela-localization/jose-islr_wh_doc into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Status: Rejected
Rejected by: Gabriela Quilarque
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/jose-islr_wh_doc
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 38 lines (+18/-2)
1 file modified
l10n_ve_withholding_islr/islr_wh_doc.py (+18/-2)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/jose-islr_wh_doc
Reviewer Review Type Date Requested Status
Gabriela Quilarque Pending
Review via email: mp+90001@code.launchpad.net

Description of the change

Modified onchange to give invoices of partner selected

To post a comment you must log in.
Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

+ inv_ids = [i.id for i in inv_obj.browse(cr, uid, inv_ids,
context={}) for d in i.invoice_line if d.concept_id.withholdable]

para esta linea de codigo ya hay un metodo que verifica si una factura es
retenible por islr.

saludos.

con los siguientes parametros
2012/1/24 Jose Antonio Morales Ponce(vauxoo) <email address hidden>

> Jose Antonio Morales Ponce(vauxoo) has proposed merging
> lp:~vauxoo/openerp-venezuela-localization/jose-islr_wh_doc into
> lp:openerp-venezuela-localization.
>
> Requested reviews:
> Gabriela Quilarque (Vauxoo) (gabrielaquilarque97)
>
> For more details, see:
>
> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/jose-islr_wh_doc/+merge/90001
>
> Modified onchange to give invoices of partner selected
> --
>
> https://code.launchpad.net/~vauxoo/openerp-venezuela-localization/jose-islr_wh_doc/+merge/90001
> You are subscribed to branch lp:openerp-venezuela-localization.
>
> === modified file 'l10n_ve_withholding_islr/islr_wh_doc.py'
> --- l10n_ve_withholding_islr/islr_wh_doc.py 2012-01-19 23:04:33 +0000
> +++ l10n_ve_withholding_islr/islr_wh_doc.py 2012-01-24 21:01:12 +0000
> @@ -179,17 +179,33 @@
> return pool_seq._process(res['prefix']) +
> pool_seq._process(res['suffix'])
> return False
>
> +
> def onchange_partner_id(self, cr, uid, ids, type, partner_id):
> acc_id = False
> + inv_obj = self.pool.get('account.invoice')
> + invoice_obj = self.pool.get('islr.wh.doc.invoices')
> if partner_id:
> p = self.pool.get('res.partner').browse(cr, uid, partner_id)
> if type in ('out_invoice', 'out_refund'):
> acc_id = p.property_account_receivable.id
> else:
> acc_id = p.property_account_payable.id
> + if partner_id and type in ('out_invoice', 'out_refund'):
> +
> + inv_ids = inv_obj.search(cr,uid,[('state', '=',
> 'open'),('partner_id','=',partner_id)],context={})
> +
> + if inv_ids:
> + #~ Get only the invoices which are not in a document yet
> + inv_ids = [i.id for i in
> inv_obj.browse(cr,uid,inv_ids,context={}) if not i.islr_wh_doc_id]
> + inv_ids = [i for i in inv_ids if not invoice_obj.search(cr,
> uid, [('invoice_id', '=', i)])]
> + inv_ids = [i.id for i in inv_obj.browse(cr, uid, inv_ids,
> context={}) for d in i.invoice_line if d.concept_id.withholdable]
> +
> +
> result = {'value': {
> - 'account_id': acc_id}
> - }
> + 'account_id': acc_id,
> + 'islr_wh_doc_id':inv_ids,
> +
> + }}
>
> return result
>
>
>
>

Unmerged revisions

558. By Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com

[IMP] Method modified on_change_partner to return invoices with withholding line of a partner

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_ve_withholding_islr/islr_wh_doc.py'
--- l10n_ve_withholding_islr/islr_wh_doc.py 2012-01-19 23:04:33 +0000
+++ l10n_ve_withholding_islr/islr_wh_doc.py 2012-01-24 21:01:12 +0000
@@ -179,17 +179,33 @@
179 return pool_seq._process(res['prefix']) + pool_seq._process(res['suffix'])179 return pool_seq._process(res['prefix']) + pool_seq._process(res['suffix'])
180 return False180 return False
181181
182
182 def onchange_partner_id(self, cr, uid, ids, type, partner_id):183 def onchange_partner_id(self, cr, uid, ids, type, partner_id):
183 acc_id = False184 acc_id = False
185 inv_obj = self.pool.get('account.invoice')
186 invoice_obj = self.pool.get('islr.wh.doc.invoices')
184 if partner_id:187 if partner_id:
185 p = self.pool.get('res.partner').browse(cr, uid, partner_id)188 p = self.pool.get('res.partner').browse(cr, uid, partner_id)
186 if type in ('out_invoice', 'out_refund'):189 if type in ('out_invoice', 'out_refund'):
187 acc_id = p.property_account_receivable.id190 acc_id = p.property_account_receivable.id
188 else:191 else:
189 acc_id = p.property_account_payable.id192 acc_id = p.property_account_payable.id
193 if partner_id and type in ('out_invoice', 'out_refund'):
194
195 inv_ids = inv_obj.search(cr,uid,[('state', '=', 'open'),('partner_id','=',partner_id)],context={})
196
197 if inv_ids:
198 #~ Get only the invoices which are not in a document yet
199 inv_ids = [i.id for i in inv_obj.browse(cr,uid,inv_ids,context={}) if not i.islr_wh_doc_id]
200 inv_ids = [i for i in inv_ids if not invoice_obj.search(cr, uid, [('invoice_id', '=', i)])]
201 inv_ids = [i.id for i in inv_obj.browse(cr, uid, inv_ids, context={}) for d in i.invoice_line if d.concept_id.withholdable]
202
203
190 result = {'value': {204 result = {'value': {
191 'account_id': acc_id}205 'account_id': acc_id,
192 }206 'islr_wh_doc_id':inv_ids,
207
208 }}
193209
194 return result210 return result
195211