Merge lp:~vauxoo/openerp-venezuela-localization/israel_l10n-ve-islr-sale-purchase into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Proposed by Israel Fermin Montilla
Status: Merged
Merged at revision: 406
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/israel_l10n-ve-islr-sale-purchase
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 610 lines (+552/-0)
10 files modified
l10n_ve_sale_purchase/__init__.py (+31/-0)
l10n_ve_sale_purchase/__openerp__.py (+49/-0)
l10n_ve_sale_purchase/product.py (+69/-0)
l10n_ve_sale_purchase/purchase.py (+81/-0)
l10n_ve_sale_purchase/sale.py (+66/-0)
l10n_ve_sale_purchase/stock.py (+68/-0)
l10n_ve_sale_purchase/view/product_view.xml (+69/-0)
l10n_ve_sale_purchase/view/purchase_view.xml (+37/-0)
l10n_ve_sale_purchase/view/sale_order_view.xml (+44/-0)
l10n_ve_sale_purchase/view/stock_view.xml (+38/-0)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/israel_l10n-ve-islr-sale-purchase
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo Pending
Review via email: mp+78182@code.launchpad.net

Description of the change

The module installs and everything works. It fails on the unit tests (yml) on sale and stock modules and those are the errors that the server logs during the module instalation

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=== added directory 'l10n_ve_sale_purchase'
2=== added file 'l10n_ve_sale_purchase/__init__.py'
3--- l10n_ve_sale_purchase/__init__.py 1970-01-01 00:00:00 +0000
4+++ l10n_ve_sale_purchase/__init__.py 2011-10-05 00:11:23 +0000
5@@ -0,0 +1,31 @@
6+# -*- encoding: utf-8 -*-
7+##############################################################################
8+# Copyright (c) 2011 OpenERP Venezuela (http://openerp.com.ve)
9+# All Rights Reserved.
10+# Programmed by: Israel Fermín Montilla <israel@openerp.com.ve>
11+#
12+# WARNING: This program as such is intended to be used by professional
13+# programmers who take the whole responsability of assessing all potential
14+# consequences resulting from its eventual inadequacies and bugs
15+# End users who are looking for a ready-to-use solution with commercial
16+# garantees and support are strongly adviced to contract a Free Software
17+# Service Company
18+#
19+# This program is Free Software; you can redistribute it and/or
20+# modify it under the terms of the GNU General Public License
21+# as published by the Free Software Foundation; either version 2
22+# of the License, or (at your option) any later version.
23+#
24+# This program is distributed in the hope that it will be useful,
25+# but WITHOUT ANY WARRANTY; without even the implied warranty of
26+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27+# GNU General Public License for more details.
28+#
29+# You should have received a copy of the GNU General Public License
30+# along with this program; if not, write to the Free Software
31+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
32+###############################################################################
33+import stock
34+import purchase
35+import sale
36+import product
37
38=== added file 'l10n_ve_sale_purchase/__openerp__.py'
39--- l10n_ve_sale_purchase/__openerp__.py 1970-01-01 00:00:00 +0000
40+++ l10n_ve_sale_purchase/__openerp__.py 2011-10-05 00:11:23 +0000
41@@ -0,0 +1,49 @@
42+# -*- encoding: utf-8 -*-
43+##############################################################################
44+# Copyright (c) 2011 OpenERP Venezuela (http://openerp.com.ve)
45+# All Rights Reserved.
46+# Programmed by: Israel Fermín Montilla <israel@openerp.com.ve>
47+#
48+# WARNING: This program as such is intended to be used by professional
49+# programmers who take the whole responsability of assessing all potential
50+# consequences resulting from its eventual inadequacies and bugs
51+# End users who are looking for a ready-to-use solution with commercial
52+# garantees and support are strongly adviced to contract a Free Software
53+# Service Company
54+#
55+# This program is Free Software; you can redistribute it and/or
56+# modify it under the terms of the GNU General Public License
57+# as published by the Free Software Foundation; either version 2
58+# of the License, or (at your option) any later version.
59+#
60+# This program is distributed in the hope that it will be useful,
61+# but WITHOUT ANY WARRANTY; without even the implied warranty of
62+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
63+# GNU General Public License for more details.
64+#
65+# You should have received a copy of the GNU General Public License
66+# along with this program; if not, write to the Free Software
67+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
68+###############################################################################
69+{
70+ 'name' : 'ISLR Sale and Purchase Functionalities',
71+ 'version' : '0.1',
72+ 'author' : 'Vauxoo',
73+ 'description' : '''
74+ Due to the Dependendy reduction on the l10n_ve_islr_withholding module, it was necesary to incorporate
75+ the functionalities wich has to do with the eliminated dependencies on another module. That's what this one
76+ was created for.
77+ ''',
78+ 'category' : '',
79+ 'website' : 'http://openerp.com',
80+ 'depends' : ['sale', 'purchase', 'stock', 'l10n_ve_islr_withholding'],
81+ 'update_xml' : [
82+ 'view/product_view.xml',
83+ 'view/stock_view.xml',
84+ 'view/purchase_view.xml',
85+ 'view/sale_order_view.xml',
86+ ],
87+ 'demo' : [],
88+ 'active' : False,
89+ 'installable': True,
90+}
91
92=== added directory 'l10n_ve_sale_purchase/data'
93=== added directory 'l10n_ve_sale_purchase/demo'
94=== added directory 'l10n_ve_sale_purchase/i18n'
95=== added file 'l10n_ve_sale_purchase/product.py'
96--- l10n_ve_sale_purchase/product.py 1970-01-01 00:00:00 +0000
97+++ l10n_ve_sale_purchase/product.py 2011-10-05 00:11:23 +0000
98@@ -0,0 +1,69 @@
99+#!/usr/bin/python
100+# -*- encoding: utf-8 -*-
101+###########################################################################
102+# Module Writen to OpenERP, Open Source Management Solution
103+# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
104+# All Rights Reserved
105+###############Credits######################################################
106+# Coded by: Humberto Arocha <humberto@openerp.com.ve>
107+# Maria Gabriela Quilarque <gabrielaquilarque97@gmail.com>
108+# Javier Duran <javier@vauxoo.com>
109+# Planified by: Nhomar Hernandez
110+# Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
111+# Audited by: Humberto Arocha humberto@openerp.com.ve
112+#############################################################################
113+# This program is free software: you can redistribute it and/or modify
114+# it under the terms of the GNU General Public License as published by
115+# the Free Software Foundation, either version 3 of the License, or
116+# (at your option) any later version.
117+#
118+# This program is distributed in the hope that it will be useful,
119+# but WITHOUT ANY WARRANTY; without even the implied warranty of
120+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
121+# GNU General Public License for more details.
122+#
123+# You should have received a copy of the GNU General Public License
124+# along with this program. If not, see <http://www.gnu.org/licenses/>.
125+##############################################################################
126+from osv import osv
127+from osv import fields
128+from tools.translate import _
129+from tools import config
130+import time
131+import datetime
132+
133+class product_template(osv.osv):
134+
135+ _inherit = "product.template"
136+
137+ _columns = {
138+ 'concept_id': fields.many2one('islr.wh.concept','Withhold Concept',help="Concept Withholding Income to apply to the service", required=False),
139+ }
140+
141+product_template()
142+
143+
144+class product_product(osv.osv):
145+
146+ _inherit = "product.product"
147+ '''
148+ Funcion que agrega un concepto por defecto para los productos que no son de servicios
149+ '''
150+ def onchange_product_type(self, cr, uid, ids, prd_type, context=None):
151+ concept_id = False
152+ if prd_type != 'service':
153+ concept_obj = self.pool.get('islr.wh.concept')
154+
155+ concept_id = concept_obj.search(cr, uid, [('id','<>',None)])
156+
157+ if concept_id:
158+ concept_id = concept_obj.search(cr, uid, [('name','ilike','RETENTION DOES NOT APPLY')])[0]
159+ else:
160+ raise osv.except_osv(_('Invalid action !'),_("Must create the concept of withholding income"))
161+
162+ return {'value' : {'concept_id':concept_id or False}}
163+
164+product_product()
165+
166+
167+
168
169=== added file 'l10n_ve_sale_purchase/purchase.py'
170--- l10n_ve_sale_purchase/purchase.py 1970-01-01 00:00:00 +0000
171+++ l10n_ve_sale_purchase/purchase.py 2011-10-05 00:11:23 +0000
172@@ -0,0 +1,81 @@
173+#!/usr/bin/python
174+# -*- encoding: utf-8 -*-
175+###########################################################################
176+# Module Writen to OpenERP, Open Source Management Solution
177+# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
178+# All Rights Reserved
179+###############Credits######################################################
180+# Coded by: Humberto Arocha <humberto@openerp.com.ve>
181+# Maria Gabriela Quilarque <gabrielaquilarque97@gmail.com>
182+# Javier Duran <javier@vauxoo.com>
183+# Planified by: Nhomar Hernandez
184+# Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
185+# Audited by: Humberto Arocha humberto@openerp.com.ve
186+#############################################################################
187+# This program is free software: you can redistribute it and/or modify
188+# it under the terms of the GNU General Public License as published by
189+# the Free Software Foundation, either version 3 of the License, or
190+# (at your option) any later version.
191+#
192+# This program is distributed in the hope that it will be useful,
193+# but WITHOUT ANY WARRANTY; without even the implied warranty of
194+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
195+# GNU General Public License for more details.
196+#
197+# You should have received a copy of the GNU General Public License
198+# along with this program. If not, see <http://www.gnu.org/licenses/>.
199+##############################################################################
200+from osv import osv
201+from osv import fields
202+from tools.translate import _
203+from tools import config
204+import time
205+import datetime
206+
207+class purchase_order_line(osv.osv):
208+
209+ _name="purchase.order.line"
210+ _inherit ="purchase.order.line"
211+
212+ _columns = {
213+ 'concept_id': fields.many2one('islr.wh.concept','Withhold Concept',help="Withhold concept associated with this rate",required=False),
214+ }
215+
216+ def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom, partner_id, date_order=False, fiscal_position=False, date_planned=False, name=False, price_unit=False, notes=False):
217+ '''
218+ This method loads the withholding concept to a product automatically
219+ '''
220+ data = super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,partner_id, date_order, fiscal_position)
221+ if not product:
222+ return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}
223+ pro = self.pool.get('product.product').browse(cr, uid, product)
224+ concepto=pro.concept_id.id
225+ data[data.keys()[1]]['concept_id'] = concepto
226+ return data
227+
228+purchase_order_line()
229+
230+
231+class purchase_order(osv.osv):
232+ _inherit = 'purchase.order'
233+
234+ def inv_line_create(self, cr, uid, a, ol):
235+ '''
236+ This method adds the withholding concept to an invoice.
237+ '''
238+ data = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
239+ data[2]['concept_id'] = ol.concept_id.id
240+ return data
241+
242+ def onchange_partner_id(self, cr, uid, ids, part):
243+ '''
244+ Return invoicing address by default
245+ '''
246+ if not part:
247+ return {'value':{'partner_address_id': False, 'fiscal_position': False}}
248+ addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
249+ part = self.pool.get('res.partner').browse(cr, uid, part)
250+ pricelist = part.property_product_pricelist_purchase.id
251+ fiscal_position = part.property_account_position and part.property_account_position.id or False
252+ return {'value':{'partner_address_id': addr['invoice'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
253+purchase_order()
254
255=== added directory 'l10n_ve_sale_purchase/report'
256=== added file 'l10n_ve_sale_purchase/sale.py'
257--- l10n_ve_sale_purchase/sale.py 1970-01-01 00:00:00 +0000
258+++ l10n_ve_sale_purchase/sale.py 2011-10-05 00:11:23 +0000
259@@ -0,0 +1,66 @@
260+#!/usr/bin/python
261+# -*- encoding: utf-8 -*-
262+###########################################################################
263+# Module Writen to OpenERP, Open Source Management Solution
264+# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
265+# All Rights Reserved
266+###############Credits######################################################
267+# Coded by: Humberto Arocha <humberto@openerp.com.ve>
268+# Maria Gabriela Quilarque <gabrielaquilarque97@gmail.com>
269+# Javier Duran <javier@vauxoo.com>
270+# Planified by: Nhomar Hernandez
271+# Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
272+# Audited by: Humberto Arocha humberto@openerp.com.ve
273+#############################################################################
274+# This program is free software: you can redistribute it and/or modify
275+# it under the terms of the GNU General Public License as published by
276+# the Free Software Foundation, either version 3 of the License, or
277+# (at your option) any later version.
278+#
279+# This program is distributed in the hope that it will be useful,
280+# but WITHOUT ANY WARRANTY; without even the implied warranty of
281+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
282+# GNU General Public License for more details.
283+#
284+# You should have received a copy of the GNU General Public License
285+# along with this program. If not, see <http://www.gnu.org/licenses/>.
286+##############################################################################
287+from osv import osv
288+from osv import fields
289+from tools.translate import _
290+from tools import config
291+import time
292+import datetime
293+
294+class sale_order_line(osv.osv):
295+ _inherit = "sale.order.line"
296+
297+ _columns = {
298+ 'concept_id': fields.many2one('islr.wh.concept','Withhold Concept',help="Withhold concept associated with this rate",required=False),
299+ }
300+
301+ def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,uom=False, qty_uos=0, uos=False, name='', partner_id=False,lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
302+ data = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty,uom, qty_uos, uos, name, partner_id,lang, update_tax, date_order, packaging, fiscal_position, flag)
303+ if not product:
304+ return {'value': {'th_weight': 0, 'product_packaging': False,'product_uos_qty': qty}, 'domain': {'product_uom': [],'product_uos': []}}
305+ pro = self.pool.get('product.product').browse(cr, uid, product)
306+ concepto=pro.concept_id.id
307+ data[data.keys()[2]]['concept_id'] = concepto
308+ return data
309+
310+ #~metodo que agrega al original el concepto en las lineas de retencion de venta, es llamado por action_invoice_create() en sale.order
311+ def invoice_line_create(self, cr, uid, ids, context={}):
312+ create_ids = super(sale_order_line, self).invoice_line_create(cr, uid, ids, context)
313+ invoice_line_brws = self.pool.get('account.invoice.line').browse(cr, uid, create_ids)
314+ order_line_sale_brws = self.pool.get('sale.order.line').browse(cr, uid, ids)
315+ for line_invoice in invoice_line_brws: #lineas de la factura
316+ for line_sale in order_line_sale_brws: #lineas de la orden de venta
317+ if line_sale.product_id==line_invoice.product_id: #si es la misma linea
318+ self.pool.get('account.invoice.line').write(cr, uid, line_invoice.id, {'concept_id':line_sale.concept_id.id})
319+ return create_ids
320+sale_order_line()
321+
322+
323+
324+
325+
326
327=== added directory 'l10n_ve_sale_purchase/security'
328=== added file 'l10n_ve_sale_purchase/stock.py'
329--- l10n_ve_sale_purchase/stock.py 1970-01-01 00:00:00 +0000
330+++ l10n_ve_sale_purchase/stock.py 2011-10-05 00:11:23 +0000
331@@ -0,0 +1,68 @@
332+#!/usr/bin/python
333+# -*- encoding: utf-8 -*-
334+###########################################################################
335+# Module Writen to OpenERP, Open Source Management Solution
336+# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
337+# All Rights Reserved
338+###############Credits######################################################
339+# Coded by: Humberto Arocha <humberto@openerp.com.ve>
340+# Maria Gabriela Quilarque <gabriela@vauxoo.com>
341+# Javier Duran <javier@vauxoo.com>
342+# Planified by: Nhomar Hernandez
343+# Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
344+# Audited by: Humberto Arocha humberto@openerp.com.ve
345+#############################################################################
346+# This program is free software: you can redistribute it and/or modify
347+# it under the terms of the GNU General Public License as published by
348+# the Free Software Foundation, either version 3 of the License, or
349+# (at your option) any later version.
350+#
351+# This program is distributed in the hope that it will be useful,
352+# but WITHOUT ANY WARRANTY; without even the implied warranty of
353+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
354+# GNU General Public License for more details.
355+#
356+# You should have received a copy of the GNU General Public License
357+# along with this program. If not, see <http://www.gnu.org/licenses/>.
358+##############################################################################
359+from osv import osv
360+from osv import fields
361+from tools.translate import _
362+from tools import config
363+import time
364+
365+class stock_picking(osv.osv):
366+ _inherit = 'stock.picking'
367+ '''
368+ Funcion que agrega a la invoice_lines el concepto de retencion a partir de una orden de compra u orden de venta,
369+ con metodo de facturacion a partir de albaran
370+ '''
371+ def action_invoice_create(self, cursor, user, ids, journal_id=False,group=False, type='out_invoice', context=None):
372+ if context is None:
373+ context = {}
374+ data = super(stock_picking, self).action_invoice_create(cursor, user, ids, journal_id, group, type, context)
375+ picking_id=data.keys()[0]
376+ invoice_id=data[picking_id]
377+ invoice_brw = self.pool.get('account.invoice').browse(cursor, user, invoice_id)
378+ picking_brw=self.browse(cursor, user, picking_id)
379+ if type == 'in_invoice' or type == 'in_refund': #ORDENES DE COMPRA
380+ for line_invoice in invoice_brw.invoice_line: #lineas de la factura
381+ for line_orden in picking_brw.purchase_id.order_line: #lineas de la orden de compra
382+ if line_invoice.product_id==line_orden.product_id: #si es la misma linea
383+ self.pool.get('account.invoice.line').write(cursor, user, line_invoice.id, {'concept_id':line_orden.concept_id.id})
384+ return data
385+ #~ ORDENES DE VENTA
386+ if type =='out_invoice' or type == 'out_refund':
387+ for line_invoice in invoice_brw.invoice_line: #lineas de la factura
388+ for line_orden in picking_brw.sale_id.order_line: #lineas de la orden de venta
389+ if line_invoice.product_id==line_orden.product_id: #si es la misma linea
390+ self.pool.get('account.invoice.line').write(cursor, user, line_invoice.id, {'concept_id':line_orden.concept_id.id})
391+
392+ return data
393+
394+ _columns = {
395+ 'nro_ctrl': fields.char('Invoice ref.', size=32, readonly=True, states={'draft':[('readonly',False)]}, help="Invoice reference"),
396+ }
397+
398+
399+stock_picking()
400
401=== added directory 'l10n_ve_sale_purchase/view'
402=== added file 'l10n_ve_sale_purchase/view/product_view.xml'
403--- l10n_ve_sale_purchase/view/product_view.xml 1970-01-01 00:00:00 +0000
404+++ l10n_ve_sale_purchase/view/product_view.xml 2011-10-05 00:11:23 +0000
405@@ -0,0 +1,69 @@
406+<?xml version="1.0"?>
407+<openerp>
408+ <data>
409+
410+ <record model="ir.ui.view" id="view_product_template_islr">
411+ <field name="name">product.template.form.islr</field>
412+ <field name="model">product.template</field>
413+ <field name="type">form</field>
414+ <field name="inherit_id" ref="product.product_template_form_view"/>
415+ <field name="arch" type="xml">
416+ <notebook position="inside">
417+ <page string="Concept of Withholding Income">
418+ <separator string="Concept of Withholding Income" colspan="6"/>
419+ <newline/>
420+ <field name="concept_id" required='1'/>
421+ </page>
422+ </notebook>
423+ </field>
424+ </record>
425+ <record model="ir.ui.view" id="view_product_product_islr">
426+ <field name="name">product.product.form.islr</field>
427+ <field name="model">product.product</field>
428+ <field name="type">form</field>
429+ <field name="inherit_id" ref="product.product_normal_form_view"/>
430+ <field name="arch" type="xml">
431+ <notebook position="inside">
432+ <page string="Concept of Withholding Income">
433+ <separator string="Concept of Withholding Income" colspan="6"/>
434+ <newline/>
435+ <field name="concept_id" required='1'/>
436+ </page>
437+ </notebook>
438+ </field>
439+ </record>
440+
441+
442+ <!--
443+ =====================================================
444+ Products Extension
445+ =====================================================
446+ -->
447+
448+ <record id="product_normal_form_view_type" model="ir.ui.view">
449+ <field name="name">product.normal.form.type</field>
450+ <field name="model">product.product</field>
451+ <field name="type">form</field>
452+ <field name="inherit_id" ref="product.product_normal_form_view"/>
453+ <field name="arch" type="xml">
454+ <xpath expr="/form/notebook/page/group/field[@name='type']" position="replace">
455+ <field name="type" on_change="onchange_product_type(type)"/>
456+ </xpath>
457+ </field>
458+ </record>
459+
460+
461+ <record id="product_template_form_view_type" model="ir.ui.view">
462+ <field name="name">product.template.product.form.type</field>
463+ <field name="model">product.template</field>
464+ <field name="type">form</field>
465+ <field name="inherit_id" ref="product.product_template_form_view"/>
466+ <field name="arch" type="xml">
467+ <xpath expr="/form/notebook/page/group/field[@name='type']" position="replace">
468+ <field name="type" on_change="onchange_product_type(type)"/>
469+ </xpath>
470+ </field>
471+ </record>
472+
473+ </data>
474+</openerp>
475
476=== added file 'l10n_ve_sale_purchase/view/purchase_view.xml'
477--- l10n_ve_sale_purchase/view/purchase_view.xml 1970-01-01 00:00:00 +0000
478+++ l10n_ve_sale_purchase/view/purchase_view.xml 2011-10-05 00:11:23 +0000
479@@ -0,0 +1,37 @@
480+<?xml version="1.0"?>
481+<openerp>
482+ <data>
483+
484+ <!--
485+ =====================================================
486+ PURCHASE ORDER, PURCHASE ORDER LINE
487+ =====================================================
488+ -->
489+
490+ <record model="ir.ui.view" id="view_purchase_order_line_form_concept_islr">
491+ <field name="name">purchase_order_line_form_concept_islr</field>
492+ <field name="model">purchase.order.line</field>
493+ <field name="type">form</field>
494+ <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
495+ <field name="arch" type="xml">
496+ <field name="product_id" position="after">
497+ <field name="concept_id" />
498+ </field>
499+ </field>
500+ </record>
501+
502+
503+ <record model="ir.ui.view" id="view_purchase_order_form_concept_islr">
504+ <field name="name">purchase_order_form_concept_islr</field>
505+ <field name="model">purchase.order</field>
506+ <field name="type">form</field>
507+ <field name="inherit_id" ref="purchase.purchase_order_form"/>
508+ <field name="arch" type="xml">
509+ <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='product_qty']" position="before">
510+ <field name="concept_id" />
511+ </xpath>
512+ </field>
513+ </record>
514+
515+ </data>
516+</openerp>
517
518=== added file 'l10n_ve_sale_purchase/view/sale_order_view.xml'
519--- l10n_ve_sale_purchase/view/sale_order_view.xml 1970-01-01 00:00:00 +0000
520+++ l10n_ve_sale_purchase/view/sale_order_view.xml 2011-10-05 00:11:23 +0000
521@@ -0,0 +1,44 @@
522+<?xml version="1.0"?>
523+<openerp>
524+ <data>
525+
526+
527+
528+ <record model="ir.ui.view" id="view_sale_order_line_tree_islr">
529+ <field name="name">sale_order_line_tree_islr</field>
530+ <field name="model">sale.order.line</field>
531+ <field name="type">tree</field>
532+ <field name="inherit_id" ref="sale.view_order_line_tree"/>
533+ <field name="arch" type="xml">
534+ <field name="product_id" position="after">
535+ <field name="concept_id"/>
536+ </field>
537+ </field>
538+ </record>
539+
540+ <record model="ir.ui.view" id="view_sale_order_line_form_islr">
541+ <field name="name">sale_order_line_form_islr</field>
542+ <field name="model">sale.order.line</field>
543+ <field name="type">form</field>
544+ <field name="inherit_id" ref="sale.view_order_line_form2"/>
545+ <field name="arch" type="xml">
546+ <field name="product_id" position="after">
547+ <field name="concept_id"/>
548+ </field>
549+ </field>
550+ </record>
551+
552+ <record model="ir.ui.view" id="view_sale_order_form_concept">
553+ <field name="name">sale_order_form_concept</field>
554+ <field name="model">sale.order</field>
555+ <field name="type">form</field>
556+ <field name="inherit_id" ref="sale.view_order_form"/>
557+ <field name="arch" type="xml">
558+ <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_id']" position="after">
559+ <field name="concept_id" />
560+ </xpath>
561+ </field>
562+ </record>
563+
564+ </data>
565+</openerp>
566
567=== added file 'l10n_ve_sale_purchase/view/stock_view.xml'
568--- l10n_ve_sale_purchase/view/stock_view.xml 1970-01-01 00:00:00 +0000
569+++ l10n_ve_sale_purchase/view/stock_view.xml 2011-10-05 00:11:23 +0000
570@@ -0,0 +1,38 @@
571+<?xml version="1.0" encoding="utf-8"?>
572+<openerp>
573+ <data>
574+ <record id="stock_picking_form_loc_ve" model="ir.ui.view">
575+ <field name="name">stock.picking.form.loc_ve</field>
576+ <field name="model">stock.picking</field>
577+ <field name="type">form</field>
578+ <field name="inherit_id" ref="stock.view_picking_form"/>
579+ <field name="arch" type="xml">
580+ <xpath expr="/form/group/group/field[@name='min_date']" position="after">
581+ <field name="nro_ctrl" />
582+ </xpath>
583+ </field>
584+ </record>
585+ <record id="stock_picking_out_form_loc_ve" model="ir.ui.view">
586+ <field name="name">stock.picking.out.form.loc_ve</field>
587+ <field name="model">stock.picking</field>
588+ <field name="type">form</field>
589+ <field name="inherit_id" ref="stock.view_picking_out_form"/>
590+ <field name="arch" type="xml">
591+ <xpath expr="/form/group/group/field[@name='origin']" position="after">
592+ <field name="nro_ctrl" />
593+ </xpath>
594+ </field>
595+ </record>
596+ <record id="stock_picking_in_form_loc_ve" model="ir.ui.view">
597+ <field name="name">stock.picking.in.form.loc_ve</field>
598+ <field name="model">stock.picking</field>
599+ <field name="type">form</field>
600+ <field name="inherit_id" ref="stock.view_picking_in_form"/>
601+ <field name="arch" type="xml">
602+ <xpath expr="/form/group/group/field[@name='backorder_id']" position="after">
603+ <field name="nro_ctrl" />
604+ </xpath>
605+ </field>
606+ </record>
607+ </data>
608+</openerp>
609
610=== added directory 'l10n_ve_sale_purchase/wizard'