Merge lp:~vauxoo/openerp-venezuela-localization/israel_islr-withholding-decoupling into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Israel Fermin Montilla]

Info on README file inside the module

[lp:~vauxoo/openerp-venezuela-localization/israel_islr-withholding-decoupling]

406. By Israel Fermin Montilla on 2011-10-04

[REF] re-added the files that has to do with product

407. By Israel Fermin Montilla on 2011-10-04

[ADD] re-added the product files

408. By Israel Fermin Montilla on 2011-10-04

[ADD] referenced the view file on __openerp__.py

409. By Israel Fermin Montilla on 2011-10-04

[IMP] imported the product.py file on __init__.py

410. By Israel Fermin Montilla on 2011-10-04

[IMP] re-added the product dependency on __openerp__.py file

411. By Israel Fermin Montilla on 2011-10-04

[IMP] made the concept_id field optional also on view

412. By Israel Fermin Montilla on 2011-10-04

[IMP] made the concept_id field optional also on view

413. By Israel Fermin Montilla on 2011-10-04

[IMP] updated the documentation because the product dependency was re-added

Unmerged revisions

=== added file 'l10n_ve_islr_withholding/README'
--- l10n_ve_islr_withholding/README	1970-01-01 00:00:00 +0000
+++ l10n_ve_islr_withholding/README	2011-10-04 18:46:24 +0000
@@ -0,0 +1,5 @@
+1.- Eliminated the overriden models: files involved: product.py, sale.py, stock.py and purchase.py
+2.- Eliminated the views: files involved: sale_order_view.xml, purchase_view.xml and product_view.xml
+
+No logic modules were touched
+All deleted files were saved locally

=== modified file 'l10n_ve_islr_withholding/__init__.py'
--- l10n_ve_islr_withholding/__init__.py	2011-09-30 22:08:51 +0000
+++ l10n_ve_islr_withholding/__init__.py	2011-10-04 18:46:24 +0000
@@ -32,8 +32,5 @@
 import islr_wh_doc
 import islr_xml_wh
 import partner
-#~ import product
-#~ import purchase
-#~ import sale
-#~ import stock
+import product
 import report

=== modified file 'l10n_ve_islr_withholding/__openerp__.py'
--- l10n_ve_islr_withholding/__openerp__.py	2011-10-04 15:30:46 +0000
+++ l10n_ve_islr_withholding/__openerp__.py	2011-10-04 18:46:24 +0000
@@ -45,14 +45,11 @@
                     1.- The periods must be defined with the format: 09/2011 (MM/YYYY).
                     2.- Create the accounts of Withholding Income and assing to the partner.
                     3.- Create the journal of type: islr.
+                    --------------------CHANGELOG-------------------------------------
+                    Oct 4, 2011:
+                     - Decoupled this module by eliminating dependencies con product, purchase, sale and stock.
                    ''',
-    "depends" : [   "base",
-                    "account",
-                    "product",
-                    "purchase",
-                    "sale",
-                    "l10n_ve_withholding",
-                ],
+    "depends" : ["account", "l10n_ve_withholding", "product"],
     "init_xml" : [],
     "demo_xml":[
             "demo/l10n_ve_islr_withholding_demo.xml",],
@@ -67,8 +64,6 @@
             "view/partner_view.xml",
             "view/islr_wh_doc_view.xml",
             "view/islr_wh_concept_view.xml",
-            "view/purchase_view.xml",
-            "view/sale_order_view.xml",
             "view/product_view.xml",
             "islr_xml_wh_report.xml",
             "islr_wh_report.xml",

=== removed file 'l10n_ve_islr_withholding/purchase.py'
--- l10n_ve_islr_withholding/purchase.py	2011-09-19 17:37:38 +0000
+++ l10n_ve_islr_withholding/purchase.py	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#    Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
-#    All Rights Reserved
-###############Credits######################################################
-#    Coded by: Humberto Arocha           <[e-mail]>
-#              Maria Gabriela Quilarque  <[e-mail]>
-#              Javier Duran              <[e-mail]>             
-#    Planified by: Nhomar Hernandez
-#    Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
-#    Audited by: Humberto Arocha [e-mail]
-#############################################################################
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
-from tools import config
-import time
-import datetime
-
-class purchase_order_line(osv.osv):
-    
-    _name="purchase.order.line"
-    _inherit ="purchase.order.line"
-
-    _columns = {
-        'concept_id': fields.many2one('islr.wh.concept','Withhold  Concept',help="Withhold concept associated with this rate",required=False),
-    }
-    
-    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):
-        '''
-        Funcion para entrar en el onchange del producto de la orden de compra y 
-        hacer que se cargue el campo de Concepto de Retencion automaticamente al seleccionar el producto.
-        '''
-        data = super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,partner_id, date_order, fiscal_position)
-        if not product:
-            return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}}  
-        pro = self.pool.get('product.product').browse(cr, uid, product)
-        concepto=pro.concept_id.id
-        data[data.keys()[1]]['concept_id'] = concepto
-        return data
-    
-purchase_order_line()
-
-
-class purchase_order(osv.osv):
-    _inherit = 'purchase.order'
-    '''
-    Metodo para agregar el concepto de retencion en la factura, a partir de una orden de compra, desde pedido
-    '''
-    def inv_line_create(self, cr, uid, a, ol):
-        data = super(purchase_order, self).inv_line_create(cr, uid, a, ol)
-        data[2]['concept_id'] = ol.concept_id.id 
-        return data
-
-purchase_order()
-
-
-
-
-
-
-
-
-
-
-
-
-

=== removed file 'l10n_ve_islr_withholding/sale.py'
--- l10n_ve_islr_withholding/sale.py	2011-09-19 17:37:38 +0000
+++ l10n_ve_islr_withholding/sale.py	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#    Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
-#    All Rights Reserved
-###############Credits######################################################
-#    Coded by: Humberto Arocha           <[e-mail]>
-#              Maria Gabriela Quilarque  <[e-mail]>
-#              Javier Duran              <[e-mail]>             
-#    Planified by: Nhomar Hernandez
-#    Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
-#    Audited by: Humberto Arocha [e-mail]
-#############################################################################
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
-from tools import config
-import time
-import datetime
-
-class sale_order_line(osv.osv):
-    _inherit = "sale.order.line"
-
-    _columns = {
-        'concept_id': fields.many2one('islr.wh.concept','Withhold  Concept',help="Withhold concept associated with this rate",required=False),
-    }
-    
-    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):
-        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)
-        if not product:
-            return {'value': {'th_weight': 0, 'product_packaging': False,'product_uos_qty': qty}, 'domain': {'product_uom': [],'product_uos': []}}
-        pro = self.pool.get('product.product').browse(cr, uid, product)
-        concepto=pro.concept_id.id
-        data[data.keys()[2]]['concept_id'] = concepto
-        return data
-
-    #~metodo que agrega al original el concepto en las lineas de retencion de venta, es llamado por action_invoice_create() en sale.order
-    def invoice_line_create(self, cr, uid, ids, context={}):
-        create_ids = super(sale_order_line, self).invoice_line_create(cr, uid, ids, context)
-        invoice_line_brws = self.pool.get('account.invoice.line').browse(cr, uid, create_ids)
-        order_line_sale_brws = self.pool.get('sale.order.line').browse(cr, uid, ids)
-        for line_invoice in invoice_line_brws: #lineas de la factura
-            for line_sale in order_line_sale_brws: #lineas de la orden de venta
-                if line_sale.product_id==line_invoice.product_id: #si es la misma linea 
-                    self.pool.get('account.invoice.line').write(cr, uid, line_invoice.id, {'concept_id':line_sale.concept_id.id}) 
-        return create_ids 
-sale_order_line()
-
-
-
-
-

=== removed file 'l10n_ve_islr_withholding/stock.py'
--- l10n_ve_islr_withholding/stock.py	2011-09-19 17:37:38 +0000
+++ l10n_ve_islr_withholding/stock.py	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#    Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
-#    All Rights Reserved
-###############Credits######################################################
-#    Coded by: Humberto Arocha           <[e-mail]>
-#              Maria Gabriela Quilarque  <[e-mail]>
-#              Javier Duran              <[e-mail]>             
-#    Planified by: Nhomar Hernandez
-#    Finance by: Helados Gilda, C.A. http://heladosgilda.com.ve
-#    Audited by: Humberto Arocha [e-mail]
-#############################################################################
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
-from tools import config
-import time
-
-class stock_picking(osv.osv):
-    _inherit = 'stock.picking'
-    '''
-    Funcion que agrega a la invoice_lines el concepto de retencion a partir de una orden de compra u orden de venta, 
-    con metodo de facturacion a partir de albaran
-    '''
-    def action_invoice_create(self, cursor, user, ids, journal_id=False,group=False, type='out_invoice', context=None):
-        if context is None:
-            context = {}
-        data = super(stock_picking, self).action_invoice_create(cursor, user, ids, journal_id, group, type, context)
-        picking_id=data.keys()[0]
-        invoice_id=data[picking_id]
-        invoice_brw = self.pool.get('account.invoice').browse(cursor, user, invoice_id)
-        picking_brw=self.browse(cursor, user, picking_id)
-        if type == 'in_invoice' or type == 'in_refund': #ORDENES DE COMPRA
-            for line_invoice in invoice_brw.invoice_line: #lineas de la factura
-                for line_orden in picking_brw.purchase_id.order_line: #lineas de la orden de compra
-                    if line_invoice.product_id==line_orden.product_id: #si es la misma linea
-                        self.pool.get('account.invoice.line').write(cursor, user, line_invoice.id, {'concept_id':line_orden.concept_id.id})       
-            return data 
-        #~ ORDENES DE VENTA
-        if type =='out_invoice' or type == 'out_refund':
-            for line_invoice in invoice_brw.invoice_line: #lineas de la factura
-                for line_orden in picking_brw.sale_id.order_line: #lineas de la orden de venta
-                    if line_invoice.product_id==line_orden.product_id: #si es la misma linea
-                        self.pool.get('account.invoice.line').write(cursor, user, line_invoice.id, {'concept_id':line_orden.concept_id.id})       
-            return data 
-    
-stock_picking()
-
-
-
-

=== modified file 'l10n_ve_islr_withholding/view/product_view.xml'
--- l10n_ve_islr_withholding/view/product_view.xml	2011-09-26 22:15:56 +0000
+++ l10n_ve_islr_withholding/view/product_view.xml	2011-10-04 18:46:24 +0000
@@ -12,7 +12,7 @@
                     <page string="Concept of Withholding Income">
                         <separator string="Concept of Withholding Income" colspan="6"/>
                         <newline/>
-                        <field name="concept_id" required='1'/>
+                        <field name="concept_id" />
                     </page>
                 </notebook>
             </field>
@@ -27,7 +27,7 @@
                     <page string="Concept of Withholding Income">
                         <separator string="Concept of Withholding Income" colspan="6"/>
                         <newline/>
-                        <field name="concept_id" required='1'/>
+                        <field name="concept_id" />
                     </page>
                 </notebook>
             </field>

=== removed file 'l10n_ve_islr_withholding/view/purchase_view.xml'
--- l10n_ve_islr_withholding/view/purchase_view.xml	2011-09-26 22:15:56 +0000
+++ l10n_ve_islr_withholding/view/purchase_view.xml	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    <!-- 
-    =====================================================
-    PURCHASE ORDER,  PURCHASE ORDER LINE
-    =====================================================
-    -->
-
-            <record model="ir.ui.view" id="view_purchase_order_line_form_concept_islr">
-            <field name="name">purchase_order_line_form_concept_islr</field>
-            <field name="model">purchase.order.line</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
-            <field name="arch" type="xml">
-                <field name="product_id" position="after">
-                <field name="concept_id" required="1"/>
-                </field>
-            </field>
-            </record>
-
-
-            <record model="ir.ui.view" id="view_purchase_order_form_concept_islr">
-                <field name="name">purchase_order_form_concept_islr</field>
-                <field name="model">purchase.order</field>
-                <field name="type">form</field>
-                <field name="inherit_id" ref="purchase.purchase_order_form"/>
-                <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='product_qty']" position="before">
-                    <field name="concept_id" required="1"/>
-                </xpath>
-                </field>
-            </record>
-        
-    </data>
-</openerp>

=== removed file 'l10n_ve_islr_withholding/view/sale_order_view.xml'
--- l10n_ve_islr_withholding/view/sale_order_view.xml	2011-09-26 22:15:56 +0000
+++ l10n_ve_islr_withholding/view/sale_order_view.xml	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    
-    
-    
-            <record model="ir.ui.view" id="view_sale_order_line_tree_islr">
-                <field name="name">sale_order_line_tree_islr</field>
-                <field name="model">sale.order.line</field>
-                <field name="type">tree</field>
-                <field name="inherit_id" ref="sale.view_order_line_tree"/>
-                <field name="arch" type="xml">
-                    <field name="product_id" position="after">
-                    <field name="concept_id"/>
-                    </field>
-                </field>
-            </record>
-
-            <record model="ir.ui.view" id="view_sale_order_line_form_islr">
-                <field name="name">sale_order_line_form_islr</field>
-                <field name="model">sale.order.line</field>
-                <field name="type">form</field>
-                <field name="inherit_id" ref="sale.view_order_line_form2"/>
-                <field name="arch" type="xml">
-                    <field name="product_id" position="after">
-                    <field name="concept_id"/>
-                    </field>
-                </field>
-            </record>
-
-            <record model="ir.ui.view" id="view_sale_order_form_concept">
-                <field name="name">sale_order_form_concept</field>
-                <field name="model">sale.order</field>
-                <field name="type">form</field>
-                <field name="inherit_id" ref="sale.view_order_form"/>
-                <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_id']" position="after">
-                    <field name="concept_id" required="1"/>
-                </xpath>
-                </field>
-            </record>
-
-    </data>
-</openerp>