lp:~openerp-dev/openobject-addons/trunk-bug-1186938-jpr

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2013-11-26

Diff: 14 lines (+4/-1)

1 file modified

sale_margin/sale_margin.py (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1186938: Sales margin calculation need to consider uom in sales line

Low

Fix Committed

Link a bug report

Related blueprints

8993. By Arif (arifmlpm) on 2013-11-26

[FIX]consider uom in sales line

8992. By Christophe Simonis (OpenERP) on 2013-11-25

[MERGE] forward port of branch saas-2 up to revid 9010 <email address hidden>

8991. By Thibault Delavallée (OpenERP) on 2013-11-25

[MERGE] [IMP] chatter: improved 'Log a note'
- the button is now only displayed for employee users. This is done
by overriding the fields_view_get in mail.thread and adding options
to the widget according to the groups the user belongs to. Indeed
it is currently not possible to set widget options specific to
some groups. Therefore an override of fields view get was
necessary.
- small layout improvements: Log a note -> Log an internal note,
background color of notes updated.

8990. By Thibault Delavallée (OpenERP) on 2013-11-25

[MERGE] [IMP] mail: invite wizard: the option of sending an email when inviting someone
is now checked by default.

8989. By Thibault Delavallée (OpenERP) on 2013-11-25

[MERGE] [IMP] Addons: updated some field labels to avoid duplicates to ease
the import / export process

Aso includes
- project: deprecated priority field: use sequence instead
- base_calendar: calendar.event: deprecated organizer field: use organize_id instead

8988. By Launchpad Translations on behalf of openerp on 2013-11-25

Launchpad automatic translations update.

8987. By Martin Trigaux (OpenERP) on 2013-11-21

[FIX] project_issue: remove test checking the convert_issue_task feature

8986. By Martin Trigaux (OpenERP) on 2013-11-21

[REF] procurement: remove legacy code in scheduler from 6.1

8985. By Martin Trigaux (OpenERP) on 2013-11-21

[ADD] procurement: add skip_exception parameter on scheduler allowing to have more frequent scheduler only testing confirmed picking

8984. By Martin Trigaux (OpenERP) on 2013-11-21

[REF] project_issue: remove unused method convert issue to task (button was removed from view at rev 6898)