openerp-dev-web team mailing list archive

["Sbh \(Open ERP\)" <sbh@xxxxxxxxxxx>]

Sbh (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #644398 Resource : there is no menu entry to configure resource.calendar
  https://bugs.launchpad.net/bugs/644398
  #671360 [RC1] base_report_designer can't push report to db
  https://bugs.launchpad.net/bugs/671360
  #680121 Partner : History tab should be invisible by default,must be available on request of concerned modules.
  https://bugs.launchpad.net/bugs/680121


Bug fix 
https://bugs.launchpad.net/openobject-addons/+bug/680121
https://bugs.launchpad.net/openobject-addons/+bug/680984
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/sbh-dev-addons1/+merge/42928
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml	2010-10-29 05:22:01 +0000
+++ crm/crm_meeting_view.xml	2010-12-07 11:47:17 +0000
@@ -133,14 +133,11 @@
                     <separator colspan="4"/>
                     <group col="8" colspan="4" groups="base.group_extended">
                         <field name="state" />
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open" type="object"
-                            icon="gtk-cancel" />
                         <button name="case_close" string="Done"
                             states="open" type="object"
                             icon="gtk-jump-to" />
                         <button name="case_reset" string="Reset to Unconfirmed"
-                            states="open,done,cancel" type="object"
+                            states="open,done" type="object"
                             icon="gtk-convert" />
                         <button name="case_open" string="Confirm"
                             states="draft" type="object"
@@ -245,11 +242,8 @@
                 <field name="state" groups="base.group_extended"/>
                 <field name="user_id" invisible="1"/>
                 <field name="show_as" invisible="1" string="Show time as"/>
-                <button name="case_cancel" string="Cancel"
-                   states="draft,open" type="object"
-                   icon="gtk-cancel" />
                 <button name="case_reset" string="Reset to Unconfirmed"
-                   states="open,done,cancel" type="object"
+                   states="open,done" type="object"
                    icon="gtk-convert" />
                 <button name="case_open" string="Confirm"
                    states="draft" type="object"

=== modified file 'mail_gateway/res_partner_view.xml'
--- mail_gateway/res_partner_view.xml	2010-11-25 07:26:38 +0000
+++ mail_gateway/res_partner_view.xml	2010-12-07 11:47:17 +0000
@@ -3,7 +3,17 @@
     <data>
 
          <!--  Partners inherited form -->
-
+         <record id="base.view_crm_partner_info_History" model="ir.ui.view">
+             <field name="name">res.partner.crm.history.inherit1</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="/form/notebook/page[@string='History']" position="attributes">
+                     <attribute name="invisible">False</attribute>
+                 </xpath>
+             </field>
+             </record>
         <record id="view_emails_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.emails.info.inherit</field>
             <field name="model">res.partner</field>

=== modified file 'marketing_campaign/res_partner_view.xml'
--- marketing_campaign/res_partner_view.xml	2010-06-25 09:50:38 +0000
+++ marketing_campaign/res_partner_view.xml	2010-12-07 11:47:17 +0000
@@ -3,7 +3,17 @@
     <data>
 
          <!--  Partners inherited form -->
-
+        <record id="base.view_crm_partner_info_History" model="ir.ui.view">
+           <field name="name">res.partner.crm.history.inherit1</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="/form/notebook/page[@string='History']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+           </field>
+          </record>	
         <record id="view_workitem_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.workitem.info.inherit</field>
             <field name="model">res.partner</field>

=== modified file 'project/res_partner_view.xml'
--- project/res_partner_view.xml	2010-07-09 07:27:50 +0000
+++ project/res_partner_view.xml	2010-12-07 11:47:17 +0000
@@ -3,7 +3,17 @@
     <data>
 
          <!--  Partners inherited form -->
-
+         <record id="base.view_crm_partner_info_History" model="ir.ui.view">
+            <field name="name">res.partner.crm.history.inherit1</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="/form/notebook/page[@string='History']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+             </field>
+          </record>	
         <record id="view_task_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.task.info.inherit</field>
             <field name="model">res.partner</field>