Merge lp:~jeffery9/ocb-addons/ocb-addons into lp:ocb-addons

[jeffery chen fan]

fix bug#1247018

[lp:~jeffery9/ocb-addons/ocb-addons]

9638. By jeffery chen fan on 2013-11-06

MERGE

[Holger Brunn (Therp) (hbrunn)]

Please link the bug to your branch for simpler tracking.

Further, only #28 seems to actually fix the bug, so please remove the UI changes included in crm_phonecall_view.xml

review: Needs Fixing

[Holger Brunn (Therp) (hbrunn)]

setting to work in progress due to inactivity

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

There are 2 MP

Which one is the good one ?

https://code.launchpad.net/~jeffery9/ocb-addons/ocb-addons/+merge/193883
https://code.launchpad.net/~jeffery9/ocb-addons/ocb-addons-fixups/+merge/194463

review: Needs Information

[Alexis de Lattre (alexis-via)]

I confirm that the addition of
<field name="context">{'default_state': 'open'}</field>
in crm/wizard/crm_phonecall_to_phonecall_view.xml
fixes the bug.

The other changes are not related to the bug.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Please remove other changes in crm/crm_phonecall_view.xml

Otherwise LGTM

review: Approve (code review, no test)

Unmerged revisions

9638. By jeffery chen fan on 2013-11-06

MERGE

9637. By jeffery chen fan on 2013-11-05

fix bug#1247018

=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2012-10-23 16:05:04 +0000
+++ crm/crm_phonecall_view.xml	2013-11-06 02:31:18 +0000
@@ -133,12 +133,12 @@
                 <field name="partner_id"
                     on_change="onchange_partner_id(partner_id)"/>
                 <field name="partner_phone"
-                    invisible="1"/>
+                    />
                 <field name="user_id"/>
                 <field name="categ_id" widget="selection"
                     domain="[('object_id.model', '=', 'crm.phonecall')]"
-                    invisible="1"/>
-                <field name="state" invisible="1"/>
+                    />
+                <field name="state"/>
                 <field name="create_date" invisible="1"/>
                 <field name="opportunity_id" invisible="1" on_change="on_change_opportunity(opportunity_id)"/>
                 <button string="Schedule Other Call"

=== modified file 'crm/wizard/crm_phonecall_to_phonecall_view.xml'
--- crm/wizard/crm_phonecall_to_phonecall_view.xml	2012-10-23 16:05:04 +0000
+++ crm/wizard/crm_phonecall_to_phonecall_view.xml	2013-11-06 02:31:18 +0000
@@ -36,6 +36,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="phonecall_to_phonecall_view"/>
             <field name="target">new</field>
+            <field name="context">{'default_state': 'open'}</field>
         </record>
 
     </data>