openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01367
[Merge] lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
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
#684791 troubles with recurency in calendar
https://bugs.launchpad.net/bugs/684791
#689574 Not possible to create a Inbound call from the history tab of the partner form
https://bugs.launchpad.net/bugs/689574
Hello ,
Fix the problem describe on http://pad.openerp.com/calendar-reccurent-issue.
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/sbh-dev-addons1/+merge/44014
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 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py 2010-12-16 04:54:09 +0000
+++ base_calendar/base_calendar.py 2010-12-17 06:31:36 +0000
@@ -1088,8 +1088,8 @@
if datas.get('rrule_type') :
if datas.get('interval', 0) < 0:
raise osv.except_osv(_('Warning!'), _('Interval can not be Negative'))
-# if datas.get('count', 0) < 0:
-# raise osv.except_osv(_('Warning!'), _('Count can not be Negative'))
+ if datas.get('count', 0) < 0:
+ raise osv.except_osv(_('Warning!'), _('Count can not be Negative'))
rrule_custom = self.compute_rule_string(cr, uid, datas, \
context=context)
result[event] = rrule_custom
@@ -1150,7 +1150,7 @@
('weekly', 'Weeks'), \
('monthly', 'Months'), \
('yearly', 'Years'), ], 'Frequency'),
- 'interval': fields.integer('Interval', help="Repeat every x"),
+ 'interval': fields.integer('Interval', help="Repeat every (Days/Week/month/year)"),
'count': fields.integer('Count', help="Repeat max that times"),
'mo': fields.boolean('Mon'),
'tu': fields.boolean('Tue'),
@@ -1307,7 +1307,6 @@
new_rule = '%s=%s' % (name, value)
new_rrule_str.append(new_rule)
new_rrule_str = ';'.join(new_rrule_str)
-
rdates = get_recurrent_dates(str(new_rrule_str), exdate, start_date, data['exrule'])
for r_date in rdates:
if start_date and r_date < start_date:
=== modified file 'base_calendar/base_calendar_view.xml'
--- base_calendar/base_calendar_view.xml 2010-12-15 12:25:19 +0000
+++ base_calendar/base_calendar_view.xml 2010-12-17 06:31:36 +0000
@@ -353,8 +353,9 @@
</group>
<separator string="Recurrency Rule" colspan="8"/>
<group col="6" colspan="4">
- <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/>
- <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/>
+ <field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/>
+ <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
+ <field name="end_date" attrs="{'readonly': [('interval','!=',False)]}"/>
</group>
<group col="14" colspan="4" name="Select weekdays"
attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}">
=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml 2010-12-16 04:54:09 +0000
+++ crm/crm_meeting_view.xml 2010-12-17 06:31:36 +0000
@@ -173,9 +173,10 @@
<label string="" colspan="2"/>
</group>
<separator string="Recurrency Rule" colspan="8"/>
- <group col="2" colspan="2">
- <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/>
- <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/>
+ <group col="6" colspan="4">
+ <field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/>
+ <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
+ <field name="end_date" attrs="{'readonly': [('interval','!=',False)]}"/>
</group>
<group col="14" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}">
<field name="mo" colspan="1" />
=== modified file 'project_caldav/project_caldav_view.xml'
--- project_caldav/project_caldav_view.xml 2010-12-16 04:54:09 +0000
+++ project_caldav/project_caldav_view.xml 2010-12-17 06:31:36 +0000
@@ -85,11 +85,11 @@
</group>
<newline/>
<group col="4" colspan="6" name="rrule">
- <separator string="Custom Recurrency Rule" colspan="8"/>
+ <separator string="Recurrency Rule" colspan="8"/>
<group col="6" colspan="4">
- <!-- <field name="freq" /> -->
- <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/>
- <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/>
+ <field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/>
+ <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
+ <field name="end_date" attrs="{'invisible': [('readonly','!=',False)]}"/>
</group>
<group col="14" colspan="4" name="Select weekdays"
attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}">
Follow ups
