Merge lp:~jmarquez/openerp-venezuela-localization/nhomar-tecvemar-refund into lp:~vauxoo/openerp-venezuela-localization/jose-tecvemar-sale

Proposed by Nhomar - Vauxoo
Status: Merged
Merged at revision: 47
Proposed branch: lp:~jmarquez/openerp-venezuela-localization/nhomar-tecvemar-refund
Merge into: lp:~vauxoo/openerp-venezuela-localization/jose-tecvemar-sale
Diff against target: 54 lines (+23/-2)
3 files modified
extra_UOM/__openerp__.py (+1/-1)
extra_UOM/model/account_invoice.py (+22/-0)
extra_UOM/model/extra_UOM.py (+0/-1)
To merge this branch: bzr merge lp:~jmarquez/openerp-venezuela-localization/nhomar-tecvemar-refund
Reviewer Review Type Date Requested Status
Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com merge Pending
Review via email: mp+86484@code.launchpad.net

Description of the change

Problema con la generacion de la Nota de Credito resuelto......

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 'extra_UOM/__openerp__.py'
2--- extra_UOM/__openerp__.py 2011-12-05 23:38:06 +0000
3+++ extra_UOM/__openerp__.py 2011-12-20 23:48:23 +0000
4@@ -22,7 +22,7 @@
5 "version" : "0.4",
6 "author" : "Tecvemar,ca - Juan Márquez",
7 "category" : "Custom",
8- "depends" : ["base", "account", "product", "stock", "mrp", "sale","purchase"],
9+ "depends" : ["base", "account", "product", "stock", "mrp", "sale","purchase","l10n_ve_fiscal_requirements"],
10 "init_xml" : [],
11 # "demo_xml" : ["extra_UOM_demo.xml"],
12 "demo_xml" : [],
13
14=== modified file 'extra_UOM/model/account_invoice.py'
15--- extra_UOM/model/account_invoice.py 2011-11-18 17:52:19 +0000
16+++ extra_UOM/model/account_invoice.py 2011-12-20 23:48:23 +0000
17@@ -33,3 +33,25 @@
18 }
19
20 account_invoice_line()
21+
22+
23+class account_invoice(osv.osv):
24+ _inherit = "account.invoice"
25+
26+ def _refund_cleanup_lines(self, cr, uid, lines):
27+ """
28+ Metodo creado para agregar ,"prod_lot_id" en la generacion de la factura rectificativa
29+ """
30+ for line in lines:
31+ del line['id']
32+ del line['invoice_id']
33+ #TODO Verify one more elegant way to do this
34+ for field in ('company_id', 'partner_id', 'account_id', 'product_id',
35+ 'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id',"prod_lot_id",
36+ "concept_id","tax_id"):
37+ line[field] = line.get(field, False) and line[field][0]
38+ if 'invoice_line_tax_id' in line:
39+ line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
40+ return map(lambda x: (0,0,x), lines)
41+
42+account_invoice()
43
44=== modified file 'extra_UOM/model/extra_UOM.py'
45--- extra_UOM/model/extra_UOM.py 2011-12-20 20:38:47 +0000
46+++ extra_UOM/model/extra_UOM.py 2011-12-20 23:48:23 +0000
47@@ -135,7 +135,6 @@
48 for r in reads:
49 #TODO optimize with only one read for all ids, or maybe use "self" data
50 l = self.pool.get('stock.production.lot').browse(cr,uid,r.id)
51- print "l.product_id",l.product_id
52 if l.product_id:
53 drv = l.product_id.stock_driver
54 if drv == 'tile':

Subscribers

People subscribed via source and target branches

to all changes: