Merge lp:~vrt-openerp/openobject-addons/vrt-openerp into lp:openobject-addons

[Stuart Longland]

This branch includes a number of in-house changes to OpenERP 6.1 trunk that fix some issues discovered in the move across. Updates include:

- Long term planning:
  - Fix to working hours; converting the user's working hours to UTC for scheduling in Faces
  - Allowing the "Schedule Phases" to also schedule tasks within each phase
  - Enable assignment of a work-load for a task in percent; this is passed through to Faces for scheduling purposes
- CRM module:
  - Create a new "Leads" field (taken from partner_name), for leads that do not have a partner defined yet (otherwise all these "leads" get filed under the "Undefined" partner)

[lp:~vrt-openerp/openobject-addons/vrt-openerp]

6624. By Launchpad Translations on behalf of openerp on 2012-02-20

Launchpad automatic translations update.

6625. By Launchpad Translations on behalf of openerp on 2012-02-21

Launchpad automatic translations update.

6626. By Jean-Christophe VASSORT on 2012-02-21

[FIX] opw 383657: hr_expense: When unit quantity or factor value is zero > get divide by zero error

6627. By Launchpad Translations on behalf of openerp on 2012-02-22

Launchpad automatic translations update.

6628. By Raphael Collet (OpenERP) on 2012-02-22

[MERGE] lp:931523 (fix error message when pushing on Documents)

6629. By Quentin (OpenERP) <email address hidden> on 2012-02-22

[MERGE] merge the branch from Numérigraphe with a better label for the address of direct delivery on PO.

6630. By Launchpad Translations on behalf of openerp on 2012-02-23

Launchpad automatic translations update.

6631. By Nicolas Vanhoren (OpenERP) on 2012-02-23

[merge] refactoring in web client

6632. By Quentin (OpenERP) <email address hidden> on 2012-02-23

[FIX] account, cash statement: creation through web client

6633. By Quentin (OpenERP) <email address hidden> on 2012-02-23

[MERGE] lp:909124. Conflict between account_bank_statement_extension and point_of_sale

6634. By Quentin (OpenERP) <email address hidden> on 2012-02-23

[FIX] account: cannot iter on a boolean. stupid me

6635. By Fabien Meghazi (OpenERP) on 2012-02-23

[FIX] Edi: webclient's template name has been changed from 'Interface' to 'WebClient'

6636. By Quentin (OpenERP) <email address hidden> on 2012-02-23

[IMP] account_payment: improved the module description to tackle the most common pitfall linked to this module + rst compliancy of few other modules

6637. By Quentin (OpenERP) <email address hidden> on 2012-02-23

[IMP] account_payment: improved the module description to tackle the most common pitfall linked to this module

6638. By Quentin (OpenERP) <email address hidden> on 2012-02-23

[MERGE] lp:930528

6639. By Launchpad Translations on behalf of openerp on 2012-02-24

Launchpad automatic translations update.

6640. By Quentin (OpenERP) <email address hidden> on 2012-02-24

[MERGE] lp:880844

6641. By Quentin (OpenERP) <email address hidden> on 2012-02-24

[REM] hr_timesheet_invoice: removed unused report cost ledger. It was duplicated code of the same report defined in account module AND calling its rml.

6642. By Quentin (OpenERP) <email address hidden> on 2012-02-24

[MERGE] fix of lp:901089

6643. By Launchpad Translations on behalf of openerp on 2012-02-25

Launchpad automatic translations update.

6644. By Launchpad Translations on behalf of openerp on 2012-02-26

Launchpad automatic translations update.

6645. By Launchpad Translations on behalf of openerp on 2012-02-27

Launchpad automatic translations update.

6646. By Launchpad Translations on behalf of openerp on 2012-02-28

Launchpad automatic translations update.

6647. By Launchpad Translations on behalf of openerp on 2012-02-29

Launchpad automatic translations update.

6648. By Olivier Dony (Odoo) on 2012-02-29

[MERGE] Latest bugfixes from 6.1

6649. By Nicolas Vanhoren (OpenERP) on 2012-02-29

[imp] adaptation to .js due to changes in web

6650. By Fabien Meghazi (OpenERP) on 2012-02-29

[FIX] Fixed broken web addon due to webclient's new layout

6651. By Fabien Meghazi (OpenERP) on 2012-02-29

[FIX] web_livechat: Fixed broken addon due to webclient's layout change

6652. By Launchpad Translations on behalf of openerp on 2012-03-01

Launchpad automatic translations update.

6653. By Fabien Meghazi (OpenERP) on 2012-03-01

[IMP] web addons: Use webclient's Systray tooltips

6654. By Quentin (OpenERP) <email address hidden> on 2012-03-01

[MERGE] merged the branch containing the refactoring of event module and the new modules event_moodle and event_sale

6655. By Launchpad Translations on behalf of openerp on 2012-03-02

Launchpad automatic translations update.

6656. By Launchpad Translations on behalf of openerp on 2012-03-03

Launchpad automatic translations update.

6671. By Stuart Longland on 2012-02-25

Rewrite and Merge with upstream changes.

6672. By Stuart Longland on 2012-03-01

Rewrite and Merge with upstream changes.

6673. By Stuart Longland on 2012-03-01

hr_timesheet_sheet: Fix user_id default value

OpenERP 6.1-1 currently fails to fill in the user_id field. On submission of a
timesheet line, the end user finds the system rejects the entered data on the
basis that the user_id field is invalid. Being a hidden field, it is
impossible for the end user to correct this.

The following seems to fix the problem here.

6674. By Stuart Longland on 2012-03-05

Rewrite and Merge with upstream changes.

6675. By Stuart Longland on 2012-03-06

crm: Hide "Lead" in search view of Opportunities

They don't have "lead" fields, as the lead has been already converted to
a partner by this stage.

6676. By Stuart Longland on 2012-03-06

crm: Allow lead report to show individual leads

This allows the end user to navigate to an individual lead (for now via
an intermediate form). The form will need some prettying up, but at
least now if there's a heap of leads in one group, we can differentiate
them now.

This also reverts my earlier commit, which broke things.

6677. By Stuart Longland on 2012-03-06

crm_lead_report: Fix broken init function

SQL was complaining we specified id twice, so we call the latter
occurance lead_id. That keeps it happy.

[Olivier Dony (Odoo) (odo-openerp)]

Hello Stuart,

The proposed patches sound good, but the merge proposal is hard to review because it seems to contain a certain number of unrelated changes (CRM stuff). As a rule we prefer to keep only related changesets in each merge proposal, especially for bugfix branches - so they can be independently reviewed and merged.
Perhaps the easiest course is to apply your patch for bug 932584 on a fresh copy of our official addons branch, and submit that as a separate merge proposal.

If you'd like more details, our merge proposal documentation includes a step-by-step guide for this process [1].

Thanks for your contributions to OpenERP!

[1] http://doc.openerp.com/v6.0/contribute/15_guidelines/contribution_guidelines.html#merge-proposal-guidelines

review: Needs Resubmitting (branch content)

[Stuart Longland (redhatter)]

No worries, I'll split this up.

I've just spent what seems like 10 minutes hunting around for the "Register Branch" link to do exactly this, and Launchpad has "helpfully" removed it and not told anyone (thanks Launchpad).

I'm creating a fresh branch of the trunk code -- when this is done, I should be able to cherry-pick the relevant commits from it and push those into a separate new branch.

Unmerged revisions

6677. By Stuart Longland on 2012-03-06

crm_lead_report: Fix broken init function

SQL was complaining we specified id twice, so we call the latter
occurance lead_id. That keeps it happy.

6676. By Stuart Longland on 2012-03-06

crm: Allow lead report to show individual leads

This allows the end user to navigate to an individual lead (for now via
an intermediate form). The form will need some prettying up, but at
least now if there's a heap of leads in one group, we can differentiate
them now.

This also reverts my earlier commit, which broke things.

6675. By Stuart Longland on 2012-03-06

crm: Hide "Lead" in search view of Opportunities

They don't have "lead" fields, as the lead has been already converted to
a partner by this stage.

6674. By Stuart Longland on 2012-03-05

Rewrite and Merge with upstream changes.

6673. By Stuart Longland on 2012-03-01

hr_timesheet_sheet: Fix user_id default value

OpenERP 6.1-1 currently fails to fill in the user_id field. On submission of a
timesheet line, the end user finds the system rejects the entered data on the
basis that the user_id field is invalid. Being a hidden field, it is
impossible for the end user to correct this.

The following seems to fix the problem here.

6672. By Stuart Longland on 2012-03-01

Rewrite and Merge with upstream changes.

6671. By Stuart Longland on 2012-02-25

Rewrite and Merge with upstream changes.

6670. By Stuart Longland on 2012-02-20

Rewrite and Merge with upstream changes.

6669. By Stuart Longland on 2012-02-17

project_long_term: Skip cancelled or done tasks.

These are skipped when generating the project description for faces to manage,
therefore they should also be skipped when collecting results.

6668. By Stuart Longland on 2012-02-17

project_long_term.schedule_phases: Skip projects with no phases

Projects that have no phases by definition cannot be scheduled via the "Schedule Phases" algorithm. When one attempts to do this, the following is emitted to Faces:

from resource.faces import *
import datetime

def Project():

resulting in the following stack trace:

[2012-02-17 02:07:29,630][development61] ERROR:web-services:Uncaught exception
Traceback (most recent call last):
  File "/usr/lib64/python2.7/site-packages/openerp-6.1rc1_20120112_173907-py2.7.egg/openerp/osv/osv.py", line 120, in wrapper
    return f(self, dbname, *args, **kwargs)
  File "/usr/lib64/python2.7/site-packages/openerp-6.1rc1_20120112_173907-py2.7.egg/openerp/osv/osv.py", line 175, in execute
    res = self.execute_cr(cr, uid, obj, method, *args, **kw)
  File "/usr/lib64/python2.7/site-packages/openerp-6.1rc1_20120112_173907-py2.7.egg/openerp/osv/osv.py", line 163, in execute_cr
    return getattr(object, method)(cr, uid, *args, **kw)
  File "/usr/lib64/python2.7/site-packages/openerp-6.1rc1_20120112_173907-py2.7.egg/openerp/addons/project_long_term/wizard/project_compute_phases.py", line 39, in check_selection
    return self.compute_date(cr, uid, ids, context=context)
  File "/usr/lib64/python2.7/site-packages/openerp-6.1rc1_20120112_173907-py2.7.egg/openerp/addons/project_long_term/wizard/project_compute_phases.py", line 55, in compute_date
    project_pool.schedule_phases(cr, uid, project_ids, context=context)
  File "/usr/lib64/python2.7/site-packages/openerp-6.1rc1_20120112_173907-py2.7.egg/openerp/addons/project_long_term/project_long_term.py", line 238, in schedule_phases
    exec result in local_dict
  File "<string>", line 5

   ^
IndentationError: expected an indented block

This is a partial fix. The user should be warned as to what projects have been
skipped or at least, given the opportunity to schedule the tasks for those
projects.

=== modified file 'crm/report/crm_lead_report.py'
--- crm/report/crm_lead_report.py	2012-01-31 13:36:57 +0000
+++ crm/report/crm_lead_report.py	2012-03-06 23:39:19 +0000
@@ -74,6 +74,7 @@
         'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
 
+        'lead_id':fields.many2one('crm.lead', 'Lead', readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'country_id':fields.many2one('res.country', 'Country', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
@@ -89,6 +90,7 @@
                          domain="['|',('section_id','=',False),('section_id','=',section_id)]" , readonly=True),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('section_ids', '=', section_id)]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
+        'partner_name': fields.char("Lead", size=64,help='The name of the future partner that will be created while converting the lead into an opportunity', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
@@ -124,6 +126,7 @@
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
 
+                    c.id as lead_id,
                     c.state,
                     c.user_id,
                     c.probability,
@@ -136,6 +139,7 @@
                     c.type_id,
                     c.categ_id,
                     c.partner_id,
+                    c.partner_name,
                     c.country_id,
                     c.planned_revenue,
                     c.planned_revenue*(c.probability/100) as probable_revenue,

=== modified file 'crm/report/crm_lead_report_view.xml'
--- crm/report/crm_lead_report_view.xml	2011-11-14 09:27:08 +0000
+++ crm/report/crm_lead_report_view.xml	2012-03-06 23:39:19 +0000
@@ -25,16 +25,52 @@
                 <field name="user_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
+                <field name="partner_name" invisible="1"/>
                 <field name="country_id" invisible="1"/>
                 <field name="nbr" sum="# Leads"/>
                 <field name="email" sum="# Mails"/>
                 <field name="delay_open"/>
                 <field name="delay_close"/>
                 <field name="planned_revenue"/>
+                <field name="lead_id"/>
              </tree>
             </field>
         </record>
 
+<!-- Leads by user and section Form View -->
+
+        <record id="view_report_crm_lead_form" model="ir.ui.view">
+            <field name="name">crm.lead.report.form</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Lead Analysis">
+                <field name="lead_id" colspan="4"/>
+                <field name="creation_year"/>
+                <field name="creation_month"/>
+                <field name="creation_day"/>
+                <field name="deadline_month"/>
+                <field name="state"/>
+                <field name="stage_id"/>
+                <field name="categ_id"/>
+                <field name="type_id"/>
+                <field name="channel_id"/>
+                <field name="type"/>
+                <field name="priority"/>
+                <field name="section_id"/>
+                <field name="user_id"/>
+                <field name="company_id"/>
+                <field name="partner_id"/>
+                <field name="partner_name"/>
+                <field name="country_id"/>
+                <field name="email"/>
+                <field name="delay_open"/>
+                <field name="delay_close"/>
+                <field name="planned_revenue"/>
+             </form>
+            </field>
+        </record>
+
 <!-- Leads by user and section Graph View -->
 
         <record id="view_report_crm_lead_graph" model="ir.ui.view">
@@ -126,6 +162,7 @@
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
                         <field name="partner_id"/>
+                        <field name="partner_name"/>
                         <separator orientation="vertical"/>
                         <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" />
                         <field name="categ_id" widget="selection"/>
@@ -146,6 +183,7 @@
                             domain="[]"
                             context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+                        <filter string="Lead" icon="terp-partner" context="{'group_by':'partner_name'}"/>
                         <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
                         <filter string="Company" icon="terp-go-home"
                             domain="[]"
@@ -193,6 +231,7 @@
                 <field name="section_id" invisible="1" groups="base.group_extended"/>
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
+                <field name="partner_name" invisible="1"/>
                 <field name="country_id" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
@@ -210,18 +249,56 @@
                 <field name="delay_expected"/>
                 <field name="probability" widget="progressbar"/>
                 <field name="probable_revenue"/>
+                <field name="lead_id"/>
              </tree>
             </field>
         </record>
 
+<!--     Opportunity form view  -->
+
+        <record id="view_report_crm_opportunity_form" model="ir.ui.view">
+            <field name="name">crm.lead.report.form</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Opportunities Analysis">
+                <field name="lead_id" colspan="4"/>
+                <field name="creation_year"/>
+                <field name="creation_month"/>
+                <field name="creation_day"/>
+                <field name="deadline_month"/>
+                <field name="section_id"/>
+                <field name="user_id"/>
+                <field name="partner_id"/>
+                <field name="partner_name"/>
+                <field name="country_id"/>
+                <field name="state" />
+                <field name="stage_id" />
+                <field name="priority" />
+                <field name="categ_id"/>
+                <field name="type_id"/>
+                <field name="channel_id"/>
+                <field name="type"/>
+                <field name="company_id" />
+                <field name="planned_revenue" />
+                <field name="email" string="# of Emails"/>
+                <field name="delay_open"/>
+                <field name="delay_close"/>
+                <field name="delay_expected"/>
+                <field name="probability" widget="progressbar"/>
+                <field name="probable_revenue"/>
+             </form>
+            </field>
+        </record>
+
 <!-- Leads by user and section Action -->
 
        <record id="action_report_crm_lead" model="ir.actions.act_window">
            <field name="name">Leads Analysis</field>
            <field name="res_model">crm.lead.report</field>
            <field name="view_type">form</field>
-           <field name="context">{'search_default_year': 1,'search_default_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
-           <field name="view_mode">tree,graph</field>
+           <field name="context">{'search_default_year': 1,'search_default_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by':[]}</field>
+           <field name="view_mode">tree,graph,form</field>
            <field name="domain">[]</field>
            <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
        </record>
@@ -237,12 +314,18 @@
             <field name="view_id" ref="view_report_crm_lead_graph"/>
             <field name="act_window_id" ref="action_report_crm_lead"/>
        </record>
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_form">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_report_crm_lead_form"/>
+            <field name="act_window_id" ref="action_report_crm_lead"/>
+       </record>
 
        <record id="action_report_crm_opportunity" model="ir.actions.act_window">
             <field name="name">Opportunities Analysis</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_year":1,"search_default_opportunity":1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{"search_default_year":1,"search_default_opportunity":1, "search_default_user":1,"search_default_this_month":1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
             <field name="help">Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline.</field>
         </record>
@@ -261,6 +344,13 @@
             <field name="act_window_id" ref="action_report_crm_opportunity"/>
        </record>
 
+       <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_form">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_report_crm_opportunity_form"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity"/>
+       </record>
+
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
             groups="base.group_extended"
             parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2012-02-13 15:27:55 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2012-03-06 23:39:19 +0000
@@ -95,7 +95,7 @@
                                 <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                                 <field name="total_attendance_day" widget="float_time" colspan="4"/>
                             </group>
-                            <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
+                            <field colspan="4" context="{'date':date_current,'user_id':uid}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
                                     <field invisible="1" name="date"/>
                                     <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>

=== modified file 'project/project.py'
--- project/project.py	2012-02-28 14:08:16 +0000
+++ project/project.py	2012-03-06 23:39:19 +0000
@@ -666,6 +666,7 @@
         'id': fields.integer('ID', readonly=True),
         'color': fields.integer('Color Index'),
         'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
+        'work_load': fields.integer('Workload (%)', help='Indicates how much time each person is to spend working on this task as a percentage of their total working hours.  The default is 100%.  The value must be greater than 0, else it will be treated as 100%.'),
     }
 
     _defaults = {
@@ -676,7 +677,7 @@
         'sequence': 10,
         'active': True,
         'user_id': lambda obj, cr, uid, context: uid,
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c)
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c),
     }
 
     _order = "priority, sequence, date_start, name, id"
@@ -1067,8 +1068,12 @@
                 continue
             result += '''
 %sdef Task_%s():
+%s  load = %4.2f
 %s  todo = \"%.2fH\"
-%s  effort = \"%.2fH\"''' % (ident,task.id, ident,task.remaining_hours, ident,task.total_hours)
+%s  effort = \"%.2fH\"''' % (   ident,task.id,
+                                ident,((task.work_load / 100.0) if task.work_load else 1.0),
+                                ident,task.remaining_hours,
+                                ident,task.total_hours  )
             start = []
             for t2 in task.parent_ids:
                 start.append("up.Task_%s.end" % (t2.id,))

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2012-02-13 15:27:55 +0000
+++ project/project_view.xml	2012-03-06 23:39:19 +0000
@@ -228,6 +228,9 @@
                         <field name="total_hours" widget="float_time"/>
                         <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                         <field name="user_id" select="1" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                        <field name="work_load"/>
+                    </group>
+                    <group colspan="4">
                         <field name="progress" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">

=== modified file 'project_long_term/project_long_term.py'
--- project_long_term/project_long_term.py	2012-01-31 13:36:57 +0000
+++ project_long_term/project_long_term.py	2012-03-06 23:39:19 +0000
@@ -224,9 +224,16 @@
             ids = [ids]
         projects = self.browse(cr, uid, ids, context=context)
         result = self._schedule_header(cr, uid, ids, context=context)
+        do_schedule = False
         for project in projects:
-            result += self._schedule_project(cr, uid, project, context=context)
-            result += self.pool.get('project.phase').generate_phase(cr, uid, project.phase_ids, context=context)
+            if len(project.phase_ids) > 0:
+                result += self._schedule_project(cr, uid, project, context=context)
+                result += self.pool.get('project.phase').generate_phase(cr, uid, project.phase_ids, context=context)
+                do_schedule = True
+
+        if not do_schedule:
+            # Nothing to do here
+            return True
 
         local_dict = {}
         exec result in local_dict
@@ -256,6 +263,21 @@
                     'date_start': p.start.strftime('%Y-%m-%d %H:%M:%S'),
                     'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S')
                 }, context=context)
+
+                # Schedule sub-tasks
+                for task in phase.task_ids:
+                    if task.state in ('done','cancelled'):
+                        continue
+
+                    t = getattr(p, 'Task_%d' % (task.id,))
+                    self.pool.get('project.task').write(cr, uid, [task.id], {
+                        'date_start': t.start.strftime('%Y-%m-%d %H:%M:%S'),
+                        'date_end': t.end.strftime('%Y-%m-%d %H:%M:%S'),
+                    }, context=context)
+                    if (not task.user_id) and (t.booked_resource):
+                        self.pool.get('project.task').write(cr, uid, [task.id], {
+                            'user_id': int(t.booked_resource[0].name[5:]),
+                        }, context=context)
         return True
 project()
 

=== modified file 'resource/faces/pcalendar.py'
--- resource/faces/pcalendar.py	2011-12-19 16:54:40 +0000
+++ resource/faces/pcalendar.py	2012-03-06 23:39:19 +0000
@@ -895,7 +895,16 @@
     def _recalc_working_time(self):
         def slot_sum_time(day):
             slots = self.working_times.get(day, DEFAULT_WORKING_DAYS[day])
-            return sum(map(lambda slot: slot[1] - slot[0], slots))
+            def time_diff(times):
+                (start, end) = times
+                if end == start:
+                    return 24*60    # 24 hours
+
+                diff = end - start
+                if end < start:
+                    diff += (24*60)
+                return diff
+            return sum(map(time_diff, slots))
 
         self.day_times = map(slot_sum_time, range(0, 7))
         self.week_time = sum(self.day_times)

=== modified file 'resource/resource.py'
--- resource/resource.py	2011-12-21 12:37:24 +0000
+++ resource/resource.py	2012-03-06 23:39:19 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, time, date
 import math
 from faces import *
 from osv import fields, osv
@@ -28,6 +28,7 @@
 from itertools import groupby
 from operator import itemgetter
 
+import pytz
 
 class resource_calendar(osv.osv):
     _name = "resource.calendar"
@@ -279,8 +280,9 @@
     hour_part = split_list[0]
     mins_part = split_list[1]
     round_mins = int(round(float(mins_part) * 60,-2))
-    converted_string = hour_part + ':' + str(round_mins)[0:2]
-    return converted_string
+    return time(int(hour_part), round_mins)
+    #converted_string = hour_part + ':' + str(round_mins)[0:2]
+    #return converted_string
 
 class resource_resource(osv.osv):
     _name = "resource.resource"
@@ -366,51 +368,102 @@
         Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
         @param calendar_id : working calendar of the project
         """
+        tz = pytz.utc
+        if context and ('tz' in context):
+            tz = pytz.timezone(context['tz'])
+
+        wktime_local = None
+        week_days = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
         if not calendar_id:
-            # Calendar is not specified: working days: 24/7
-            return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'), 
-                   ('mon', '8:0-12:0','13:0-17:0'), ('tue', '8:0-12:0','13:0-17:0')]
-        resource_attendance_pool = self.pool.get('resource.calendar.attendance')
-        time_range = "8:00-8:00"
-        non_working = ""
-        week_days = {"0": "mon", "1": "tue", "2": "wed","3": "thu", "4": "fri", "5": "sat", "6": "sun"}
-        wk_days = {}
-        wk_time = {}
-        wktime_list = []
+            # Calendar is not specified: working days: some sane default
+            wktime_local = [
+                (0,     time(8,0),     time(12,0)),
+                (0,     time(13,0),    time(17,0)),
+                (1,     time(8,0),     time(12,0)),
+                (1,     time(13,0),    time(17,0)),
+                (2,     time(8,0),     time(12,0)),
+                (2,     time(13,0),    time(17,0)),
+                (3,     time(8,0),     time(12,0)),
+                (3,     time(13,0),    time(17,0)),
+                (4,     time(8,0),     time(12,0)),
+                (4,     time(13,0),    time(17,0)),
+            ]
+            #return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'), 
+            #       ('mon', '8:0-12:0','13:0-17:0'), ('tue', '8:0-12:0','13:0-17:0')]
+        else:
+            resource_attendance_pool = self.pool.get('resource.calendar.attendance')
+            non_working = ""
+            wktime_local = []
+
+            week_ids = resource_attendance_pool.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
+            weeks = resource_attendance_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
+            # Convert time formats into appropriate format required
+            # and create lists inside wktime_local.
+            for week in weeks:
+                res_str = ""
+                day = None
+                if week['dayofweek']:
+                    day = int(week['dayofweek'])
+                else:
+                    raise osv.except_osv(_('Configuration Error!'),_('Make sure the Working time has been configured with proper week days!'))
+                hour_from = convert_timeformat(week['hour_from'])
+                hour_to = convert_timeformat(week['hour_to'])
+                wktime_local.append((day, hour_from, hour_to))
+
+        # We now have working hours _in local time_.  Non-working days are an
+        # empty list, while working days are a list of tuples, consisting of a
+        # start time and an end time.  We will convert these to UTC for time
+        # calculation purposes.
+
+        # We need to get this into a dict
+        # which will be in the following format:
+        #   {   'day':  [(time(9,0), time(17,0)), ...], ... }
+        wktime_utc = {}
+
+        # NOTE: This may break with regards to DST!
+        for (day, start, end) in wktime_local:
+            # Convert start time to UTC
+            start_dt_local = datetime.combine(date.today(), start.replace(tzinfo=tz))
+            start_dt_utc = start_dt_local.astimezone(pytz.utc)
+            start_dt_day = (day + (start_dt_utc.date() - start_dt_local.date()).days) % 7
+
+            # Convert end time to UTC
+            end_dt_local = datetime.combine(date.today(), end.replace(tzinfo=tz))
+            end_dt_utc = end_dt_local.astimezone(pytz.utc)
+            end_dt_day = (day + (end_dt_utc.date() - end_dt_local.date()).days) % 7
+
+            # Are start and end still on the same day?
+            if start_dt_day == end_dt_day:
+                day_name = week_days[start_dt_day]
+                if day_name not in wktime_utc:
+                    wktime_utc[day_name] = []
+                wktime_utc[day_name].append((start_dt_utc.time(), end_dt_utc.time()))
+            else:
+                day_start_name = week_days[start_dt_day]
+                if day_start_name not in wktime_utc:
+                    wktime_utc[day_start_name] = []
+                # We go until midnight that day
+                wktime_utc[day_start_name].append((start_dt_utc.time(), time(0,0)))
+
+                day_end_name = week_days[end_dt_day]
+                if day_end_name not in wktime_utc:
+                    wktime_utc[day_end_name] = []
+                # Then resume from midnight that day
+                wktime_utc[day_end_name].append((time(0,0), end_dt_utc.time()))
+
+        # Now having gotten a list of times together, generate the final output
         wktime_cal = []
-        week_ids = resource_attendance_pool.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
-        weeks = resource_attendance_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
-        # Convert time formats into appropriate format required
-        # and create a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
-        for week in weeks:
-            res_str = ""
-            day = None
-            if week_days.get(week['dayofweek'],False):
-                day = week_days[week['dayofweek']]
-                wk_days[week['dayofweek']] = week_days[week['dayofweek']]
-            else:
-                raise osv.except_osv(_('Configuration Error!'),_('Make sure the Working time has been configured with proper week days!'))
-            hour_from_str = convert_timeformat(week['hour_from'])
-            hour_to_str = convert_timeformat(week['hour_to'])
-            res_str = hour_from_str + '-' + hour_to_str
-            wktime_list.append((day, res_str))
-        # Convert into format like [('mon', '8:00-12:00', '13:00-18:00')]
-        for item in wktime_list:
-            if wk_time.has_key(item[0]):
-                wk_time[item[0]].append(item[1])
-            else:
-                wk_time[item[0]] = [item[0]]
-                wk_time[item[0]].append(item[1])
-        for k,v in wk_time.items():
-            wktime_cal.append(tuple(v))
-        # Add for the non-working days like: [('sat, sun', '8:00-8:00')]
-        for k, v in wk_days.items():
-            if week_days.has_key(k):
-                week_days.pop(k)
-        for v in week_days.itervalues():
-            non_working += v + ','
-        if non_working:
-            wktime_cal.append((non_working[:-1], time_range))
+        for day, times in wktime_utc.iteritems():
+            # Sort the times
+            times.sort()
+            wktime = ['{0}-{1}'.format(s.strftime('%H:%M'), e.strftime('%H:%M')) for (s, e) in times]
+            wktime.insert(0, day)
+            wktime_cal.append(tuple(wktime))
+        # Finally, add in non-working days
+        for day in week_days:
+            if day not in wktime_utc:
+                wktime_cal.append((day, None))
+
         return wktime_cal
 
 resource_resource()