Merge lp:~vrt-openerp/openobject-addons/vrt-openerp into lp:openobject-addons
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~vrt-openerp/openobject-addons/vrt-openerp | ||||
Merge into: | lp:openobject-addons | ||||
Diff against target: |
517 lines (+241/-55) 8 files modified
crm/report/crm_lead_report.py (+4/-0) crm/report/crm_lead_report_view.xml (+93/-3) hr_timesheet_sheet/hr_timesheet_sheet_view.xml (+1/-1) project/project.py (+7/-2) project/project_view.xml (+3/-0) project_long_term/project_long_term.py (+24/-2) resource/faces/pcalendar.py (+10/-1) resource/resource.py (+99/-46) |
||||
To merge this branch: | bzr merge lp:~vrt-openerp/openobject-addons/vrt-openerp | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Olivier Dony (Odoo) | branch content | Needs Resubmitting | |
Review via email:
|
This proposal has been superseded by a proposal from 2012-03-23.
Description of the change
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)
Unmerged revisions
- 6677. By Stuart Longland
-
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
-
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
-
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
-
Rewrite and Merge with upstream changes.
- 6673. By Stuart Longland
-
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
-
Rewrite and Merge with upstream changes.
- 6671. By Stuart Longland
-
Rewrite and Merge with upstream changes.
- 6670. By Stuart Longland
-
Rewrite and Merge with upstream changes.
- 6669. By Stuart Longland
-
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
-
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 datetimedef Project():
resulting in the following stack trace:
[2012-02-17 02:07:29,
630][developmen t61] 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 blockThis 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.
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