[MERGE] Merge with lp:openobject-addons
authorSbh (Openerp) <sbh@tinyerp.com>
Thu, 22 Mar 2012 09:52:14 +0000 (15:22 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Thu, 22 Mar 2012 09:52:14 +0000 (15:22 +0530)
bzr revid: sbh@tinyerp.com-20120322095214-3vhzc9own0otfnl7

1  2 
addons/crm/crm_lead_view.xml
addons/crm_claim/crm_claim_view.xml
addons/crm_fundraising/crm_fundraising_view.xml
addons/crm_helpdesk/crm_helpdesk_view.xml
addons/event/event_view.xml
addons/hr_recruitment/hr_recruitment_view.xml
addons/project/project_view.xml
addons/project_issue/project_issue_view.xml
addons/purchase/purchase_view.xml
addons/sale/sale_view.xml
addons/stock/stock_view.xml

                      <group colspan="2" col="2">
                          <separator string="Mailings" colspan="2" col="2"/>
                          <field name="optin" on_change="on_change_optin(optin)"/>
 -                        <field name="optout" on_change="on_change_optout(optout)"/>
 +                        <field name="opt_out" on_change="on_change_optout(opt_out)"/>
                      </group>
-                     <group colspan="2" col="2">
+                     <group colspan="2" col="2" groups="base.group_no_one">
                          <separator string="Statistics" colspan="2" col="2"/>
                          <field name="day_open"/>
                          <field name="day_close"/>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
                      <field name="name"/>
                      <field name="picking_id" string="Reference"/>
                      <field name="origin"/>
-                     <field name="create_date" invisible="1"/>
+                     <field name="create_date" invisible="1" groups="base.group_no_one"/>
 -                    <field name="partner_id"/>
                      <field name="product_id"/>
                      <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                      <field name="product_uom" string="UoM"/>