odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] MERGE lp:~openerp-dev/openobject-addons/uco-dev-addons1 

bzr revid: sbh@tinyerp.com-20110118113527-kmbp6nhg6kjm0rak
This commit is contained in:
Sbh (OpenERP) 2011-01-18 17:05:27 +05:30
parent a358921cee df90cab0e7
commit 7ca7912098
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/crm/crm_meeting_view.xml
View File

@ -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"

1
addons/crm_claim/report/crm_claim_report_view.xml
View File

@ -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"/>