openerp-dev-web team mailing list archive

[Jigar Amin - OpenERP <jam@xxxxxxxxxxx>]

Jigar Amin - OpenERP has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #695038 OpenOfficeReportDesigner Group to Remove in Trunk
  https://bugs.launchpad.net/bugs/695038
  #695596 Audit trail module does not creating an audit log for users.
  https://bugs.launchpad.net/bugs/695596

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

Hello,
   Changes with this merge proposal:
     + caldav : sync wizard added new filed for on line caldav doc,
     + Project_long_term : Warning message usability improved.
   Kindly review this.
Thank You
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/46471
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons.

=== modified file 'caldav/wizard/caldav_browse.py'
--- caldav/wizard/caldav_browse.py	2011-01-07 14:47:20 +0000
+++ caldav/wizard/caldav_browse.py	2011-01-17 12:36:17 +0000
@@ -237,7 +237,8 @@
                'collection' :fields.many2one('document.directory', "Calendar Collection", required=True, domain = [('calendar_collection', '=', True)]),
                'calendar' :fields.many2one('basic.calendar', 'Calendar', required=True),
                'service': fields.selection([('webdav','CalDAV')], "Services"),
-               'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices")
+               'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices"),
+               'doc_link':fields.char('Caldav Documentation', size="264", help="The link to Caldav Online Documentation.", readonly=True),
     }
     
     def _get_default_calendar(self, cr, uid, context):
@@ -260,7 +261,8 @@
               'service': 'webdav',
               'collection' : _get_default_collection,
               'calendar' : _get_default_calendar,
-              'device' : 'other'
+              'device' : 'other',
+              'doc_link' : 'http://doc.openerp.com/'
     }    
    
     def open_window(self, cr, uid, ids, context=None):

=== modified file 'caldav/wizard/caldav_browse_view.xml'
--- caldav/wizard/caldav_browse_view.xml	2011-01-06 12:17:06 +0000
+++ caldav/wizard/caldav_browse_view.xml	2011-01-17 12:36:17 +0000
@@ -37,6 +37,7 @@
                     <field name="calendar"  colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
                     <field name="device"  colspan="4" width="250" />
                     <separator colspan="4"/>
+                    <field name="doc_link" widget="url"/>
                     <group col="4" colspan="4">
                         <label string="" colspan="2"/>
                         <button special="cancel" string="_Cancel" icon="gtk-cancel"/>

=== modified file 'caldav/wizard/calendar_event_import_view.xml'
--- caldav/wizard/calendar_event_import_view.xml	2011-01-14 00:11:01 +0000
+++ caldav/wizard/calendar_event_import_view.xml	2011-01-17 12:36:17 +0000
@@ -9,7 +9,7 @@
                 <form string="Import ICS">
                     <group colspan="4" >
                          <separator string="Select ICS file"/>
-                         <field name="file_path" colspan="4" width="300" nolabel="1"/>
+                         <field name="file_path" colspan="4" width="500" nolabel="1"/>
                     </group>
                         <separator string="" colspan="4" />
                     <group colspan="4" col="6">

=== modified file 'project_long_term/project_long_term.py'
--- project_long_term/project_long_term.py	2011-01-14 09:34:28 +0000
+++ project_long_term/project_long_term.py	2011-01-17 12:36:17 +0000
@@ -364,7 +364,12 @@
             # Allocating Memory for the required Project and Pahses and Resources
             exec(func_str)
             Phase = eval('Phase_%d' % phase.id)
-            phase = Task.BalancedProject(Phase)
+            phase = None
+            try:
+                phase = Task.BalancedProject(Phase)
+            except :
+                raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.'))
+        
         
             for task_id in task_ids:
                 task = eval("phase.Task_%d" % task_id)
@@ -510,7 +515,8 @@
             try:
                 project = Task.BalancedProject(Project)
             except :
-                raise osv.except_osv(_('Error !'),_('Invalid resource allocation, Phase Scheduling is not possible.\nPlease check project member resource.'))
+                raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.'))
+            
             for phase_id in phase_ids:
                 act_phase = phase_pool.browse(cr, uid, phase_id, context=context)
                 resources = act_phase.resource_ids
@@ -573,7 +579,10 @@
             #Creating resources using the member of the Project
             u_ids = [i.id for i in project.members]
             resource_objs = resource_pool.generate_resources(cr, uid, u_ids, calendar_id, context=context)
-            start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d")
+            try:
+                start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d")
+            except:
+                raise osv.except_osv(_('Error !'),_('Task Scheduling is not possible.\nProject should have the Start date for scheduling.'))
             func_str = ''
             start = start_date
             minimum_time_unit = 1
@@ -634,7 +643,12 @@
             # Allocating Memory for the required Project and Pahses and Resources
             exec(func_str)
             Project = eval('Project_%d' % project.id)
-            project = Task.BalancedProject(Project)
+            project = None
+            try:
+                project = Task.BalancedProject(Project)
+            except :
+                raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.'))
+            
             for task_id in task_ids:
                 task = eval("project.Task_%d" % task_id)
                 start_date = task.start.to_datetime()