Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-wh-rev-hbto into lp:openerp-venezuela-localization

[hbto [Vauxoo] http://www.vauxoo.com]

[hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha)]

review: Approve

=== modified file 'l10n_ve_withholding/__init__.py'
--- l10n_ve_withholding/__init__.py	2011-10-25 20:33:16 +0000
+++ l10n_ve_withholding/__init__.py	2012-12-10 17:17:27 +0000
@@ -23,9 +23,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-import account
-import l10n_ve_withholding
-import account_move_line
-import invoice
+import model 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'l10n_ve_withholding/__openerp__.py'
--- l10n_ve_withholding/__openerp__.py	2012-09-25 22:32:13 +0000
+++ l10n_ve_withholding/__openerp__.py	2012-12-10 17:17:27 +0000
@@ -43,9 +43,9 @@
     'update_xml': [
         'security/withholding_security.xml',
         'security/ir.model.access.csv',    
-        'l10n_ve_withholding_data.xml',    
-        'l10n_ve_withholding_view.xml',
-        'account_view.xml',
+        'data/l10n_ve_withholding_data.xml',    
+        'view/l10n_ve_withholding_view.xml',
+        'view/account_view.xml',
         'workflow/account_workflow.xml',
     ],
     'demo_xml': [],

=== added directory 'l10n_ve_withholding/data'
=== renamed file 'l10n_ve_withholding/l10n_ve_withholding_data.xml' => 'l10n_ve_withholding/data/l10n_ve_withholding_data.xml'
=== added directory 'l10n_ve_withholding/model'
=== added file 'l10n_ve_withholding/model/__init__.py'
--- l10n_ve_withholding/model/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding/model/__init__.py	2012-12-10 17:17:27 +0000
@@ -0,0 +1,31 @@
+#!/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: Vauxoo C.A.           
+#    Planified by: Nhomar Hernandez
+#    Audited by: Vauxoo C.A.
+#############################################################################
+#    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/>.
+################################################################################
+
+import account
+import l10n_ve_withholding
+import account_move_line
+import invoice
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed file 'l10n_ve_withholding/account.py' => 'l10n_ve_withholding/model/account.py'
--- l10n_ve_withholding/account.py	2012-02-17 05:23:01 +0000
+++ l10n_ve_withholding/model/account.py	2012-12-10 17:17:27 +0000
@@ -26,16 +26,46 @@
 from osv import fields, osv
 import time
 
+__TYPES__ =[('sale', 'Sale'),
+        ('sale_refund','Sale Refund'), 
+        ('purchase', 'Purchase'), 
+        ('purchase_refund','Purchase Refund'), 
+        ('cash', 'Cash'), 
+        ('bank', 'Bank and Cheques'), 
+        ('general', 'General'), 
+        ('situation', 'Opening/Closing Situation'),
+        ('sale_debit', 'Sale Debit'),
+        ('purchase_debit', 'Purchase Debit'),
+        ('iva_sale', 'Sale Wh VAT'), 
+        ('iva_purchase', 'Purchase Wh VAT'), 
+        ('islr_purchase', 'Purchase Wh Income'), 
+        ('islr_sale', 'Sale Wh Income'), 
+        ('mun_sale', 'Sale Wh County'), 
+        ('mun_purchase', 'Purchase Wh County'),
+        ('src_sale', 'Sale Wh src'), 
+        ('src_purchase', 'Purchase Wh src')]
+
 class account_journal(osv.osv):
     _inherit = 'account.journal'
-    _columns = {
-        'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation'), ('iva_sale', 'Sale Wh VAT'), ('iva_purchase', 'Purchase Wh VAT'), ('islr_purchase', 'Purchase Wh Income'), ('islr_sale', 'Sale Wh Income'), ('mun_sale', 'Sale Wh County'), ('mun_purchase', 'Purchase Wh County'),('src_sale', 'Sale Wh src'), ('src_purchase', 'Purchase Wh src')], 'Type', size=32, required=True,
-                                 help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
-                                 " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
-                                 " Select 'Cash' to be used at the time of making payment."\
-                                 " Select 'General' for miscellaneous operations."\
-                                 " Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."),        
-    }
+    
+    _columns = {'type': fields.selection(__TYPES__,  'Type', size=32, required=True, 
+            help =  "Select 'Sale' for customer invoices journals."\
+                    " Select 'Purchase' for supplier invoices journals."\
+                    " Select 'Cash' or 'Bank' for journals that are used in customer or supplier payments."\
+                    " Select 'General' for miscellaneous operations journals."\
+                    " Select 'Opening/Closing Situation' for entries generated for new fiscal years."\
+                    " Select 'Sale Debit' for customer debit note journals."\
+                    " Select 'Purchase Debit' for supplier debit note journals."
+                    " Select 'Sale Wh VAT' for customer vat withholding journals."
+                    " Select 'Purchase Wh VAT' for supplier vat withholding journals."
+                    " Select 'Sale Wh Income' for customer income withholding journals."
+                    " Select 'Purchase Wh Income' for supplier income withholding journals."
+                    " Select 'Sale Wh County' for customer municipal withholding journals."
+                    " Select 'Purchase Wh County' for supplier municipal withholding journals."
+                    " Select 'Sale Wh SRC' for customer social withholding journals."
+                    " Select 'Purchase Wh SRC' for supplier social withholding journals."
+                    )
+        }
 
 account_journal()
 

=== renamed file 'l10n_ve_withholding/account_move_line.py' => 'l10n_ve_withholding/model/account_move_line.py'
=== renamed file 'l10n_ve_withholding/invoice.py' => 'l10n_ve_withholding/model/invoice.py'
=== renamed file 'l10n_ve_withholding/l10n_ve_withholding.py' => 'l10n_ve_withholding/model/l10n_ve_withholding.py'
=== added directory 'l10n_ve_withholding/view'
=== renamed file 'l10n_ve_withholding/account_view.xml' => 'l10n_ve_withholding/view/account_view.xml'
--- l10n_ve_withholding/account_view.xml	2012-04-16 23:46:57 +0000
+++ l10n_ve_withholding/view/account_view.xml	2012-12-10 17:17:27 +0000
@@ -5,7 +5,6 @@
         <record id="view_move_line_form_iva" model="ir.ui.view">
             <field name="name">account.move.line.form.iva</field>
             <field name="model">account.move.line</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_move_line_form"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
@@ -17,7 +16,6 @@
         <record id="view_move_line_form_iva2" model="ir.ui.view">
             <field name="name">account.move.line.form.iva2</field>
             <field name="model">account.move.line</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_move_line_form2"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
@@ -29,8 +27,7 @@
         <record id="view_move_line_tax_tree_iva" model="ir.ui.view">
             <field name="name">account.move.line.tax.tree.iva</field>
             <field name="model">account.move.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_move_line_tax_tree"/>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
                     <field name="res_id" />
@@ -44,14 +41,13 @@
         <record id="view_move_form_iva" model="ir.ui.view">
             <field name="name">account.move.form.iva</field>
             <field name="model">account.move</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_move_form"/>
             <field name="arch" type="xml">
-                <xpath expr='/form/notebook/page[@string="Journal Items"]/field[@name="line_id"]/form[@string="Journal Item"]/notebook/page[@string="Information"]/group/field[@name="blocked"]' position="after">
+                <xpath expr='//sheet[@string="Journal Entries"]/notebook/page[@string="Journal Items"]/field[@name="line_id"]/form[@string="Journal Item"]/notebook/page[@string="Information"]/group/group[@string="States"]/field[@name="blocked"]' position="after">
                            <field name='res_id'/> 
                                    </xpath>
                                                
-              <xpath expr='/form/notebook/page[@string="Journal Items"]/field[@name="line_id"]/tree[@string="Journal Items"]/field[@name="state"]' position="after">
+              <xpath expr='//sheet[@string="Journal Entries"]/notebook/page[@string="Journal Items"]/field[@name="line_id"]/tree[@string="Journal Items"]/field[@name="state"]' position="after">
                                                          <field name='res_id'/> 
                                                                  </xpath>
 

=== renamed file 'l10n_ve_withholding/l10n_ve_withholding_view.xml' => 'l10n_ve_withholding/view/l10n_ve_withholding_view.xml'
--- l10n_ve_withholding/l10n_ve_withholding_view.xml	2012-11-07 21:33:58 +0000
+++ l10n_ve_withholding/view/l10n_ve_withholding_view.xml	2012-12-10 17:17:27 +0000
@@ -17,7 +17,6 @@
         <record id="wh_inv_supplier" model="ir.ui.view">
             <field name="name">account.invoice.supplier.wh.form</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page[@string='Invoice']" position="after">
@@ -37,7 +36,6 @@
         <record id="wh_inv_customer" model="ir.ui.view">
             <field name="name">account.invoice.customer.wh.form</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@string='Invoice Lines']" position="after">
@@ -57,7 +55,6 @@
         <record id="wh_partner" model="ir.ui.view">
             <field name="name">res.partner.form.wh</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@string='Internal Notes']" position="after">
@@ -81,7 +78,6 @@
         <record id="view_account_wh_doc_tree" model="ir.ui.view">
             <field name="name">account.wh.doc.tree</field>
             <field name="model">account.wh.doc</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Documents">
                     <field name="model_parent" select="1"/>
@@ -92,7 +88,6 @@
         <record id="view_account_wh_doc_form" model="ir.ui.view">
             <field name="name">account.wh.doc.form</field>
             <field name="model">account.wh.doc</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Documents">
                     <field name="model_parent" select="1"/>
@@ -105,7 +100,6 @@
             <field name="name">Withholdings Document</field>
             <field name="type">ir.actions.act_window</field>            
             <field name="res_model">account.wh.doc</field>
-            <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="help">Create and manage the withholding documents in account move line.</field>            
         </record>