Merge lp:~invitu/openobject-addons/7.0-fix-1179307-1179305 into lp:openobject-addons/7.0
Status: | Needs review |
---|---|
Proposed branch: | lp:~invitu/openobject-addons/7.0-fix-1179307-1179305 |
Merge into: | lp:openobject-addons/7.0 |
Diff against target: |
222 lines (+44/-22) 12 files modified
account/account.py (+8/-2) account/account_invoice.py (+5/-3) crm/crm_lead_view.xml (+4/-0) crm/report/crm_phonecall_report.py (+2/-0) crm/report/crm_phonecall_report_view.xml (+2/-0) email_template/res_partner.py (+1/-1) hr_payroll/hr_payroll.py (+1/-1) mail/res_partner.py (+1/-1) mrp/mrp_view.xml (+0/-1) project_timesheet/project_timesheet.py (+3/-1) report_webkit/__openerp__.py (+3/-2) stock/stock_view.xml (+14/-10) |
To merge this branch: | bzr merge lp:~invitu/openobject-addons/7.0-fix-1179307-1179305 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stefan Rijnhart (Opener) (community) | Needs Resubmitting | ||
OpenERP Core Team | Pending | ||
Review via email: mp+165790@code.launchpad.net |
Description of the change
[IMP] lp:1179307-[7.0:addons/crm] add lead group in phonecall reporting
[FIX] lp:1179305-[7.0:addons/crm] Fix direct link to phonecalls and meetings in lead view
Unmerged revisions
- 9178. By invitu
-
[IMP] lp:1179307-[7.0:addons/crm] add lead group in phonecall reporting
[FIX] lp:1179305-[7.0:addons/crm] Fix direct link to phonecalls and meetings in lead view - 9177. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 9176. By Thibault Delavallée (OpenERP)
-
[FIX] Chatter: fixed suggested recipients, when having no email, unchecking the box was not taken into account.
- 9175. By Thibault Delavallée (OpenERP)
-
[FIX] project_issue: fixed access rights issues when truing to find suggested partners.
- 9174. By Martin Trigaux (OpenERP)
-
[IMP] hr_timesheet_sheet: dispay timesheets as time_float instead of float
- 9173. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 9172. By Martin Trigaux (OpenERP)
-
[MERGE] [FIX] account_followup: remove create button in report
- 9171. By Martin Trigaux (OpenERP)
-
[MERGE] [FIX] res partner copy method returns None
- 9170. By Quentin (OpenERP) <email address hidden>
-
[FIX] account: divide the residual amount of invoices proportionally to the number of invoices partially reconciled together if needed + if necessary, do a conversion at the right currency rate
- 9169. By Quentin (OpenERP) <email address hidden>
-
[FIX] account: exclude company_id from build_ctx_
periods( )'s criteria to allow printing consolidated reports
merge proposal comes from ocb-addons branch