lp:~openerp-dev/openobject-addons/6.1-opw-584402-han

Branch merges

Propose for merging

No branches dependent on this one.

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

Naresh(OpenERP): Pending requested 2013-04-02

Diff: 57 lines (+23/-17)

1 file modified

mrp/mrp.py (+23/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

7170. By Hardik Ansodariya (OpenERP) on 2013-04-02

[FIXED] mrp: Fixed the issue of duplicating product to consume, if related picking list is canceled and recreated from MO

7169. By Xavier ALT on 2013-02-28

[MERGE] OPW 584776: hr_timesheet_invoice: use right product for invoice taxes when forced for analytic lines to invoice

7168. By Xavier ALT on 2013-02-28

[MERGE] OPW 585231: edi: wait longer for parent transaction to complete

  Wait for parent transaction to complete by watching if it's parent cursor
  has been closed or not. For batch transaction (ex: confirming 50 invoices
  at once using 'Confirm Draft Invoices' wizard) that might take longer
  that 3 seconds! and we end up sending edi mail with old record values.

7167. By Launchpad Translations on behalf of openerp on 2013-02-28

Launchpad automatic translations update.

7166. By Xavier ALT on 2013-02-27

[MERGE] OPW 583906: account: remove unused account balance landscape report

  backport of v7.0 addons revision-id: <email address hidden>

7165. By Xavier ALT on 2013-02-27

[MERGE] OPW 583541: point_of_sale: computing product taxes should only considere taxes from current order's company

  In a multi-company setup, if POS session is started on the main company and product have multiple taxes
  (from current and child companies), tax computation should only consider current order's company taxes

  backport of v7.0 addons revid: <email address hidden>

7164. By Xavier ALT on 2013-02-27

[MERGE] 574785: stock: fix 'Upstream Traceability' shown as 'Downstream...'

7163. By Xavier ALT on 2013-02-27

[MERGE] OPW 583829: procurement: do not duplicate procurement related to stock.move on stock.picking duplication

  forward-port of v6.0 addons revid: <email address hidden>

7162. By Launchpad Translations on behalf of openerp on 2013-02-27

Launchpad automatic translations update.

7161. By Launchpad Translations on behalf of openerp on 2013-02-26

Launchpad automatic translations update.