Merge lp:~vauxoo/openerp-venezuela-localization/israel_fiscal-req-decoupling into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

[Israel Fermin Montilla]

Decoupled from Purchase and Stock (local backup of the old files), refactored the view to take the damaged paper wizard out of the model on a menu item

=== added file 'l10n_ve_fiscal_requirements/README'
--- l10n_ve_fiscal_requirements/README	1970-01-01 00:00:00 +0000
+++ l10n_ve_fiscal_requirements/README	2011-10-04 02:33:24 +0000
@@ -0,0 +1,2 @@
+1.- Eliminated the dependency on purchase, files involved: purchase.py, this file has a method that returns the partners invoicing address.
+2.- Eliminated the dependency with stock, files involved: stock_view.xml. This overrides the stock.picking view to show a control number (nro_ctrl) atribute and stock.py that adds that attribute on the model

=== modified file 'l10n_ve_fiscal_requirements/__init__.py'
--- l10n_ve_fiscal_requirements/__init__.py	2011-10-03 20:29:07 +0000
+++ l10n_ve_fiscal_requirements/__init__.py	2011-10-04 02:33:24 +0000
@@ -18,8 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import purchase
-import stock
 import invoice
 import partner
 import res_company

=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
--- l10n_ve_fiscal_requirements/__openerp__.py	2011-10-03 21:13:35 +0000
+++ l10n_ve_fiscal_requirements/__openerp__.py	2011-10-04 02:33:24 +0000
@@ -53,15 +53,17 @@
          - Integrated the l10n_ve_nro_ctrl module functionality on this one
          - Since the concept_id field is added by the l10n_ve_islr_withholding, an
            error es rised if it's not installed and it is necesary to withhold
-         - If you need to withhold ISLR, you must install the module mentioned abofe
+         - If you need to withhold ISLR, you must install the module mentioned above
+         - Eliminated the dependencies with stock and purchase modules, migrated that functionalities to
+           other modules
 
     """,
     'init_xml': [
         'data/l10n_ut_data.xml',
     ],
-    "depends" : ["base_vat", "purchase", "stock", "account", "account_accountant"],
+    "depends" : ["base_vat", "account", "account_accountant"],
     'update_xml': [
-        'view/stock_view.xml',
+        'security/ir.model.access.csv',
         'view/account_invoice_view.xml',
         'view/res_company_view.xml',
         'view/l10n_ut_view.xml',

=== removed file 'l10n_ve_fiscal_requirements/purchase.py'
--- l10n_ve_fiscal_requirements/purchase.py	2011-05-11 16:42:07 +0000
+++ l10n_ve_fiscal_requirements/purchase.py	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    
-#    
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-
-class purchase_order(osv.osv):
-    _inherit='purchase.order'
-
-    '''
-    Return address invoice by default
-    '''
-    def onchange_partner_id(self, cr, uid, ids, part):
-        if not part:
-            return {'value':{'partner_address_id': False, 'fiscal_position': False}}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
-        part = self.pool.get('res.partner').browse(cr, uid, part)
-        pricelist = part.property_product_pricelist_purchase.id
-        fiscal_position = part.property_account_position and part.property_account_position.id or False
-        return {'value':{'partner_address_id': addr['invoice'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
-
-purchase_order()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'l10n_ve_fiscal_requirements/stock.py'
--- l10n_ve_fiscal_requirements/stock.py	2011-05-11 16:42:07 +0000
+++ l10n_ve_fiscal_requirements/stock.py	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    
-#    
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-
-class stock_picking(osv.osv):
-    _inherit = 'stock.picking'
-    _columns = {
-        'nro_ctrl': fields.char('Invoice ref.', size=32, readonly=True, states={'draft':[('readonly',False)]}, help="Invoice reference"),
-    }
-
-
-
-stock_picking()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml'
--- l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2011-10-03 21:26:50 +0000
+++ l10n_ve_fiscal_requirements/view/account_invoice_view.xml	2011-10-04 02:33:24 +0000
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-
-
     <!-- 
     =====================================================
     Invoices Extension
     =====================================================
     -->  
-
         <record id="account_invoice_ext_view_form_loc_ve" model="ir.ui.view">
             <field name="name">invoice_extended.account.invoice.form.loc_ve</field>
             <field name="model">account.invoice</field>
@@ -21,9 +17,6 @@
                 </xpath>
             </field>
         </record>
-
-
-
         <record id="account_invoice_ext_view_supp_form_loc_ve" model="ir.ui.view">
             <field name="name">invoice_extended.account.invoice.supplier.form.loc_ve</field>
             <field name="model">account.invoice</field>
@@ -35,8 +28,6 @@
                 </xpath>
             </field>
         </record>
-        
-        
         <record id="account_invoice_nro_control_supplier_form" model="ir.ui.view">
             <field name="name">account.invoice.nro.control.supplier.form</field>
             <field name="model">account.invoice</field>
@@ -48,8 +39,6 @@
                 </xpath>
             </field>
         </record>
-        
-        
         <record id="account_invoice_nro_control_customer_form" model="ir.ui.view">
             <field name="name">account.invoice.nro.control.customer.form</field>
             <field name="model">account.invoice</field>
@@ -61,8 +50,6 @@
                 </xpath>
             </field>
         </record>
-
-
         <record id="account_invoice_ext_view_tree_loc_ve2" model="ir.ui.view">
             <field name="name">invoice_extended.account.invoice.tree.loc_ve2</field>
             <field name="model">account.invoice</field>
@@ -74,15 +61,11 @@
                 </xpath>
             </field>
         </record>
-
-
 	<!-- 
 	=====================================================
 	Filter invoice address
 	=====================================================
 	-->  
-
-
         <record id="account_invoice_addr_form_loc_ve" model="ir.ui.view">
             <field name="name">invoice.address.account.invoice.form.loc_ve</field>
             <field name="model">account.invoice</field>
@@ -94,8 +77,6 @@
                 </xpath>
             </field>
         </record>
-
-
         <record id="account_invoice_addr_supp_form_loc_ve" model="ir.ui.view">
             <field name="name">account.invoice.address.supplier.form.loc_ve</field>
             <field name="model">account.invoice</field>

=== removed file 'l10n_ve_fiscal_requirements/view/stock_view.xml'
--- l10n_ve_fiscal_requirements/view/stock_view.xml	2011-09-30 15:48:47 +0000
+++ l10n_ve_fiscal_requirements/view/stock_view.xml	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="stock_picking_form_loc_ve" model="ir.ui.view">
-            <field name="name">stock.picking.form.loc_ve</field>
-            <field name="model">stock.picking</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/group/group/field[@name='min_date']" position="after">
-                    <field name="nro_ctrl" />
-                </xpath>
-            </field>
-        </record>
-
-
-        <record id="stock_picking_out_form_loc_ve" model="ir.ui.view">
-            <field name="name">stock.picking.out.form.loc_ve</field>
-            <field name="model">stock.picking</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="stock.view_picking_out_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/group/group/field[@name='origin']" position="after">
-                    <field name="nro_ctrl" />
-                </xpath>
-            </field>
-        </record>
-
-
-
-        <record id="stock_picking_in_form_loc_ve" model="ir.ui.view">
-            <field name="name">stock.picking.in.form.loc_ve</field>
-            <field name="model">stock.picking</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="stock.view_picking_in_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/group/group/field[@name='backorder_id']" position="after">
-                    <field name="nro_ctrl" />
-                </xpath>
-            </field>
-        </record>
-
-       
-    </data>
-</openerp>

=== modified file 'l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py'
--- l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py	2011-09-30 18:03:47 +0000
+++ l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl.py	2011-10-04 02:33:24 +0000
@@ -105,9 +105,13 @@
         wizard_brw = self.browse(cr, uid, ids, context=None)
         wizard_deli_obj = self.pool.get('wz.picking.delivery.note')
         inv_id = context['active_id']
-        invoice_obj = self.pool.get('account.invoice')
-        inv_brw = invoice_obj.browse(cr,uid,inv_id,context)
-
+        if context['menu']:
+            invoice_obj = self.pool.get('account.invoice')
+            inv_brw = invoice_obj.browse(cr, uid, invoice_obj.search(cr, uid, [], limit=1), context)
+        if inv_brw == []:
+            raise osv.except_osv(_("ERROR !"), _("You must have created at least one invoice to declare it as damaged"))
+        inv_id = inv_brw[0].id
+        inv_brw = inv_brw[0]
         for wizard in wizard_brw:
             if not wizard.sure:
                 raise osv.except_osv(_("Error!"), _("Please confirm that you know what you're doing by checking the option bellow!"))

=== modified file 'l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml'
--- l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml	2011-09-29 23:59:54 +0000
+++ l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml	2011-10-04 02:33:24 +0000
@@ -17,26 +17,18 @@
                 </form>
             </field>
         </record>
-
-        <act_window 
-            name="Generate null paper"  
-            res_model="wizard.invoice.nro.ctrl" 
-            src_model="account.invoice"
-            view_mode="form"
-            key2="client_action_multi"
-            target="new" 
-            id="menu_create_invoice_duplicate" 
-        />
-
-        <record id="wizard_invoice_nro_control" model="ir.actions.act_window">
+        <record id="wizard_invoice_nro_control_action" model="ir.actions.act_window">
             <field name="name">Create null paper</field>
             <field name="res_model">wizard.invoice.nro.ctrl</field>
-            <field name="src_model">wizard.invoice.nro.ctrl</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_wizard_invoice_nro_ctrl"/>
             <field name="target">new</field>
+            <field name="context">{'menu': True}</field>
         </record>
-
+        <menuitem name="Declare damaged paper" id="wizard_invoice_nro_ctrl_action" 
+            parent="account.menu_finance_receivables" action="wizard_invoice_nro_control_action"
+            sequence="200"
+        />
     </data>
 </openerp>

=== modified file 'l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml'
--- l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml	2011-09-30 23:39:52 +0000
+++ l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml	2011-10-04 02:33:24 +0000
@@ -15,19 +15,15 @@
                 </form>
             </field>
         </record>
-        <record model="ir.actions.act_window" id="change_nro_ctrl_act">
-            <field name="name">Change Control Number</field>
-            <field name="res_model">wiz.nroctrl</field>
-            <field name="src_model">account.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        <act_window
-            id="change_nro_ctrl_act"
-            res_model="wiz.nroctrl"
+        <act_window 
+            name="Change control number"  
+            res_model="wiz.nroctrl" 
             src_model="account.invoice"
-            name="Change Control Number" />
+            view_mode="form"
+            key2="client_action_multi"
+            target="new" 
+            id="action_wiz_nroctrl"
+        />
     </data>
 </openerp>