lp:~openerp-dev/openobject-addons/7.0-591589-opw-skh

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons/7.0

OpenERP Core Team: Pending requested 2013-09-04

Diff: 13 lines (+3/-0)

1 file modified

hr_timesheet/hr_timesheet.py (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1220665: [7.0] hr_timesheet - amount on timesheet line not calculated as per as the cost price of the product

Medium

Confirmed

Link a bug report

Related blueprints

9089. By Somesh Khare(OpenERP) <email address hidden> on 2013-04-30

[FIX]hr_timesheet: amount on timesheet line not calculated as per as the cost price of the product (Case: ref 591589)

9088. By Thibault Delavallée (OpenERP) on 2013-04-30

[MERGE] [FIX] mail: fixed a change introduced at revision 9080 that introduced a dependance between a revision in web and in addons: now addons revision is independant of the web revision.

9087. By Launchpad Translations on behalf of openerp on 2013-04-30

Launchpad automatic translations update.

9086. By Denis Ledoux (OpenERP) on 2013-04-29

[FIX]plugin: plugin_handler, push_message, if model is res.partner then we set the type to 'comment' instead of 'email' to avoid the behaviour in mail/res_partner.py message_post

9085. By Olivier Dony (Odoo) on 2013-04-29

[FIX] sale: safer inheritance of res.partner form view + no hiding of use_parent_address field

The use_parent_address field is not directly related to the
address type field and was not really meant to be hidden
along with it.

In addition, the div[@name=div_type] and the corresponding
label[@for=type] were duplicated in the embedded form view
inside the `child_ids` field, but that happened later in
the 7.0 series. As a consequence the inherited view must
not rely on the presence of the latter, since some users
may install sales on top of an older version of the base
views. The XPath expressions were therefore modified to
match the first occurrence of these elements in the original
res.partner view, and to match *only* the second occurrence
in the new version of the view.
This works via a dirty hack relying on the fact that
the `use_parent_address` field is present in the first
occurrence of the div in the original view, but not
in the newer view, so the XPath expression can be made
to match only *one* element in each version of the view.
(Keep in mind that XPath evaluation will always return
results in the order of the document being looked up,
and the ORM only uses the first match. So matching
both nodes was not an option.)

9084. By Launchpad Translations on behalf of openerp on 2013-04-29

Launchpad automatic translations update.

9083. By Launchpad Translations on behalf of openerp on 2013-04-28

Launchpad automatic translations update.

9082. By Launchpad Translations on behalf of openerp on 2013-04-27

Launchpad automatic translations update.

9081. By Olivier Dony (Odoo) on 2013-04-26

[FIX] base_report_designer: more incorrect license headers in some source files, reported and contributed by Alec Leamas

Mixing LGPL 2.1 and AGPL 3.0 in the same source file
is incorrect, and the AGPLv3 license was added by
mistake: keep only LGPL license and preserve
copypright info.

9080. By Thibault Delavallée (OpenERP) on 2013-04-26

[FIX] Fix needaction counters, now updated dynamically.
Added a needaction_menu_ref key in the context of some actions to
automatically reload the counter of menus related to an action.
Various mailboxes are now dynamic.
Reading messages now increase/decrease the needaction counters with the
corect number.
Added a missing message_unread filter on My Tasks in project_gtd.