Thibault Delavallée 5d59401b91 [MERGE] Sync with trunk, tried to resolve the conflicts without breakign everything. ...

bzr revid: tde@openerp.com-20130315120759-sf1o1sd80ycuuy7n

2013-03-15 13:07:59 +01:00

..

__init__.py

…

purchase_order_action_data.xml

[MERGE] Sync with trunk, tried to resolve the conflicts without breakign everything.

2013-03-15 13:07:59 +01:00

purchase_order.py

[IMP] use the openerp namespace.

2012-12-06 15:56:32 +01:00