openerp-dev-web team mailing list archive

["Ujjvala Collins \(OpenERP\)" <uco@xxxxxxxxxxx>]

Ujjvala Collins (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #530681 [trunk - base_calendar] exrule field without functionality [IMP]
  https://bugs.launchpad.net/bugs/530681
  #681463 [6.0][project] template project shouldn't pollute the analytic chart of account
  https://bugs.launchpad.net/bugs/681463
  #697443 Bug in the tree view of the projects, when grouping by parent
  https://bugs.launchpad.net/bugs/697443
  #701556 name trouble in phone call section in partner from view
  https://bugs.launchpad.net/bugs/701556

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/46583

[FIX]
-------
* crm: Recurrency cannot be edited if meeting is done.

* crm_claim: Report error corrected for email field.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/46583
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml	2011-01-18 07:05:27 +0000
+++ crm/crm_meeting_view.xml	2011-01-18 11:32:50 +0000
@@ -43,8 +43,8 @@
                     <field name="location" />
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
-                    <group colspan="2" col="4" >
-                           <field name="recurrency" attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
+                    <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                           <field name="recurrency"/>
                            <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
                                 on_change="onchange_edit_all(rrule_type,edit_all)"/>
                     </group>
@@ -165,7 +165,7 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)], 'readonly': [('recurrent_uid','!=',False)]}">
+                    <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"

=== modified file 'crm_claim/report/crm_claim_report_view.xml'
--- crm_claim/report/crm_claim_report_view.xml	2011-01-14 09:34:28 +0000
+++ crm_claim/report/crm_claim_report_view.xml	2011-01-18 11:32:50 +0000
@@ -20,7 +20,6 @@
                     <field name="nbr" string="#Claim" sum="#Claim"/>
                     <field name="email" sum="# Mails"/>
                     <field name="delay_close" avg="Avg Closing Delay"/>
-                    <field name="email"/>
                     <field name="probability" widget="progressbar"/>
                     <field name="delay_expected"/>
                     <field name="state" invisible="1"/>