← Back to team overview

avanzosc team mailing list archive

[Merge] lp:~avanzosc-security-team/avanzosc/72h_dos_partner_additional_info into lp:~avanzosc-security-team/avanzosc/72horas

 

Oihane (Avanzosc) has proposed merging lp:~avanzosc-security-team/avanzosc/72h_dos_partner_additional_info into lp:~avanzosc-security-team/avanzosc/72horas.

Requested reviews:
  Pedro Manuel Baeza (pedro.baeza)

For more details, see:
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_partner_additional_info/+merge/225955

Cambios realizados por que ha dado varios errores al instalar
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_partner_additional_info/+merge/225955
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.
=== modified file 'dos_partner_additional_info/views/partner_view.xml'
--- dos_partner_additional_info/views/partner_view.xml	2014-06-23 11:05:00 +0000
+++ dos_partner_additional_info/views/partner_view.xml	2014-07-08 11:16:11 +0000
@@ -11,7 +11,7 @@
                 <field name="category_id" position="after">
                     <field name="tipo_cliente" />
                 </field>
-                <filter string="Salesman" position="after">
+                <filter string="Salesperson" position="after">
                     <filter string="Parent Partner" icon="terp-personal"
                         domain="[]" context="{'group_by' : 'parent_id'}" />
                 </filter>
@@ -39,7 +39,7 @@
             <field name="inherit_id" ref="base.view_partner_form" />
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <page string="Notes" position="after">
+                <page string="Internal Notes" position="after">
                     <page string="Información Adicional" groups="base.group_extended">
                         <group colspan="2" col="4">
                             <separator string="Información Adicional"
@@ -111,17 +111,5 @@
             </field>
         </record>
 
-        <!-- ===================== Partner Address ===================== -->
-        <record model="ir.ui.view" id="view_partner_address_tree_inherit">
-            <field name="name">Partner Addresses Inherited</field>
-            <field name="model">res.partner.address</field>
-            <field name="inherit_id" ref="base.view_partner_address_tree" />
-            <field name="arch" type="xml">
-                <field name="phone" position="before">
-                    <field name='street' />
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>


Follow ups