Merge lp:~vauxoo/openerp-mexico-localization/7.0_l10n_mx_field_to_xpath_dev_giovanni into lp:openerp-mexico-localization/7.0

[Mario Giovanni Guerrero Flores]

Cambiar de Field a Xpath(Vistas)

[Rodolfo Lopez (el-rodo-1)]

Giovanni la propuesta la puedes dividir en dos:
* una que cambie las vistas de field a xpath.
* y la otra que modifique la indentación.

Así minimizamos el la detección de errores y control de cambios.

review: Needs Fixing

=== modified file 'city/partner_address_view.xml'
--- city/partner_address_view.xml	2013-05-26 02:34:03 +0000
+++ city/partner_address_view.xml	2013-08-08 00:10:39 +0000
@@ -5,8 +5,7 @@
             <field name="name">res.partner.form_city_01</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                
+            <field name="arch" type="xml">                
                 <xpath expr="//field[@name='country_id']" position="after">
                     <field name="city_id" on_change="onchange_city(city_id)"  placeholder="Ciudad"/>
                 </xpath>
@@ -15,7 +14,5 @@
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
-

=== modified file 'email_template_multicompany/email_server_view.xml'
--- email_template_multicompany/email_server_view.xml	2013-06-06 22:04:05 +0000
+++ email_template_multicompany/email_server_view.xml	2013-08-08 00:10:39 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        
         <record id="view_mail_server_form_inherit" model="ir.ui.view">
             <field name="name">mail.server.form.inherit</field>
             <field name="model">ir.mail_server</field>
@@ -12,6 +11,5 @@
                 </xpath>
             </field>
         </record>
-        
     </data>
 </openerp>

=== modified file 'l10n_mx_company_multi_address/res_company_view.xml'
--- l10n_mx_company_multi_address/res_company_view.xml	2013-04-20 00:14:08 +0000
+++ l10n_mx_company_multi_address/res_company_view.xml	2013-08-08 00:10:39 +0000
@@ -7,9 +7,9 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="model">res.company</field>
             <field name="arch" type="xml">
-                <field name="parent_id" position="after">
+                <xpath expr="//field[@name='parent_id']" position="after">
                     <field name="address_invoice_parent_company_id"/>
-                </field>
+                </xpath>
             </field>
         </record>
 

=== modified file 'l10n_mx_diot_report/partner_view.xml'
--- l10n_mx_diot_report/partner_view.xml	2013-06-02 22:58:03 +0000
+++ l10n_mx_diot_report/partner_view.xml	2013-08-08 00:10:39 +0000
@@ -1,14 +1,12 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
-
         <record id="view_partner_diot_form" model="ir.ui.view">
             <field name="name">res.partner.form.diot</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <field name="bank_ids" position="before">
+                <xpath expr="//field[@name='bank_ids']" position="before">
                     <group colspan="4" col="4" attrs="{'invisible':[('supplier','=', False)]}">
                         <separator string="DIOT Information" colspan="4"/>
                         <newline/>
@@ -20,10 +18,8 @@
                         <field name="diot_country" attrs="{'invisible':[('type_of_third','=', '04')]}"/>
                         <field name="nacionality_diot" attrs="{'invisible':[('type_of_third','=', '04')]}"/>
                     </group>
-                </field>
+                </xpath>
             </field>
         </record>
-
-        
     </data>
 </openerp>

=== modified file 'l10n_mx_facturae_cer/res_company_view.xml'
--- l10n_mx_facturae_cer/res_company_view.xml	2013-06-28 22:52:28 +0000
+++ l10n_mx_facturae_cer/res_company_view.xml	2013-08-08 00:10:39 +0000
@@ -57,9 +57,9 @@
         </record>
 
         <menuitem action="action_res_company_facturae_certificate_tree"
-                id="menu_res_company_facturae_certificate" sequence="50"
-                parent="base.menu_res_company_global"
-                groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_manager"
+                  id="menu_res_company_facturae_certificate" sequence="50"
+                  parent="base.menu_res_company_global"
+                  groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_manager"
         />
 
 
@@ -81,7 +81,7 @@
             </field>
         </record>
 
-         <!--<field colspan="4" name="order_line" nolabel="1" widget="one2many_list">-->
+        <!--<field colspan="4" name="order_line" nolabel="1" widget="one2many_list">-->
 
         <!--Version OpenERP-->
         <record model="ir.ui.view" id="view_res_company_form_inh_l10n_mx_facturae">
@@ -89,7 +89,7 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="model">res.company</field>
             <field name="arch" type="xml">
-                 <page string="Configuration" position="after">
+                <xpath expr="//page[@string='Configuration']" position="after">
                     <page string="Certificados SAT" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_manager">
                         <!--<field name="cif_file" widget='image'/>-->
                         <newline/>
@@ -104,27 +104,27 @@
                         <field name="certificate_ids" nolabel="1" colspan="4"  widget="one2many_list">
                             <form string="Certificates">
                                 <separator string="Certificates DER FORMAT (Original)" colspan="4"/>
-                                    <field name="certificate_file" colspan="4"/>
-                                    <field name="certificate_key_file" colspan="4"/>
-                                    <newline/>
-                                    <field name="certificate_password" password="True" on_change="onchange_certificate_info(certificate_file, certificate_key_file, certificate_password)"/>
-                                    <separator string="Certificates PEM FORMAT (Transformed)" colspan="4"/>
-                                    <field name="certificate_file_pem" colspan="4"/>
-                                    <field name="certificate_key_file_pem" colspan="4"/>
-                                    <separator string="General Information of Certificate" colspan="4"/>
-                                    <field name="serial_number"/>
-                                    <newline/>
-                                    <field name="date_start"/>
-                                    <newline/>
-                                    <field name="date_end"/>
-                                    <separator string="Extra Information" colspan="4"/>
-                                    <field name="fname_xslt"/>
-                                    <newline/>
-                                    <field name="active"/>
-                                    <newline/>
-                                    <button name="get_certificate_info" string="Get Certificate Info" type="object"/>
+                                <field name="certificate_file" colspan="4"/>
+                                <field name="certificate_key_file" colspan="4"/>
+                                <newline/>
+                                <field name="certificate_password" password="True" on_change="onchange_certificate_info(certificate_file, certificate_key_file, certificate_password)"/>
+                                <separator string="Certificates PEM FORMAT (Transformed)" colspan="4"/>
+                                <field name="certificate_file_pem" colspan="4"/>
+                                <field name="certificate_key_file_pem" colspan="4"/>
+                                <separator string="General Information of Certificate" colspan="4"/>
+                                <field name="serial_number"/>
+                                <newline/>
+                                <field name="date_start"/>
+                                <newline/>
+                                <field name="date_end"/>
+                                <separator string="Extra Information" colspan="4"/>
+                                <field name="fname_xslt"/>
+                                <newline/>
+                                <field name="active"/>
+                                <newline/>
+                                <button name="get_certificate_info" string="Get Certificate Info" type="object"/>
                             </form>
-                             <tree string="Certificates">
+                            <tree string="Certificates">
                                 <field name="serial_number"/>
                                 <field name="date_start"/>
                                 <field name="date_end"/>
@@ -133,7 +133,7 @@
                             </tree>
                         </field>
                     </page>
-                </page>
+                </xpath>
             </field>
         </record>
 

=== modified file 'l10n_mx_facturae_seq/ir_sequence_view.xml'
--- l10n_mx_facturae_seq/ir_sequence_view.xml	2013-07-09 23:46:51 +0000
+++ l10n_mx_facturae_seq/ir_sequence_view.xml	2013-08-08 00:10:39 +0000
@@ -19,7 +19,7 @@
             </field>
         </record>
 
-         <record id="view_facturae_ir_sequence_approval_tree" model="ir.ui.view">
+        <record id="view_facturae_ir_sequence_approval_tree" model="ir.ui.view">
             <field name="name">view.facturae.ir.sequence.approval.tree</field>
             <field name="model">ir.sequence.approval</field>
             <field name="arch" type="xml">
@@ -32,11 +32,11 @@
                     <field name="number_end"/>
                     <field name="type"/>
                     <field name="company_id"/>
-                 </tree>
-             </field>
+                </tree>
+            </field>
         </record>
 
-         <record id="action_facturae_sequence_tree" model="ir.actions.act_window">
+        <record id="action_facturae_sequence_tree" model="ir.actions.act_window">
             <field name="name">FacturaE MX Sequence Approval</field>
             <field name="res_model">ir.sequence.approval</field>
             <field name="type">ir.actions.act_window</field>
@@ -45,9 +45,9 @@
         </record>
 
         <menuitem action="action_facturae_sequence_tree"
-                id="menu_facturae_sequence" sequence="50"
-                parent="base.next_id_5"
-                groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"
+                  id="menu_facturae_sequence" sequence="50"
+                  parent="base.next_id_5"
+                  groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"
         />
 
         <record id="view_facturae_sequence_search" model="ir.ui.view">
@@ -77,7 +77,7 @@
             <field name="model">ir.sequence</field>
             <field name="inherit_id" ref="base.sequence_view"/>
             <field name="arch" type="xml">
-                <page string="Sequence" position="after">
+                <xpath expr="//page[@string='Sequence']" position="after">
                     <page string="Aprobaciones SAT" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_manager">
                         <field name="approval_id"/>
                         <field name="approval_ids" nolabel="1" colspan="4"  widget="one2many_list">
@@ -99,37 +99,37 @@
                             </form>
                         </field>
                     </page>
-                </page>
+                </xpath>
             </field>
         </record>
 
         <!--TinyERP Compatibility
-        <record id="ir_sequence_form_inh_l10n_mx_facturae" model="ir.ui.view">
-            <field name="name">ir.sequence.form.inh.l10n_mx_facturae</field>
-            <field name="model">ir.sequence</field>
-            <field name="inherit_id" ref="base.sequence_view"/>
-            <field name="arch" type="xml">
-                <field name="name" position="after">
-                    <field name="approval_id"/>
-                    <field name="approval_ids" nolabel="1" colspan="4">
-                        <tree string="Aprobaciones">
-                            <field name="approval_number"/>
-                            <field name="serie"/>
-                            <field name="approval_year"/>
-                            <field name="number_start"/>
-                            <field name="number_end"/>
-                        </tree>
-                        <form string="Aprobaciones">
-                            <field name="approval_number"/>
-                            <field name="serie"/>
-                            <field name="approval_year"/>
-                            <field name="number_start"/>
-                            <field name="number_end"/>
-                        </form>
+            <record id="ir_sequence_form_inh_l10n_mx_facturae" model="ir.ui.view">
+                <field name="name">ir.sequence.form.inh.l10n_mx_facturae</field>
+                <field name="model">ir.sequence</field>
+                <field name="inherit_id" ref="base.sequence_view"/>
+                <field name="arch" type="xml">
+                    <field name="name" position="after">
+                        <field name="approval_id"/>
+                        <field name="approval_ids" nolabel="1" colspan="4">
+                            <tree string="Aprobaciones">
+                                <field name="approval_number"/>
+                                <field name="serie"/>
+                                <field name="approval_year"/>
+                                <field name="number_start"/>
+                                <field name="number_end"/>
+                            </tree>
+                            <form string="Aprobaciones">
+                                <field name="approval_number"/>
+                                <field name="serie"/>
+                                <field name="approval_year"/>
+                                <field name="number_start"/>
+                                <field name="number_end"/>
+                            </form>
+                        </field>
                     </field>
                 </field>
-            </field>
-        </record>
-    -->
+            </record>
+        -->
     </data>
 </openerp>

=== modified file 'l10n_mx_import_info/invoice_view.xml'
--- l10n_mx_import_info/invoice_view.xml	2013-04-20 00:14:08 +0000
+++ l10n_mx_import_info/invoice_view.xml	2013-08-08 00:10:39 +0000
@@ -7,9 +7,9 @@
             <field name="model">account.invoice.line</field>
             <field name="inherit_id" ref="account.view_invoice_line_form"/>
             <field name="arch" type="xml">
-                <field name="product_id" position="after">
+                <xpath expr="//field[@name='product_id']" position="after">
                     <field name="tracking_id"/>
-                </field>
+                </xpath>
             </field>
         </record>
 

=== modified file 'l10n_mx_import_info/stock_view.xml'
--- l10n_mx_import_info/stock_view.xml	2013-04-20 00:14:08 +0000
+++ l10n_mx_import_info/stock_view.xml	2013-08-08 00:10:39 +0000
@@ -6,12 +6,12 @@
             <field name="model">stock.tracking</field>
             <field name="inherit_id" ref="stock.view_tracking_form"/>
             <field name="arch" type="xml">
-                <field name="date" position="after">
+                <xpath expr="//field[@name='date']" position="after">
                     <field name="import_id" domain="[]"/>
-                </field>
-<!--                <field name="date" position="after">-->
-<!--                    <field name="import_product_id"/>-->
-<!--                </field>-->
+                </xpath>
+                <!--                <field name="date" position="after">-->
+                <!--                    <field name="import_product_id"/>-->
+                <!--                </field>-->
             </field>
         </record>
         <record model="ir.ui.view" id="stock_tracking_form">
@@ -34,10 +34,10 @@
             <field name="model">stock.report.tracklots</field>
             <field name="arch" type="xml">
                 <form string="Stock Tracking">
-                        <field name="product_id"/>
-                        <field name="location_id"/>
-                        <field name="name"/>
-                        <field name="tracking_id"/>
+                    <field name="product_id"/>
+                    <field name="location_id"/>
+                    <field name="name"/>
+                    <field name="tracking_id"/>
                 </form>
             </field>
         </record>
@@ -46,10 +46,10 @@
             <field name="model">stock.report.tracklots</field>
             <field name="arch" type="xml">
                 <tree string="Stock Tracking">
-                        <field name="product_id"/>
-                        <field name="location_id"/>
-                        <field name="name"/>
-                        <field name="tracking_id"/>
+                    <field name="product_id"/>
+                    <field name="location_id"/>
+                    <field name="name"/>
+                    <field name="tracking_id"/>
                 </tree>
             </field>
         </record>
@@ -60,9 +60,9 @@
                 <search string="Stock Tracking">
                     <group col="6" colspan="4">
                         <filter string="Without Customers and Suppliers" icon="terp-partner"
-                        name="wo_cands"
-                        domain="[('location_id','!=','Suppliers'),('location_id','!=','Customers')]"
-                        help="Just Internal, with this filter you will not inventory on Suppliers and Customers location" />
+                                name="wo_cands"
+                                domain="[('location_id','!=','Suppliers'),('location_id','!=','Customers')]"
+                                help="Just Internal, with this filter you will not inventory on Suppliers and Customers location" />
                         <field name="product_id"/>
                         <field name="location_id"/>
                         <field name="name"/>
@@ -71,7 +71,7 @@
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="4" groups="base.group_extended">
                         <filter string="Tracking" icon="terp-stock_effects-object-colorize"
-                         context="{'group_by':'tracking_id'}"/>
+                                context="{'group_by':'tracking_id'}"/>
                     </group>
                 </search>
             </field>
@@ -83,8 +83,6 @@
             name="Stock per tracking"
             res_model="stock.report.tracklots"
             src_model="product.product"
-            />
+        />
     </data>
 </openerp>
-
-

=== modified file 'l10n_mx_invoice_discount/invoice_view.xml'
--- l10n_mx_invoice_discount/invoice_view.xml	2013-04-20 00:14:08 +0000
+++ l10n_mx_invoice_discount/invoice_view.xml	2013-08-08 00:10:39 +0000
@@ -1,41 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <record model="ir.ui.view" id="view_account_invoice_form_inh_xml22">
             <field name="name">view.account.invoice.form.inh.xml22</field>
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-            <field name="fiscal_position" position="after">
-                 <newline/>
-
-                <field name="global_discount_percent" colspan="2"/>
-                <field name="motive_discount" colspan="2"/>
-                <field name="global_discount_amount" colspan="2"/>
-            </field>
+                <xpath expr="//field[@name='fiscal_position']" position="after">
+                    <newline/>
+                    <field name="global_discount_percent" colspan="2"/>
+                    <field name="motive_discount" colspan="2"/>
+                    <field name="global_discount_amount" colspan="2"/>
+                </xpath>
             </field>
         </record>
-
+        
         <record model="ir.ui.view" id="view_invoice_line_tree_inh_discount">
             <field name="name">view.invoice.line.tree.inh.discount</field>
             <field name="model">account.invoice.line</field>
             <field name="inherit_id" ref="account.view_invoice_line_tree"/>
             <field name="arch" type="xml">
-            <field name="discount" position="replace">
-                <field name="discount" groups="base.group_extended" readonly="1"/>
-            </field>
+                <xpath expr="//field[@name='discount']" position="replace">
+                    <field name="discount" groups="base.group_extended" readonly="1"/>
+                </xpath>
             </field>
         </record>
-
+        
         <record model="ir.ui.view" id="view_invoice_line_form_inh_discount">
             <field name="name">view.invoice.line.form.inh.discount</field>
             <field name="model">account.invoice.line</field>
             <field name="inherit_id" ref="account.view_invoice_line_form"/>
             <field name="arch" type="xml">
-            <field name="discount" position="replace">
-                <field name="discount" groups="base.group_extended" readonly="1"/>
-            </field>
+                <xpath expr="//field[@name='discount']" position="replace">
+                    <field name="discount" groups="base.group_extended" readonly="1"/>
+                </xpath>
             </field>
         </record>
     </data>

=== modified file 'l10n_mx_invoice_wkf_security/invoice_wkf_security_view.xml'
--- l10n_mx_invoice_wkf_security/invoice_wkf_security_view.xml	2013-06-28 22:52:28 +0000
+++ l10n_mx_invoice_wkf_security/invoice_wkf_security_view.xml	2013-08-08 00:10:39 +0000
@@ -3,19 +3,19 @@
     <data>
 
         <record id="view_account_invoice_form_inherit" model="ir.ui.view">
-                <field name="name">view.account.invoice.form.inherit</field>
-                <field name="model">account.invoice</field>
-                <field name="inherit_id" ref="account.invoice_form"/>
-                <field name="arch" type="xml">
-                    <button name="invoice_cancel" position="replace">
-                        <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel"
+            <field name="name">view.account.invoice.form.inherit</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//button[@name='invoice_cancel']" position="replace">
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel"
                                 icon="gtk-cancel" groups="invoice_wkf_security.group_invoice_cancel,l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
-                    </button>
-                    <button name="action_cancel_draft" position="replace">
-                        <button name="action_cancel_draft" states="cancel" string="Reset to Draft"
+                </xpath>
+                <xpath expr="//button[@name='action_cancel_draft']" position="replace">
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft"
                                 type="object" icon="terp-stock_effects-object-colorize" groups="invoice_wkf_security.group_invoice_reset_draft, l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
-                    </button>
-                </field>
+                </xpath>
+            </field>
         </record>
 
     </data>

=== modified file 'l10n_mx_payment_method/invoice_view.xml'
--- l10n_mx_payment_method/invoice_view.xml	2013-08-05 23:11:03 +0000
+++ l10n_mx_payment_method/invoice_view.xml	2013-08-08 00:10:39 +0000
@@ -7,11 +7,11 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <field name="fiscal_position" position="after">
+                <xpath expr="//field[@name='fiscal_position']" position="after">
                     <newline/>
                     <field name="pay_method_id" colspan="2" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
                     <field name="acc_payment" colspan="2" domain = "[('partner_id', '=', partner_id)]" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
-                </field>
+                </xpath>
             </field>
         </record>
         
@@ -21,11 +21,11 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
-                <field name="fiscal_position" position="after">
+                <xpath expr="//field[@name='fiscal_position']" position="after">
                     <newline/>
                     <field name="pay_method_id" colspan="2" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
                     <field name="acc_payment" colspan="2" domain = "[('partner_id', '=', partner_id)]" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
-                </field>
+                </xpath>
             </field>
         </record>
 

=== modified file 'l10n_mx_payment_method/partner_view.xml'
--- l10n_mx_payment_method/partner_view.xml	2013-06-04 00:26:18 +0000
+++ l10n_mx_payment_method/partner_view.xml	2013-08-08 00:10:39 +0000
@@ -7,9 +7,9 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <field name="property_payment_term" position="before">
+                <xpath expr="//field[@name='property_payment_term']" position="before">
                     <field name="pay_method_id" colspan="2"/>
-                </field>
+                </xpath>
             </field>
         </record>
     </data>