Odoo Server (MOVED TO GITHUB)

Merge lp://qastaging/~carlos-realsystems/openobject-server/trunk-bugfix-954189 into lp://qastaging/openobject-server

trunk-bugfix-954189
Merge into trunk

Proposed by Carlos Contreras on 2012-10-04

Status:

Rejected

Rejected by:

Fabien (Open ERP) on 2012-10-17

Proposed branch:

lp://qastaging/~carlos-realsystems/openobject-server/trunk-bugfix-954189

Merge into:

lp://qastaging/openobject-server

Diff against target:

4988936 lines (has conflicts)

Conflict adding file .bzrignore.  Moved existing file to .bzrignore.moved.

To merge this branch:

bzr merge lp://qastaging/~carlos-realsystems/openobject-server/trunk-bugfix-954189

Medium

Fix Committed

Link a bug report

Reviewer	Date Requested	Status
Lorenzo Battistini (community)		Needs Fixing on 2012-10-08
OpenERP Core Team	2012-10-04	Pending
Review via email: mp+127963@code.qastaging.launchpad.net

Commit message

[FIX] Solves the problem that when you make an purchase order select create and then create an purchase order line.
When you select a product in purchase orders got allways "Selected UOM does not belong to the same category as the product UOM " but the UOM are the same

This error rises because uom_id always have a default UoM PCE and never gets true.

Description of the change

Error #954189:

In 6.1 i have the Problem that when i make an purchase order select create and then create an purchase order line.

When i select then a product i got allways "Selected UOM does not belong to the same category as the product UOM "
but the UOM are the same ?

This error rises because uom_id always have a default UoM PCE and never gets true on line 765:

- if not uom_id:
- uom_id = product_uom_po_id

It solves adding one condition and it doesnt cause harm:

+ if not uom_id or uom_id != product_uom_po_id:
+ uom_id = product_uom_po_id

Revision history for this message

Lorenzo Battistini (elbati) wrote on 2012-10-08:

Hello Carlos, proposal has conflicts.

review: Needs Fixing

Revision history for this message

Lorenzo Battistini (elbati) wrote on 2012-10-09:

On 10/08/2012 07:48 PM, Carlos Enrique Contreras Vara wrote:
> Dear Lorenzo
>
> How can I do a merge correctly without conflicts because its only one
> line o code of purchase/purchase.py that has been modified.
>

You changed a file from openobject-addons/6.1 branch and proposed to
merge it into openobject-server/trunk.

You should put your branch under the openobject-addons project
(something like
lp:~carlos-realsystems/openobject-addons/6.1-bugfix-954189) and propose
to merge into openobject-addons/6.1 branch.

Regards

--
Lorenzo Battistini <email address hidden>
Via Brüsighell - 6807 - Taverne - Switzerland
Agile Business Group sagl http://www.agilebg.com