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

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

=== modified file 'l10n_ve_withholding/view/account_view.xml'
--- l10n_ve_withholding/view/account_view.xml	2012-12-05 10:06:09 +0000
+++ l10n_ve_withholding/view/account_view.xml	2012-12-10 17:15:25 +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>
 

=== modified file 'l10n_ve_withholding/view/l10n_ve_withholding_view.xml'
--- l10n_ve_withholding/view/l10n_ve_withholding_view.xml	2012-12-05 10:06:09 +0000
+++ l10n_ve_withholding/view/l10n_ve_withholding_view.xml	2012-12-10 17:15:25 +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>