Merge lp:~camptocamp/openerp-humanitarian-ngo/ngo-addons-add_other_procurement_method-nbi into lp:~humanitarian-core-editors/openerp-humanitarian-ngo/ngo-addons

[Nicolas Bessi - Camptocamp]

[ADD] support of "other" sourcing method.
Allows to create a call for bid or an agreement purchase order from many source lines including service source lines.

[Add] multi-currency:

Allows to have a currency (pricelist) defined in on logisitc request and have sourcing process (call for bid or agreement PO) in an other currency.

[IMP] separate budget in an external module

[ADD] support of "other" sourcing method.
Allows to create a call for bid or an agreement purchase order from many source lines including service source lines.

[Add] multi-currency:

Allows to have a currency (pricelist) defined in on logisitc request and have sourcing process (call for bid or agreement PO) in an other currency.

[IMP] separate budget in an external module

Depends on https://code.launchpad.net/~camptocamp/openerp-humanitarian-ngo/ngo-addons-add_agreement_sourcing-nbi/+merge/196676

[lp:~camptocamp/openerp-humanitarian-ngo/ngo-addons-add_other_procurement_method-nbi]

190. By Nicolas Bessi - Camptocamp on 2014-03-24

[IMP] when a agreement purchase requisition is chosen, all non selected PO are passed to the state cancel.
This mimic the flow of a standrad purchase requisiton

191. By Nicolas Bessi - Camptocamp on 2014-03-24

[MRG] from head

192. By Nicolas Bessi - Camptocamp on 2014-04-04

[FIX] manually created PO confirmation if no procurement is present

193. By Nicolas Bessi - Camptocamp on 2014-05-01

[TYPO]

194. By Nicolas Bessi - Camptocamp on 2014-05-01

[TYPO]

195. By Nicolas Bessi - Camptocamp on 2014-05-07

[FIX] logisitic_request tests product procure method as to be make_to_order in order to have sale.order.line type set correctly

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM, thanks a lot

review: Approve (code review, no tests)

=== modified file 'framework_agreement_requisition/model/purchase.py'
--- framework_agreement_requisition/model/purchase.py	2014-01-17 14:59:31 +0000
+++ framework_agreement_requisition/model/purchase.py	2014-05-07 09:53:02 +0000
@@ -87,6 +87,7 @@
         vals['supplier_id'] = po_line.order_id.partner_id.id
         vals['product_id'] = po_line.product_id.id
         vals['quantity'] = po_line.product_qty
+        vals['delay'] = po_line.product_lead_time
         vals['origin'] = origin if origin else False
         return vals
 

=== modified file 'framework_agreement_requisition/model/purchase_requisition.py'
--- framework_agreement_requisition/model/purchase_requisition.py	2014-01-17 14:59:31 +0000
+++ framework_agreement_requisition/model/purchase_requisition.py	2014-05-07 09:53:02 +0000
@@ -62,10 +62,11 @@
         return wf_service.trg_validate(uid, 'purchase.requisition',
                                        agr_id, 'select_agreement', cr)
 
-    def agreement_selected(self, cr, uid, ids, context=None):
+    def _agreement_selected(self, cr, uid, ids, context=None):
         """Tells tender that an agreement has been selected"""
         if isinstance(ids, (int, long)):
             ids = [ids]
+        generated = []
         for req in self.browse(cr, uid, ids, context=context):
             if not req.framework_agreement_tender:
                 raise orm.except_orm(_('Invalid tender'),
@@ -73,21 +74,47 @@
             self.select_agreement(cr, uid, req.id, context=context)
             req.refresh()
             if req.state != AGR_SELECT:
-                raise RuntimeError('requisiton %s does not pass to state'
+                raise RuntimeError('requisition %s does not pass to state'
                                    ' agreement_selected' %
                                    req.name)
             rfqs = chain.from_iterable(req_line.purchase_line_ids
                                        for req_line in req.line_ids)
-            rfqs = [rfq for rfq in rfqs if rfq.state == 'confirmed']
-            if not rfqs:
+            po_to_select = []
+            po_to_cancel = []
+            for rfq in rfqs:
+                if rfq.state == 'confirmed':
+                    agr_record = rfq.make_agreement(req.name)
+                    generated.append(agr_record)
+                    po_to_select.append(rfq.order_id)
+                else:
+                    po_to_cancel.append(rfq.order_id)
+
+            if not po_to_select:
                 raise orm.except_orm(_('No confirmed RFQ related to tender'),
                                      _('Please choose at least one'))
-            for rfq in rfqs:
-                rfq.make_agreement(req.name)
-                p_order = rfq.order_id
+
+            for p_order in set(po_to_select):
                 p_order.select_agreement()
                 p_order.refresh()
                 if p_order.state != PO_AGR_SELECT:
-                    raise RuntimeError('Purchase order %s does not pass to %' %
+                    raise RuntimeError('Purchase order %s does not pass to %s' %
                                        (p_order.name, PO_AGR_SELECT))
-        return True
+            wf_service = netsvc.LocalService("workflow")
+            for p_order in set(po_to_cancel):
+                wf_service.trg_validate(uid, 'purchase.order', p_order.id,
+                                        'purchase_cancel', cr)
+        return generated
+
+    def agreement_selected(self, cr, uid, ids, context=None):
+        agrements = self._agreement_selected(cr, uid, ids, context=context)
+        a_ids = [x.id for x in agrements]
+        return {
+            'name': _('Generated Agreements'),
+            'view_mode': 'tree,form',
+            'res_model': 'framework.agreement',
+            'domain': [('id', 'in', a_ids)],
+            'target': 'current',
+            'view_id': False,
+            'context': {},
+            'type': 'ir.actions.act_window',
+        }

=== modified file 'framework_agreement_sourcing/__init__.py'
--- framework_agreement_sourcing/__init__.py	2013-10-25 11:10:32 +0000
+++ framework_agreement_sourcing/__init__.py	2014-05-07 09:53:02 +0000
@@ -19,3 +19,4 @@
 #
 ##############################################################################
 from . import model
+from . import wizard

=== modified file 'framework_agreement_sourcing/__openerp__.py'
--- framework_agreement_sourcing/__openerp__.py	2014-01-17 13:43:36 +0000
+++ framework_agreement_sourcing/__openerp__.py	2014-05-07 09:53:02 +0000
@@ -37,15 +37,26 @@
 In this case tender flow is byassed and confirmed PO will be generated
 when logistic requisition is confirmed.
 
-By default the sourcing process will look in all agreements for a product
-and use them one after the other as long as possible sorted by price.
+When confirming Logistic request sourcing lines are generating.
+Generation process will look up all agreements with remaining quantity
+and use them one after the other.
+
+We will first choose cheapest agreements with price in negociated currency even
+if they are cheaper in other currences.
+
+Then we will choose remaining agreements ordered
+by price converted in company currency.
 
 You can prevent this behavior by forcing only one agreement per product at
 the same time in company.
 
 """,
  'website': 'http://www.camptocamp.com',
- 'data': ['view/requisition_view.xml'],
+ 'data': [
+    'view/requisition_view.xml',
+    'wizard/logistic_requisition_source_create_po_view.xml',
+    'security/ir.model.access.csv'
+ ],
  'demo': [],
  'test': [],
  'installable': True,

=== added file 'framework_agreement_sourcing/i18n/en_US.po'
--- framework_agreement_sourcing/i18n/en_US.po	1970-01-01 00:00:00 +0000
+++ framework_agreement_sourcing/i18n/en_US.po	2014-05-07 09:53:02 +0000
@@ -0,0 +1,220 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* framework_agreement_sourcing
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-04 10:39+0000\n"
+"PO-Revision-Date: 2014-02-04 10:39+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:72
+#, python-format
+msgid "Please cancel uneeded one"
+msgstr "Please cancel uneeded one"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_cost_estimate.py:64
+#, python-format
+msgid "Please add one"
+msgstr "Please add one"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:240
+#, python-format
+msgid "Source line must be of type other or agreement"
+msgstr "Source line must be of type other or agreement"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_cost_estimate.py:63
+#, python-format
+msgid "No stockable product in related PO"
+msgstr "No stockable product in related PO"
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_source_create_agr_po
+msgid "logistic.requisition.source.create.agr.po"
+msgstr "logistic.requisition.source.create.agr.po"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "Which pricelist / currency you want ?"
+msgstr "Which pricelist / currency you want ?"
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_line
+msgid "Logistic Requisition Line"
+msgstr "Logistic Requisition Line"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source:0
+msgid "{'invisible': [('procurement_method', '=', 'fw_agreement')]}"
+msgstr "{'invisible': [('procurement_method', '=', 'fw_agreement')]}"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source:0
+msgid "onchange_sourcing_method(procurement_method, requisition_line_id, proposed_product_id, proposed_qty)"
+msgstr "onchange_sourcing_method(procurement_method, requisition_line_id, proposed_product_id, proposed_qty)"
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_cost_estimate
+msgid "Create cost estimate of logistic requisition lines"
+msgstr "Create cost estimate of logistic requisition lines"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:71
+#, python-format
+msgid "Many Purchase order lines found for %s"
+msgstr "Many Purchase order lines found for %s"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:241
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:246
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:249
+#, python-format
+msgid "Please correct selection"
+msgstr "Please correct selection"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:248
+#, python-format
+msgid "There should be at least one agreement line"
+msgstr "There should be at least one agreement line"
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source,framework_agreement_id:0
+msgid "Agreement"
+msgstr "Agreement"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:245
+#, python-format
+msgid "There should be only one agreement line"
+msgstr "There should be only one agreement line"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/wizard/logistic_requisition_source_create_po.py:85
+#, python-format
+msgid "User Error"
+msgstr "User Error"
+
+#. module: framework_agreement_sourcing
+#: model:ir.actions.act_window,name:framework_agreement_sourcing.action_view_create_agr_po_from_source
+msgid "Create Agreement Purchase Order"
+msgstr "Create Agreement Purchase Order"
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source.create.agr.po,pricelist_id:0
+msgid "Pricelist / Currency"
+msgstr "Pricelist / Currency"
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source.create.agr.po,framework_currency_ids:0
+msgid "Available Currency"
+msgstr "Available Currency"
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source,supplier_id:0
+msgid "Agreement Supplier"
+msgstr "Agreement Supplier"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "                            Please note that: \n"
+" \n"
+"                            Requisition will only be created if: \n"
+"                            * Lines belong to the same company \n"
+"                            * There is only one agreement line in selection \n"
+"                            * Products are define on all selected lines \n"
+"                            * Non agreement line are of type other \n"
+"                            \n"
+" \n"
+"                            "
+msgstr "                            Please note that: \n"
+" \n"
+"                            Requisition will only be created if: \n"
+"                            * Lines belong to the same company \n"
+"                            * There is only one agreement line in selection \n"
+"                            * Products are define on all selected lines \n"
+"                            * Non agreement line are of type other \n"
+"                            \n"
+" \n"
+"                            "
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_purchase_order
+msgid "Purchase Order"
+msgstr "Purchase Order"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:327
+#, python-format
+msgid "You have ask for a quantity of %s \n"
+" but there is only %s available for current agreement"
+msgstr "You have ask for a quantity of %s \n"
+" but there is only %s available for current agreement"
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_source
+msgid "Logistic Requisition Source"
+msgstr "Logistic Requisition Source"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "You can only chose a pricelist with a currency that is included             in the framewrok agreement you have chosen."
+msgstr "You can only chose a pricelist with a currency that is included             in the framewrok agreement you have chosen."
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source:0
+msgid "onchange_quantity(procurement_method, requisition_line_id, proposed_qty, proposed_product_id)"
+msgstr "onchange_quantity(procurement_method, requisition_line_id, proposed_qty, proposed_product_id)"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "Create Purchase Order"
+msgstr "Create Purchase Order"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/wizard/logistic_requisition_source_create_po.py:85
+#, python-format
+msgid "You must chose a pricelist that is in the same currency than one of the available in the framework agreement."
+msgstr "You must chose a pricelist that is in the same currency than one of the available in the framework agreement."
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source,framework_agreement_po_id:0
+msgid "Agreement Purchase"
+msgstr "Agreement Purchase"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source:0
+msgid "onchange_product_id(procurement_method, requisition_line_id, proposed_product_id, proposed_qty)"
+msgstr "onchange_product_id(procurement_method, requisition_line_id, proposed_product_id, proposed_qty)"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "Are you sure you want to create a Purchase Order from those lines ?"
+msgstr "Are you sure you want to create a Purchase Order from those lines ?"
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "or"
+msgstr "or"
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Sales Order Line"
+

=== added file 'framework_agreement_sourcing/i18n/framework_agreement_sourcing.pot'
--- framework_agreement_sourcing/i18n/framework_agreement_sourcing.pot	1970-01-01 00:00:00 +0000
+++ framework_agreement_sourcing/i18n/framework_agreement_sourcing.pot	2014-05-07 09:53:02 +0000
@@ -0,0 +1,209 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#       * framework_agreement_sourcing
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-04 10:37+0000\n"
+"PO-Revision-Date: 2014-02-04 10:37+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:72
+#, python-format
+msgid "Please cancel uneeded one"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_cost_estimate.py:64
+#, python-format
+msgid "Please add one"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:240
+#, python-format
+msgid "Source line must be of type other or agreement"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_cost_estimate.py:63
+#, python-format
+msgid "No stockable product in related PO"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_source_create_agr_po
+msgid "logistic.requisition.source.create.agr.po"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "Which pricelist / currency you want ?"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_line
+msgid "Logistic Requisition Line"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source:0
+msgid "{'invisible': [('procurement_method', '=', 'fw_agreement')]}"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source:0
+msgid "onchange_sourcing_method(procurement_method, requisition_line_id, proposed_product_id, proposed_qty)"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_cost_estimate
+msgid "Create cost estimate of logistic requisition lines"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:71
+#, python-format
+msgid "Many Purchase order lines found for %s"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:241
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:246
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:249
+#, python-format
+msgid "Please correct selection"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:248
+#, python-format
+msgid "There should be at least one agreement line"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source,framework_agreement_id:0
+msgid "Agreement"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:245
+#, python-format
+msgid "There should be only one agreement line"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/wizard/logistic_requisition_source_create_po.py:85
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: model:ir.actions.act_window,name:framework_agreement_sourcing.action_view_create_agr_po_from_source
+msgid "Create Agreement Purchase Order"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source.create.agr.po,pricelist_id:0
+msgid "Pricelist / Currency"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source.create.agr.po,framework_currency_ids:0
+msgid "Available Currency"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source,supplier_id:0
+msgid "Agreement Supplier"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "                            Please note that: \n"
+" \n"
+"                            Requisition will only be created if: \n"
+"                            * Lines belong to the same company \n"
+"                            * There is only one agreement line in selection \n"
+"                            * Products are define on all selected lines \n"
+"                            * Non agreement line are of type other \n"
+"                            \n"
+" \n"
+"                            "
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/model/logistic_requisition_source.py:327
+#, python-format
+msgid "You have ask for a quantity of %s \n"
+" but there is only %s available for current agreement"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_logistic_requisition_source
+msgid "Logistic Requisition Source"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "You can only chose a pricelist with a currency that is included             in the framewrok agreement you have chosen."
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source:0
+msgid "onchange_quantity(procurement_method, requisition_line_id, proposed_qty, proposed_product_id)"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "Create Purchase Order"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: code:addons/framework_agreement_sourcing/wizard/logistic_requisition_source_create_po.py:85
+#, python-format
+msgid "You must chose a pricelist that is in the same currency than one of the available in the framework agreement."
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: field:logistic.requisition.source,framework_agreement_po_id:0
+msgid "Agreement Purchase"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "Cancel"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source:0
+msgid "onchange_product_id(procurement_method, requisition_line_id, proposed_product_id, proposed_qty)"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "Are you sure you want to create a Purchase Order from those lines ?"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: view:logistic.requisition.source.create.agr.po:0
+msgid "or"
+msgstr ""
+
+#. module: framework_agreement_sourcing
+#: model:ir.model,name:framework_agreement_sourcing.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "" 

=== modified file 'framework_agreement_sourcing/model/__init__.py'
--- framework_agreement_sourcing/model/__init__.py	2013-11-15 11:08:08 +0000
+++ framework_agreement_sourcing/model/__init__.py	2014-05-07 09:53:02 +0000
@@ -21,6 +21,5 @@
 from . import logistic_requisition
 from . import logistic_requisition_source
 from . import purchase
-from . import adapter_util
 from . import sale_order
 from . import logistic_requisition_cost_estimate

=== removed file 'framework_agreement_sourcing/model/adapter_util.py'
--- framework_agreement_sourcing/model/adapter_util.py	2013-11-07 09:29:57 +0000
+++ framework_agreement_sourcing/model/adapter_util.py	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Nicolas Bessi
-#    Copyright 2013 Camptocamp SA
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-"""Provides basic mechanism to unify the way records are transformed into
-other records
-
-"""
-
-from openerp.osv import orm
-
-
-class BrowseAdapterSourceMixin(object):
-    """Mixin class used by Model that are transformation sources"""
-
-    def _company(self, cr, uid, context):
-        """Return company id
-
-        :returns: company id
-
-        """
-        return self.pool['res.company']._company_default_get(cr, uid, 'purchase.order',
-                                                             context=context)
-
-    def _direct_map(self, line, mapping, context=None):
-        """Take a dict of left key right key and make direct mapping
-        into the model
-
-        :returns: data dict ready to be used
-        """
-        data = {}
-        for po_key, source_key in mapping.iteritems():
-            value = line[source_key]
-            if isinstance(value, orm.browse_record):
-                value = value.id
-            elif isinstance(value, orm.browse_null):
-                value = False
-            elif isinstance(value, orm.browse_record_list):
-                raise NotImplementedError('List are not supported in direct map')
-
-            data[po_key] = value
-        return data
-
-
-class BrowseAdapterMixin(object):
-
-    def _do_checks(self, cr, uid, model, data, context=None):
-        """Perform validation check of adapted data.
-
-        All missing or incorrect values are return at once.
-
-        :returns: array of exceptions
-
-        """
-        required_keys = set(k for k, v in model._columns.iteritems()
-                                if v.required and not getattr(v, '_fnct', False))
-        empty_required = set(x for x in data
-                                if x in required_keys and not data[x])
-        missing_required = required_keys - set(data.keys())
-        missing_required.update(empty_required)
-        if missing_required:
-            return[ValueError('Following value are missing or False'
-                              ' while adapting %s: %s' %
-                                  (model._name, ", ".join(missing_required)))]
-        return []
-
-    def _validate_adapted_data(self, cr, uid, model, data, context=None):
-        """Perform validation check of adapted data.
-
-        All missing or incorrect values are return at once.
-
-        :returns: validated data or raise Value error
-
-        """
-        errors = self._do_checks(cr, uid, model, data, context=context)
-        if errors:
-            raise ValueError('Data are invalid for following reason %s' %
-                                 ("\n".join(repr(e) for e in errors)))
-        return data
-
-    def _adapt_origin(self, cr, uid, model, origin,
-                      map_fun, post_fun=None, context=None, **kwargs):
-        """Do transformation of source data to dest data using transforms function.
-
-        :param origin: source record
-        :param map_fun: transform function
-        :param post_fun: post transformation hook function
-
-        :returns: transformed data
-
-        """
-        if not callable(map_fun):
-            raise ValueError('Mapping function is not callable')
-        if post_fun and not callable(post_fun):
-            raise ValueError('Post hook function is not callable')
-        data = map_fun(cr, uid, origin, context=context, **kwargs)
-        # we complete with default
-        missing = set(model._columns.keys()) - set(data.keys())
-        data.update(model.default_get(cr, uid, missing, context=context))
-        return data

=== modified file 'framework_agreement_sourcing/model/logistic_requisition.py'
--- framework_agreement_sourcing/model/logistic_requisition.py	2013-11-15 11:04:51 +0000
+++ framework_agreement_sourcing/model/logistic_requisition.py	2014-05-07 09:53:02 +0000
@@ -21,18 +21,23 @@
 from collections import namedtuple
 from openerp.tools.translate import _
 from openerp.osv import orm
-from .adapter_util import BrowseAdapterSourceMixin
 from .logistic_requisition_source import AGR_PROC
 
 
-class logistic_requisition_line(orm.Model, BrowseAdapterSourceMixin):
+class logistic_requisition_line(orm.Model):
     """Override to enable generation of source line"""
 
     _inherit = "logistic.requisition.line"
 
-    def _map_agr_requisiton_to_source(self, cr, uid, line, context=None,
-                                      qty=0, agreement=None, **kwargs):
-        """Prepare data dict for source line using agreement as source
+    def _prepare_line_source(self, cr, uid, line,
+                                      qty=None, agreement=None,
+                                      context=None):
+        """Prepare data dict for source line creation. If an agreement
+        is given, the procurement_method will be an LTA (AGR_PROC).
+        Otherwise, if it's a stockable product we'll go to tender
+        by setting procurement_method as 'procurement'. Finally marke the
+        rest as 'other'. Those are default value that can be changed afterward
+        by the user.
 
         :params line: browse record of origin requistion.line
         :params agreement: browse record of origin agreement
@@ -42,52 +47,83 @@
 
         """
         res = {}
-        direct_map = {
-            'proposed_product_id': 'product_id',
-            'requisition_line_id': 'id',
-            'proposed_uom_id': 'requested_uom_id'}
-
-        if not agreement:
-            raise ValueError("Missing agreement")
-        if not agreement.product_id.id == line.product_id.id:
-            raise ValueError("Product mismatch for agreement and requisition line")
-        # currency = self._get_source_currency(cr, uid, line, context=context)
-        res['unit_cost'] = 0.0
-        res['proposed_qty'] = qty
-        res['framework_agreement_id'] = agreement.id
-        res['procurement_method'] = AGR_PROC
-        res.update(self._direct_map(line, direct_map))
-        return res
-
-    def _map_requisition_to_source(self, cr, uid, line, context=None,
-                                   qty=0, **kwargs):
-        """Prepare data dict to generate source line using requisition as source
-
-        :params line: browse record of origin requistion.line
-        :params qty: quantity to be set on source line
-
-        :returns: dict to be used by Model.create
-
-        """
-        res = {}
-        direct_map = {'proposed_product_id': 'product_id',
-                      'requisition_line_id': 'id',
-                      'proposed_uom_id': 'requested_uom_id'}
+        res['proposed_product_id'] = line.product_id.id
+        res['requisition_line_id'] = line.id
+        res['proposed_uom_id'] = line.requested_uom_id.id
         res['unit_cost'] = 0.0
         res['proposed_qty'] = qty
         res['framework_agreement_id'] = False
-        res['procurement_method'] = 'procurement'
-        res.update(self._direct_map(line, direct_map))
+        if agreement:
+            if not agreement.product_id.id == line.product_id.id:
+                raise ValueError("Product mismatch for agreement and requisition line")
+            res['framework_agreement_id'] = agreement.id
+            res['procurement_method'] = AGR_PROC
+        else:
+            if line.product_id.type == 'product':
+               res['procurement_method'] = 'procurement'
+            else:
+                res['procurement_method'] = 'other'
         return res
 
+    def _sort_agreements(self, cr, uid, agreements, qty, currency=None,
+                         context=None):
+        """Sort agreements to be proposed
+
+        Agreement with negociated currency will first be taken in account
+        then they will be choosen by price converted in currency company
+
+        :param agreements: list of agreements to be sorted
+        :param currency: prefered currrency
+
+        :returns: sorted agreements list
+
+        """
+        if not agreements:
+            return agreements
+
+        def _best_company_price(cr, uid, agreement, qty):
+            """Returns the best price in company currency
+
+            For given agreement and price
+
+            """
+            comp_id = self.pool['framework.agreement']._company_get(cr, uid)
+            comp_obj = self.pool['res.company']
+            currency_obj = self.pool['res.currency']
+            comp_currency = comp_obj.browse(cr, uid, comp_id,
+                                            context=context).currency_id
+            prices = []
+            for pl in agreement.framework_agreement_pricelist_ids:
+                price = agreement.get_price(qty, currency=pl.currency_id)
+                comp_price = currency_obj.compute(cr, uid,
+                                                  pl.currency_id.id,
+                                                  comp_currency.id,
+                                                  price, False)
+                prices.append(comp_price)
+            return min(prices)
+
+        firsts = []
+        if currency:
+            firsts = [x for x in agreements if x.has_currency(currency)]
+            lasts = [x for x in agreements if not x.has_currency(currency)]
+            firsts.sort(key=lambda x: x.get_price(qty, currency=currency))
+            lasts.sort(key=lambda x: _best_company_price(cr, uid, x, qty))
+            return firsts + lasts
+        else:
+            agreements.sort(key=lambda x: _best_company_price(cr, uid, x, qty))
+            return agreements
+
     def _generate_lines_from_agreements(self, cr, uid, container, line,
                                         agreements, qty, currency=None, context=None):
         """Generate 1/n source line(s) for one requisition line.
 
         This is done using available agreements.
         We first look for cheapeast agreement.
-        Then if no more quantity are available and there is still remaining needs
-        we look for next cheapest agreement or return remaining qty
+        Then if no more quantity are available and there is still remaining
+        needs we look for next cheapest agreement or return remaining qty.
+        we prefer to use agreement with negociated currency first even
+        if they are cheaper in other currences. Then it will choose remaining
+        agreements ordered by price converted in company currency
 
         :param container: list of agreements browse
         :param qty: quantity to be sourced
@@ -97,11 +133,10 @@
 
         """
         agreements = agreements if agreements is not None else []
-        if currency:
-            agreements = [x for x in agreements if x.has_currency(currency)]
+        agreements = self._sort_agreements(cr, uid, agreements, qty,
+                                           currency=currency)
         if not agreements:
             return qty
-        agreements.sort(key=lambda x: x.get_price(qty, currency=currency))
         current_agr = agreements.pop(0)
         avail = current_agr.available_quantity
         if not avail:
@@ -115,7 +150,8 @@
         difference = qty - to_consume
         if difference:
             return self._generate_lines_from_agreements(cr, uid, container, line,
-                                                        agreements, difference, context=context)
+                                                        agreements, difference,
+                                                        context=context)
         else:
             return 0
 
@@ -140,7 +176,8 @@
         return Sourced(generated, remaining_qty)
 
     def make_source_line(self, cr, uid, line, force_qty=None, agreement=None, context=None):
-        """Generate a source line for a tender from a requisition line
+        """Generate a source line from a requisition line, see
+        _prepare_line_source for details.
 
         :param line: browse record of origin logistic.request
         :param force_qty: if set this quantity will be used instead
@@ -150,25 +187,11 @@
         """
         qty = force_qty if force_qty else line.requested_qty
         src_obj = self.pool['logistic.requisition.source']
-        if agreement:
-            return src_obj._make_source_line_from_origin(cr, uid, line,
-                                                         self._map_agr_requisiton_to_source,
-                                                         context=context, qty=qty,
-                                                         agreement=agreement)
-        else:
-            return src_obj._make_source_line_from_origin(cr, uid, line,
-                                                         self._map_requisition_to_source,
-                                                         context=context, qty=qty)
-
-    def _get_source_currency(self, cr, uid, line, context=None):
-        agr_obj = self.pool['framework.agreement']
-        comp_obj = self.pool['res.company']
-        currency = line.requisition_id.get_pricelist().currency_id
-        company_id = agr_obj._company_get(cr, uid, context=context)
-        comp_currency = comp_obj.browse(cr, uid, company_id, context=context).currency_id
-        if currency == comp_currency:
-            return None
-        return currency
+        vals = self._prepare_line_source(cr, uid, line,
+                                                    qty=qty,
+                                                    agreement=agreement,
+                                                    context=None)
+        return src_obj.create(cr, uid, vals, context=context)
 
     def _generate_source_line(self, cr, uid, line, context=None):
         """Generate one or n source line(s) per requisition line.
@@ -186,7 +209,7 @@
             return None
         agr_obj = self.pool['framework.agreement']
         date = line.requisition_id.date
-        currency = self._get_source_currency(cr, uid, line, context=context)
+        currency = line.currency_id
         product_id = line.product_id.id
         agreements = agr_obj.get_all_product_agreements(cr, uid, product_id, date,
                                                         context=context)
@@ -218,26 +241,3 @@
         for line_br in self.browse(cr, uid, ids, context=context):
             self._generate_source_line(cr, uid, line_br, context=context)
         return res
-
-
-class logistic_requisition(orm.Model):
-    """Add get pricelist function"""
-
-    _inherit = "logistic.requisition"
-
-    def get_pricelist(self, cr, uid, requisition_id, context=None):
-        """Retrive pricelist id to use in sourcing by agreement process
-
-        :returns: pricelist record
-
-        """
-        if isinstance(requisition_id, (list, tuple)):
-            assert len(requisition_id) == 1
-            requisition_id = requisition_id[0]
-        requisiton = self.browse(cr, uid, requisition_id, context=context)
-        plist = requisiton.partner_id.property_product_pricelist
-        if not plist:
-            raise orm.except_orm(_('No price list on customer'),
-                                 _('Please set sale price list on %s partner') %
-                                 requisiton.partner_id.name)
-        return plist

=== modified file 'framework_agreement_sourcing/model/logistic_requisition_cost_estimate.py'
--- framework_agreement_sourcing/model/logistic_requisition_cost_estimate.py	2014-01-20 13:54:30 +0000
+++ framework_agreement_sourcing/model/logistic_requisition_cost_estimate.py	2014-05-07 09:53:02 +0000
@@ -28,45 +28,11 @@
 
     _inherit = "logistic.requisition.cost.estimate"
 
-    def _update_agreement_source(self, cr, uid, source, context=None):
-        """Update price of source line using related confirmed PO"""
-        if source.procurement_method == AGR_PROC:
-            self._link_po_lines_to_source(cr, uid, source, context=context)
-            price = source.get_agreement_price_from_po()
-            source.write({'unit_cost': price})
-            source.refresh()
-
-    def _link_po_lines_to_source(self, cr, uid, source, context=None):
-        po_l_obj = self.pool['purchase.order.line']
-        agr = source.framework_agreement_id
-        line_ids = po_l_obj.search(
-            cr, uid,
-            [('order_id.framework_agreement_id', '=', agr.id),
-             ('lr_source_line_id', '=', source.id),
-             ('order_id.partner_id', '=', agr.supplier_id.id)],
-            context=context)
-        lines = po_l_obj.browse(cr, uid, line_ids, context=context)
-        po_ids = ([line.order_id.id for line in lines
-                   if line.product_id and line.product_id.type == 'product'])
-
-        all_line_ids = po_l_obj.search(
-            cr, uid,
-            [('order_id', 'in', po_ids),
-             ('product_id.type', '=', 'product')],
-            context=context)
-
-        po_l_obj.write(cr, uid, all_line_ids,
-                       {'lr_source_line_id': source.id},
-                       context=context)
-        source.refresh()
 
     def _prepare_cost_estimate_line(self, cr, uid, sourcing, context=None):
         """Override in order to update agreement source line
 
-        We update the price of source line that will be used in cost estimate
-
         """
-        self._update_agreement_source(cr, uid, sourcing, context=context)
         res = super(logistic_requisition_cost_estimate,
                     self)._prepare_cost_estimate_line(cr, uid, sourcing,
                                                       context=context)
@@ -87,12 +53,11 @@
 
         """
 
-        so_lines = [x for x in so.order_line]
+        so_lines = [x for x in so.order_line if x.product_id]
         po_lines = set(x.purchase_line_id for x in sources
-                       if x.purchase_line_id and
-                          x.purchase_line_id.product_id.type == 'product')
+                       if x.purchase_line_id)
         product_dict = dict((x.product_id.id, x.id) for x in so_lines
-                            if x.product_id and x.product_id.type == 'product')
+                            if x.product_id)
         default = product_dict[product_dict.keys()[0]]
         if not product_dict:
             raise orm.except_orm(_('No stockable product in related PO'),
@@ -102,20 +67,18 @@
             po_line.write({'sale_order_line_id': product_dict.get(key, default)})
 
     def cost_estimate(self, cr, uid, ids, context=None):
-        """Override to link PO to cost_estimate
-
-        We have to do this because when we source with agreement we do
-        not copy the PO it is meaningless has we have no choice to make.
-        But in tender flow you first cancel PO then the sale order mark
-        canceled PO as dropshipping and then copy them.
-
-        So you have to create link between SO and PO/PO line that are
-        normally done when SO procurement generate PO and picking
-
-
-        With agreement PO is confirmed before be marked as dropshipping.
-
-        So we have to link it first"""
+        """Override to link PO to cost_estimate$
+
+        In a normal flow, when you chose a bid as the winning one, the bid is
+        dupplicated to generate the draft PO. On this action, it link the LRS
+        to the generated PO line.
+
+        In a tender flow, we don't dupplicate the bid, it's only a PO. The link
+        between the LRS and the PO line should then be created here.
+
+        This is for the drop shipping to work propely cause in that case, SO
+        and PO are linked together.
+        """
         so_model = self.pool['sale.order']
         po_model = self.pool['purchase.order']
         res = super(logistic_requisition_cost_estimate,

=== modified file 'framework_agreement_sourcing/model/logistic_requisition_source.py'
--- framework_agreement_sourcing/model/logistic_requisition_source.py	2014-01-17 13:48:46 +0000
+++ framework_agreement_sourcing/model/logistic_requisition_source.py	2014-05-07 09:53:02 +0000
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+ # -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi
@@ -18,38 +18,26 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from itertools import chain
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
 from openerp.addons.framework_agreement.model.framework_agreement import\
     FrameworkAgreementObservable
 from openerp.addons.framework_agreement.utils import id_boilerplate
 
-from .adapter_util import BrowseAdapterMixin, BrowseAdapterSourceMixin
 
 AGR_PROC = 'fw_agreement'
 
 
-class logistic_requisition_source(orm.Model, BrowseAdapterMixin,
-                                  BrowseAdapterSourceMixin, FrameworkAgreementObservable):
+class logistic_requisition_source(orm.Model, FrameworkAgreementObservable):
     """Adds support of framework agreement to source line"""
 
     _inherit = "logistic.requisition.source"
 
     _columns = {'framework_agreement_id': fields.many2one('framework.agreement',
                                                           'Agreement'),
-
-                'purchase_pricelist_id': fields.many2one('product.pricelist',
-                                                         'Purchase (PO) Pricelist',
-                                                         help="This pricelist will be used"
-                                                              " when generating PO"),
-                'pricelist_id': fields.related('requisition_line_id', 'requisition_id',
-                                               'partner_id',
-                                               'property_product_pricelist',
-                                               relation='product.pricelist',
-                                               type='many2one',
-                                               string='Price list',
-                                               readonly=True),
-
+                'framework_agreement_po_id': fields.many2one('purchase.order',
+                                                             'Agreement Purchase'),
                 'supplier_id': fields.related('framework_agreement_id', 'supplier_id',
                                               type='many2one',  relation='res.partner',
                                               string='Agreement Supplier')}
@@ -88,11 +76,22 @@
         return res
 
     #------------------ adapting source line to po -----------------------------
-
-    def _map_source_to_po(self, cr, uid, line, context=None, **kwargs):
-        """Map source line to dict to be used by PO create defaults are optional
-
-        :returns: data dict to be used by adapter
+    def _company(self, cr, uid, context):
+        """Return company id
+
+        :returns: company id
+
+        """
+        return self.pool['res.company']._company_default_get(cr, uid, self._name,
+                                                             context=context)
+
+    def _prepare_purchase_order(self, cr, uid, line, po_pricelist, context=None):
+        """Prepare the dict of values to create the PO from a
+           source line.
+
+        :param browse_record line: logistic.requisition.source
+        :param browse_record pricelist: product.pricelist
+        :returns: data dict to be used by orm.Model.create
 
         """
         supplier = line.framework_agreement_id.supplier_id
@@ -106,7 +105,7 @@
         data['framework_agreement_id'] = line.framework_agreement_id.id
         data['partner_id'] = supplier.id
         data['company_id'] = self._company(cr, uid, context)
-        data['pricelist_id'] = line.purchase_pricelist_id.id
+        data['pricelist_id'] = po_pricelist.id
         data['dest_address_id'] = add.id
         data['location_id'] = add.property_stock_customer.id
         data['payment_term_id'] = term
@@ -120,30 +119,50 @@
         data['type'] = 'purchase'
         return data
 
-    def _map_source_to_po_line(self, cr, uid, line, context=None, **kwargs):
-        """Map source line to dict to be used by PO line create
-        Map source line to dict to be used by PO create
-        defaults are optional
+    def _prepare_purchase_order_line(self, cr, uid, po_id, line,
+                               po_supplier, po_pricelist, context=None):
+        """Prepare the dict of values to create the PO Line from args.
 
-        :returns: data dict to be used by adapter
+        :param integer po_id: ids of purchase.order
+        :param browse_record line: logistic.requisition.source
+        :param browse_record po_supplier: res.partner
+        :param browse_record po_pricelist: product.pricelist
+        :returns: data dict to be used by orm.Model.create
 
         """
+        data = {}
         acc_pos_obj = self.pool['account.fiscal.position']
-        supplier = line.framework_agreement_id.supplier_id
+        pl_model = self.pool['product.pricelist']
+        currency = po_pricelist.currency_id
+
+        if line.framework_agreement_id:
+            price = line.framework_agreement_id.get_price(line.proposed_qty, currency=currency)
+            lead_time = line.framework_agreement_id.delay
+            supplier = line.framework_agreement_id.supplier_id
+            data['framework_agreement_id'] = line.framework_agreement_id.id
+        else:
+            supplier = po_supplier
+            lead_time = 0
+            price = 0.0
+            if po_pricelist:
+                price = pl_model.price_get(cr, uid,
+                                           [po_pricelist.id],
+                                           line.proposed_product_id.id,
+                                           line.proposed_qty or 1.0,
+                                           po_supplier.id,
+                                           {'uom': line.proposed_uom_id.id})[po_pricelist.id]
+
+        if not price:
+            price = line.proposed_product_id.standard_price or 1.00
         taxes_ids = line.proposed_product_id.supplier_taxes_id
         taxes = acc_pos_obj.map_tax(cr, uid, supplier.property_account_position,
                                     taxes_ids)
-        currency = line.purchase_pricelist_id.currency_id
-        price = line.framework_agreement_id.get_price(line.proposed_qty, currency=currency)
-        lead_time = line.framework_agreement_id.delay
-        data = {}
-        direct_map = {'product_qty': 'proposed_qty',
-                      'product_id': 'proposed_product_id',
-                      'product_uom': 'proposed_uom_id',
-                      'lr_source_line_id': 'id',
-                      }
 
-        data.update(self._direct_map(line, direct_map))
+        data['order_id'] = po_id
+        data['product_qty'] = line.proposed_qty
+        data['product_id'] = line.proposed_product_id.id
+        data['product_uom'] = line.proposed_uom_id.id
+        data['lr_source_line_id']= line.id
         data['product_lead_time'] = lead_time
         data['price_unit'] = price
         data['name'] = line.proposed_product_id.name
@@ -151,47 +170,99 @@
         data['taxes_id'] = [(6, 0, taxes)]
         return data
 
-    def _make_po_from_source_line(self, cr, uid, source_line, context=None):
-        """adapt a source line to purchase order
+    def _make_po_from_source_lines(self, cr, uid, main_source, other_sources,
+                                   pricelist, context=None):
+        """Create a purchase order from a source line. After creating it,
+        it'll update the unit_cost of the source line accoring to the PO
+        price. We do this because the currency of the PO may not be the same
+        than the LRS so it may happends that value vary because of exchange
+        rate.
 
-        :returns: generated PO id
+        :param browse_record main_source: logistic.requisition.source of
+            type LTA from which you want to generate to PO
+        :param browse_record other_sources: logistic.requisition.source of
+            type other to indlue in the PO
+        :param browse_record pricelist: product.pricelist to be used in PO to
+            know the currency mainly (as the prices will be computed from LTA)
+        :returns integer : generated PO id
 
         """
         if context is None:
             context = {}
         context['draft_po'] = True
+        currency_obj = self.pool['res.currency']
         po_obj = self.pool['purchase.order']
-        pid = po_obj._make_purchase_order_from_origin(cr, uid, source_line,
-                                                      self._map_source_to_po,
-                                                      self._map_source_to_po_line,
-                                                      context=context)
-
-        return pid
-
-    def make_purchase_order(self, cr, uid, ids, context=None):
-        """ adapt each source line to purchase order
-
-        :returns: generated PO ids
+        po_l_obj = self.pool['purchase.order.line']
+        supplier = main_source.framework_agreement_id.supplier_id
+        to_curr = pricelist.currency_id.id
+        po_vals = self._prepare_purchase_order(cr, uid, main_source,
+                                         pricelist, context=context)
+        po_id = po_obj.create(cr, uid, po_vals, context=context)
+        other_sources = other_sources if other_sources else []
+        for source in chain([main_source], other_sources):
+            line_vals = self._prepare_purchase_order_line(cr, uid, po_id,
+                                                    source, supplier,
+                                                    pricelist, context=context)
+            po_l_obj.create(cr, uid, line_vals, context=context)
+            # TODO: Update LRS unit_cost from po line, with currency conversion
+            from_curr = source.requisition_id.currency_id.id
+            # Compute from bid currency to LRS currency
+            price = currency_obj.compute(cr, uid, from_curr, to_curr,
+                    line_vals['price_unit'], False)
+            source.write({'framework_agreement_po_id': po_id, 'unit_cost':price})
+        return po_id
+
+    def make_purchase_order(self, cr, uid, ids, pricelist, context=None):
+        """Create a purchase order from the LRS ids list. This method will
+        create one PO with all lines. Between them, you'll have line of type
+        LTA (framewrok agreement) and line of type other.
+        Currently, only one line of type LTA is accepted at a time.
+
+        We'll raise an error if other types are selected here.
+        We accept line of type other here to include products not included
+        in the LTA for example : you order Product A under LTA + the transport
+        as a LRS of type other.
+
+        :param integer list ids: ids of logistic.requisition.source
+        :param browse_record pricelist: product.pricelist
+        :returns integer : generated PO id
 
         """
-        po_ids = []
-        for source_line in self.browse(cr, uid, ids, context=context):
-            po_id = self._make_po_from_source_line(cr, uid, source_line, context=None)
-            po_ids.append(po_id)
-        return po_ids
-
-    def action_create_agreement_po_requisition(self, cr, uid, ids, context=None):
-        """ Implement buttons that create PO from selected source lines"""
-        # We force empty context
-        act_obj = self.pool.get('ir.actions.act_window')
-        po_ids = self.make_purchase_order(cr, uid, ids, context=context)
-        res = act_obj.for_xml_id(cr, uid,
-                                 'purchase', 'purchase_rfq', context=context)
-        res.update({'domain': [('id', 'in', po_ids)],
-                    'res_id': False,
-                    'context': '{}',
-                    })
-        return res
+        sources = self.browse(cr, uid, ids, context=context)
+        # LRS of type LTA (framework agreement)
+        agreement_sources = []
+        # LRS of type other
+        other_sources =  []
+        for source in sources:
+            if source.procurement_method == AGR_PROC:
+                agreement_sources.append(source)
+            elif source.procurement_method == 'other':
+                other_sources.append(source)
+            else:
+                raise orm.except_orm(_('Source line must be of type other or agreement'),
+                                     _('Please correct selection'))
+
+        main_source = agreement_sources[0] if agreement_sources else False
+        if len(agreement_sources) > 1:
+            raise orm.except_orm(_('There should be only one agreement line'),
+                                 _('Please correct selection'))
+        if not main_source:
+            raise orm.except_orm(_('There should be at least one agreement line'),
+                                 _('Please correct selection'))
+        fback = main_source.framework_agreement_id.supplier_id.property_product_pricelist_purchase
+        pricelist = pricelist if pricelist else fback
+        po_id = self._make_po_from_source_lines(cr, uid, main_source,
+                                                other_sources, pricelist, context=None)
+        return po_id
+
+    def _is_sourced_other(self, cr, uid, source, context=None):
+        """Predicate function to test if line on other
+        method are sourced"""
+        tender_ok = self._is_sourced_procurement(cr, uid, source,
+                                                 context=context)
+        agr_ok = self._is_sourced_fw_agreement(cr, uid, source,
+                                                 context=context)
+        return (tender_ok or agr_ok)
 
     def _is_sourced_fw_agreement(self, cr, uid, source, context=None):
         """Predicate that tells if source line of type agreement are sourced
@@ -200,56 +271,12 @@
 
         """
         po_line_obj = self.pool['purchase.order.line']
-        sources_ids = po_line_obj.search(cr, uid, [('lr_source_line_id', '=', source.id)],
+        sources_ids = po_line_obj.search(cr, uid,
+                                         [('lr_source_line_id', '=', source.id)],
                                          context=context)
         # predicate
         return bool(sources_ids)
 
-    def get_agreement_price_from_po(self, cr, uid, source_id, context=None):
-        """Get price from PO.
-
-        The price is retreived on the po line generated by sourced line.
-
-        :returns: price in float
-        """
-        if isinstance(source_id, (list, tuple)):
-            assert len(source_id) == 1
-            source_id = source_id[0]
-        po_l_obj = self.pool['purchase.order.line']
-        currency_obj = self.pool['res.currency']
-        current = self.browse(cr, uid, source_id, context=context)
-        agreement = current.framework_agreement_id
-
-        if not agreement:
-            raise ValueError('No framework agreement on source line %s' %
-                             current.name)
-        line_ids = po_l_obj.search(cr, uid,
-                                   [('order_id.framework_agreement_id', '=', agreement.id),
-                                    ('lr_source_line_id', '=', current.id),
-                                    ('order_id.partner_id', '=', agreement.supplier_id.id)],
-                                   context=context)
-        price = 0.0
-        lines = po_l_obj.browse(cr, uid, line_ids, context=context)
-        if lines:
-            price = sum(x.price_subtotal for x in lines) # To avoid rounding problems
-            from_curr = lines[0].order_id.pricelist_id.currency_id.id
-            to_curr = current.pricelist_id.currency_id.id
-            price = currency_obj.compute(cr, uid, from_curr, to_curr, price, False)
-        return price
-
-    #---------------------- provide adapter middleware -------------------------
-
-    def _make_source_line_from_origin(self, cr, uid, origin, map_fun,
-                                      post_fun=None, context=None, **kwargs):
-        model = self.pool['logistic.requisition.source']
-        data = self._adapt_origin(cr, uid, model, origin, map_fun,
-                                  post_fun=post_fun, context=context, **kwargs)
-        self._validate_adapted_data(cr, uid, model, data, context=context)
-        s_id = self.create(cr, uid, data, context=context)
-        if callable(post_fun):
-            post_fun(cr, uid, s_id, origin, context=context, **kwargs)
-        return s_id
-
     #---------------OpenERP tedious onchange management ------------------------
 
     def _get_date(self, cr, uid, requision_line_id, context=None):
@@ -268,8 +295,8 @@
         return current.requisition_id.date or now
 
     @id_boilerplate
-    def onchange_sourcing_method(self, cr, uid, source_id, method, req_line_id, proposed_product_id,
-                                 pricelist_id, proposed_qty=0, context=None):
+    def onchange_sourcing_method(self, cr, uid, ids, method, req_line_id, proposed_product_id,
+                                 proposed_qty=0, context=None):
         """
         Called when source method is set on a source line.
 
@@ -278,10 +305,11 @@
         and raise quantity warning.
 
         """
+        line_source = self.browse(cr, uid, ids, context=context)
         res = {'value': {'framework_agreement_id': False}}
-        if (method != AGR_PROC or not proposed_product_id or not pricelist_id):
+        if (method != AGR_PROC or not proposed_product_id):
             return res
-        currency = self._currency_get(cr, uid, pricelist_id, context=context)
+        currency = line_source.currency_id
         agreement_obj = self.pool['framework.agreement']
         date = self._get_date(cr, uid, req_line_id, context=context)
         agreement, enough_qty = agreement_obj.get_cheapest_agreement_for_qty(cr, uid,
@@ -300,48 +328,30 @@
         if not enough_qty:
             msg = _("You have ask for a quantity of %s \n"
                     " but there is only %s available"
-                    " for current agreement") % (proposed_qty, agreement.available_quantity)
+                    " for current agreement") % (proposed_qty,
+                                                 agreement.available_quantity)
             res['warning'] = msg
         return res
 
     @id_boilerplate
-    def onchange_pricelist(self, cr, uid, source_id, method, req_line_id,
-                           proposed_product_id, proposed_qty,
-                           pricelist_id, context=None):
-        """Call when pricelist is set on a source line.
-
-        If sourcing method is framework agreement
-        it will set price, agreement and supplier if possible
-        and raise quantity warning.
-
-        """
-        res = {}
-        if (method != AGR_PROC or not proposed_product_id or not pricelist_id):
-            return res
-
-        return self.onchange_sourcing_method(cr, uid, source_id, method, req_line_id,
-                                             proposed_product_id, pricelist_id,
-                                             proposed_qty=proposed_qty,
-                                             context=context)
-
-    @id_boilerplate
-    def onchange_quantity(self, cr, uid, source_id, method, req_line_id, qty,
-                          proposed_product_id, pricelist_id, context=None):
+    def onchange_quantity(self, cr, uid, ids, method, req_line_id, qty,
+                          proposed_product_id, context=None):
         """Raise a warning if agreed qty is not sufficient"""
+        line_source = self.browse(cr, uid, ids, context=context)
         if (method != AGR_PROC or not proposed_product_id):
             return {}
-        currency = self._currency_get(cr, uid, pricelist_id, context=context)
+        currency = line_source.currency_id
         date = self._get_date(cr, uid, req_line_id, context=context)
-        return self.onchange_quantity_obs(cr, uid, source_id, qty, date,
+        return self.onchange_quantity_obs(cr, uid, ids, qty, date,
                                           proposed_product_id,
                                           currency=currency,
                                           price_field='dummy',
                                           context=context)
 
     @id_boilerplate
-    def onchange_product_id(self, cr, uid, source_id, method, req_line_id,
+    def onchange_product_id(self, cr, uid, ids, method, req_line_id,
                             proposed_product_id, proposed_qty,
-                            pricelist_id, context=None):
+                            context=None):
         """Call when product is set on a source line.
 
         If sourcing method is framework agreement
@@ -349,21 +359,31 @@
         and raise quantity warning.
 
         """
-        if (method != AGR_PROC or not proposed_product_id):
+        if method != AGR_PROC:
+            if proposed_product_id:
+                value = {'proposed_uom_id': ''}
+                if proposed_product_id:
+                    prod_obj = self.pool.get('product.product')
+                    prod = prod_obj.browse(cr, uid, proposed_product_id, context=context)
+                    value = {
+                        'proposed_uom_id': prod.uom_id.id,
+                    }
+                return {'value': value}
             return {}
 
-        return self.onchange_sourcing_method(cr, uid, source_id, method, req_line_id,
-                                             proposed_product_id, pricelist_id,
+        return self.onchange_sourcing_method(cr, uid, ids, method, req_line_id,
+                                             proposed_product_id,
                                              proposed_qty=proposed_qty,
                                              context=context)
 
     @id_boilerplate
-    def onchange_agreement(self, cr, uid, source_id, agreement_id, req_line_id, qty,
-                           proposed_product_id, pricelist_id, context=None):
-        if not proposed_product_id or not pricelist_id or not agreement_id:
+    def onchange_agreement(self, cr, uid, ids, agreement_id, req_line_id, qty,
+                           proposed_product_id, context=None):
+        line_source = self.browse(cr, uid, ids, context=context)
+        if not proposed_product_id or not agreement_id:
             return {}
-        currency = self._currency_get(cr, uid, pricelist_id, context=context)
+        currency = line_source.currency_id
         date = self._get_date(cr, uid, req_line_id, context=context)
-        return self.onchange_agreement_obs(cr, uid, source_id, agreement_id, qty,
+        return self.onchange_agreement_obs(cr, uid, ids, agreement_id, qty,
                                            date, proposed_product_id,
                                            currency=currency, price_field='dummy')

=== modified file 'framework_agreement_sourcing/model/purchase.py'
--- framework_agreement_sourcing/model/purchase.py	2013-12-11 17:57:19 +0000
+++ framework_agreement_sourcing/model/purchase.py	2014-05-07 09:53:02 +0000
@@ -19,69 +19,13 @@
 #
 ##############################################################################
 from openerp.osv import orm
-from .adapter_util import BrowseAdapterMixin
-
-
-class purchase_order(orm.Model, BrowseAdapterMixin):
-    """Add function to create PO from source line.
-    It maybe goes against YAGNI principle.
-    The idea would be to propose a small design
-    to be ported back into purchase_requisition_extended module
-    or an other base modules.
-
-    Then we should extend it to propose an API
-    to generate PO from various sources
+
+class purchase_order(orm.Model):
+    """ Override action_confirm to set quantity bid if LTA
     """
 
     _inherit = "purchase.order"
 
-    #------ PO adapter middleware maybe to put in aside class but not easy in OpenERP context ----
-    def _make_purchase_order_from_origin(self, cr, uid, origin, map_fun, map_line_fun,
-                                         post_fun=None, post_line_fun=None, context=None):
-        """Create a PO browse record from any other record
-
-        :returns: created record ids
-
-        """
-        po_id = self._adapt_origin_to_po(cr, uid, origin, map_fun,
-                                         post_fun=post_fun, context=context)
-        self._adapt_origin_to_po_line(cr, uid, po_id, origin, map_line_fun,
-                                      post_fun=post_line_fun,
-                                      context=context)
-        return po_id
-
-    def _adapt_origin_to_po(self, cr, uid, origin, map_fun,
-                            post_fun=None, context=None):
-        """PO adapter function
-
-        :returns: created PO id
-
-        """
-        model = self.pool['purchase.order']
-        data = self._adapt_origin(cr, uid, model, origin, map_fun,
-                                  post_fun=post_fun, context=context)
-        self._validate_adapted_data(cr, uid, model, data, context=context)
-        po_id = self.create(cr, uid, data, context=context)
-        if callable(post_fun):
-            post_fun(cr, uid, po_id, origin, context=context)
-        return po_id
-
-    def _adapt_origin_to_po_line(self, cr, uid, po_id, origin, map_fun,
-                                 post_fun=None, context=None):
-        """PO line adapter
-
-        :returns: created PO line id
-
-        """
-        model = self.pool['purchase.order.line']
-        data = self._adapt_origin(cr, uid, model, origin, map_fun,
-                                  post_fun=post_fun, context=context)
-        data['order_id'] = po_id
-        self._validate_adapted_data(cr, uid, model, data, context=context)
-        l_id = model.create(cr, uid, data, context=context)
-        if callable(post_fun):
-            post_fun(cr, uid, l_id, origin, context=context)
-        return l_id
 
     def action_confirm(self, cr, uid, ids, context=None):
         super(purchase_order_line, self).action_confirm(cr, uid, ids, context=context)
@@ -89,3 +33,4 @@
             if not element.quantity_bid and not element.framework_agreement_id:
                 self.write(cr, uid, ids, {'quantity_bid': element.product_qty}, context=context)
         return True
+

=== added file 'framework_agreement_sourcing/security/ir.model.access.csv'
--- framework_agreement_sourcing/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ framework_agreement_sourcing/security/ir.model.access.csv	2014-05-07 09:53:02 +0000
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_po_creator,po_creator,model_logistic_requisition_source_create_agr_po,purchase.group_purchase_user,1,1,1,1

=== modified file 'framework_agreement_sourcing/tests/common.py'
--- framework_agreement_sourcing/tests/common.py	2013-11-29 09:55:12 +0000
+++ framework_agreement_sourcing/tests/common.py	2014-05-07 09:53:02 +0000
@@ -51,6 +51,7 @@
             'user_id': self.uid,
             'budget_holder_id': self.uid,
             'finance_officer_id': self.uid,
+            'pricelist_id': self.ref('product.list0'),
         }
         agr_line = {
             'product_id': self.product_id,
@@ -59,7 +60,7 @@
             'date_delivery': self.now.strftime(DEFAULT_SERVER_DATE_FORMAT),
             'budget_tot_price': 100000000,
         }
-        other_line = {
+        product_line = {
             'product_id': self.ref('product.product_product_7'),
             'requested_qty': 10,
             'requested_uom_id': self.ref('product.product_uom_unit'),
@@ -67,10 +68,21 @@
             'budget_tot_price': 100000000,
         }
 
+        other_line = {
+            'product_id': self.ref('logistic_requisition.product_transport'),
+            'requested_qty': 1,
+            'requested_uom_id': self.ref('product.product_uom_unit'),
+            'date_delivery': self.now.strftime(DEFAULT_SERVER_DATE_FORMAT),
+            'budget_tot_price': 100000000,
+        }
+
+
         requisition_id = logistic_requisition.create(self, req)
         logistic_requisition.add_line(self, requisition_id,
                                       agr_line)
         logistic_requisition.add_line(self, requisition_id,
+                                      product_line)
+        logistic_requisition.add_line(self, requisition_id,
                                       other_line)
         self.requisition = self.requisition_model.browse(self.cr, self.uid, requisition_id)
 

=== modified file 'framework_agreement_sourcing/tests/test_agreement_souce_line_to_po.py'
--- framework_agreement_sourcing/tests/test_agreement_souce_line_to_po.py	2013-12-16 12:07:22 +0000
+++ framework_agreement_sourcing/tests/test_agreement_souce_line_to_po.py	2014-05-07 09:53:02 +0000
@@ -29,6 +29,7 @@
         cr, uid = self.cr, self.uid
         lines = self.requisition.line_ids
         agr_line = None
+        self.wiz_model = self.registry('logistic.requisition.source.create.agr.po')
         for line in lines:
             if line.product_id == self.cheap_on_low_agreement.product_id:
                 agr_line = line
@@ -36,26 +37,39 @@
         self.assertTrue(agr_line)
         agr_line.write({'requested_qty': 400})
         agr_line.refresh()
-        source_ids = self.requisition_line_model._generate_source_line(cr, uid, agr_line)
-        self.assertTrue(len(source_ids) == 1)
-        self.source_line = self.source_line_model.browse(cr, uid, source_ids[0])
+        source_ids = []
+        for line in lines:
+            if (line.product_id.id == self.product_id or
+                    line.product_id.type == 'service'):
+                lid = self.requisition_line_model._generate_source_line(cr, uid, line)
+                source_ids += lid
+        self.assertTrue(len(source_ids) == 2)
+        self.source_lines = self.source_line_model.browse(cr, uid, source_ids)
+        self.lta_source = next(x for x in self.source_lines
+                               if x.procurement_method == 'fw_agreement')
+        self.other_source = next(x for x in self.source_lines
+                                 if x.procurement_method == 'other')
 
     def test_01_transform_source_to_agreement(self):
         """Test transformation of an agreement source line into PO"""
         cr, uid = self.cr, self.uid
-        self.assertTrue(self.source_line)
-        plist = self.source_line.framework_agreement_id.supplier_id.property_product_pricelist_purchase
-        self.source_line.write({'purchase_pricelist_id': plist.id})
-        self.source_line.refresh()
-        po_id = self.source_line_model._make_po_from_source_line(cr, uid,
-                                                                 self.source_line)
+        self.assertTrue(self.lta_source)
+        self.lta_source.refresh()
+        active_ids = [x.id for x in self.source_lines]
+        wiz_id = self.wiz_model.create(self.cr, self.uid, {},
+                                       context={'active_ids': active_ids})
+
+        wiz = self.wiz_model.browse(self.cr, self.uid, wiz_id)
+        po_id = wiz.action_create_agreement_po_requisition(
+            context={'active_ids': active_ids}
+        )['res_id']
         self.assertTrue(po_id)
-        supplier = self.source_line.framework_agreement_id.supplier_id
-        add = self.source_line.requisition_id.consignee_shipping_id
-        consignee = self.source_line.requisition_id.consignee_id
+        supplier = self.lta_source.framework_agreement_id.supplier_id
+        add = self.lta_source.requisition_id.consignee_shipping_id
+        consignee = self.lta_source.requisition_id.consignee_id
         po = self.registry('purchase.order').browse(cr, uid, po_id)
-        date_order = self.source_line.requisition_id.date
-        date_delivery = self.source_line.requisition_id.date_delivery
+        date_order = self.lta_source.requisition_id.date
+        date_delivery = self.lta_source.requisition_id.date_delivery
         self.assertEqual(po.partner_id, supplier)
         self.assertEqual(po.pricelist_id, supplier.property_product_pricelist_purchase)
         self.assertEqual(po.date_order, date_order)
@@ -63,12 +77,23 @@
         self.assertEqual(po.consignee_id, consignee)
         self.assertEqual(po.state, 'draftpo')
 
-        self.assertEqual(len(po.order_line), 1)
-        po_line = po.order_line[0]
-        self.assertEqual(po_line.product_qty, self.source_line.proposed_qty)
-        self.assertEqual(po_line.product_id, self.source_line.proposed_product_id)
-        self.assertEqual(po_line.product_qty, self.source_line.proposed_qty)
-        self.assertEqual(po_line.product_uom, self.source_line.proposed_uom_id)
-        self.assertEqual(po_line.price_unit, 50.0)
-        self.assertEqual(po_line.lr_source_line_id, self.source_line)
+        self.assertEqual(len(po.order_line), 2)
+
+        po_line = next(x for x in po.order_line
+                       if x.product_id == self.lta_source.framework_agreement_id.product_id)
+        self.assertEqual(po_line.product_qty, self.lta_source.proposed_qty)
+        self.assertEqual(po_line.product_id, self.lta_source.proposed_product_id)
+        self.assertEqual(po_line.product_qty, self.lta_source.proposed_qty)
+        self.assertEqual(po_line.product_uom, self.lta_source.proposed_uom_id)
+        self.assertAlmostEqual(po_line.price_unit, 50.0)
+        self.assertEqual(po_line.lr_source_line_id, self.lta_source)
         self.assertEqual(po_line.date_planned, date_delivery)
+
+        po_line = next(x for x in po.order_line
+                       if x.product_id == self.other_source.proposed_product_id)
+        self.assertEqual(po_line.product_qty, self.other_source.proposed_qty)
+        self.assertEqual(po_line.product_id, self.other_source.proposed_product_id)
+        self.assertEqual(po_line.product_qty, self.other_source.proposed_qty)
+        self.assertEqual(po_line.product_uom, self.other_source.proposed_uom_id)
+        self.assertAlmostEqual(po_line.price_unit, 1.0)
+        self.assertEqual(po_line.lr_source_line_id, self.other_source)

=== modified file 'framework_agreement_sourcing/tests/test_logistic_order_line_to_source_line.py'
--- framework_agreement_sourcing/tests/test_logistic_order_line_to_source_line.py	2013-11-21 11:15:49 +0000
+++ framework_agreement_sourcing/tests/test_logistic_order_line_to_source_line.py	2014-05-07 09:53:02 +0000
@@ -40,7 +40,7 @@
         self.assertTrue(len(to_validate_ids) == 1)
         to_validate = self.source_line_model.browse(cr, uid, to_validate_ids[0])
         self.assertEqual(to_validate.procurement_method, AGR_PROC)
-        self.assertEqual(to_validate.unit_cost, 0.0)
+        self.assertAlmostEqual(to_validate.unit_cost, 0.0)
         self.assertEqual(to_validate.proposed_qty, 400)
 
     def test_02_enough_qty_on_high_agr(self):
@@ -59,7 +59,7 @@
         self.assertTrue(len(to_validate_ids) == 1)
         to_validate = self.source_line_model.browse(cr, uid, to_validate_ids[0])
         self.assertEqual(to_validate.procurement_method, AGR_PROC)
-        self.assertEqual(to_validate.unit_cost, 0.0)
+        self.assertAlmostEqual(to_validate.unit_cost, 0.0)
         self.assertEqual(to_validate.proposed_qty, 1500)
 
     def test_03_not_enough_qty_on_high_agreement(self):
@@ -85,7 +85,7 @@
         self.assertTrue(high_line, msg="High agreement was not used")
         self.assertEqual(high_line.procurement_method, AGR_PROC)
         self.assertEqual(high_line.proposed_qty, 2000)
-        self.assertEqual(high_line.unit_cost, 0.0)
+        self.assertAlmostEqual(high_line.unit_cost, 0.0)
 
         # low_line
         low_line = next((x for x in to_validates
@@ -93,10 +93,13 @@
         self.assertTrue(low_line, msg="Low agreement was not used")
         self.assertEqual(low_line.procurement_method, AGR_PROC)
         self.assertEqual(low_line.proposed_qty, 400)
-        self.assertEqual(low_line.unit_cost, 0.0)
+        self.assertAlmostEqual(low_line.unit_cost, 0.0)
 
     def test_03_not_enough_qty_on_all_agreemenst(self):
-        """Test that we """
+        """Test that we have generate correct line when not enough qty on all agreements
+
+        That means last source line must be of type other or procurement
+        """
         cr, uid = self.cr, self.uid
         lines = self.requisition.line_ids
         agr_line = None
@@ -118,7 +121,7 @@
         self.assertTrue(high_line, msg="High agreement was not used")
         self.assertEqual(high_line.procurement_method, AGR_PROC)
         self.assertEqual(high_line.proposed_qty, 2000)
-        self.assertEqual(high_line.unit_cost, 0.0)
+        self.assertAlmostEqual(high_line.unit_cost, 0.0)
 
         # low_line
         low_line = next((x for x in to_validates
@@ -126,7 +129,7 @@
         self.assertTrue(low_line, msg="Low agreement was not used")
         self.assertEqual(low_line.procurement_method, AGR_PROC)
         self.assertEqual(low_line.proposed_qty, 1200)
-        self.assertEqual(low_line.unit_cost, 0.0)
+        self.assertAlmostEqual(low_line.unit_cost, 0.0)
 
         # Tender line
         tender_line = next((x for x in to_validates

=== removed file 'framework_agreement_sourcing/touch'
=== modified file 'framework_agreement_sourcing/view/requisition_view.xml'
--- framework_agreement_sourcing/view/requisition_view.xml	2013-12-16 11:11:44 +0000
+++ framework_agreement_sourcing/view/requisition_view.xml	2014-05-07 09:53:02 +0000
@@ -12,108 +12,58 @@
                  domain="[('draft', '=', False)]"
                  attrs="{'required': [('procurement_method', '=', 'fw_agreement')],
                         'invisible': [('procurement_method', '!=', 'fw_agreement')]}"
-                 on_change="onchange_agreement(framework_agreement_id, requisition_line_id, proposed_qty, proposed_product_id, purchase_pricelist_id, context)"/>/>
-          <field name="pricelist_id"
-                 invisible="1"/>
-          <field name="purchase_pricelist_id"
-                 attrs="{'required': [('procurement_method', '=', 'fw_agreement')],
-                        'invisible': [('procurement_method', '!=', 'fw_agreement')]}"
-                 on_change="onchange_pricelist(framework_agreement_id, requisition_line_id, proposed_qty, proposed_product_id, purchase_pricelist_id, context)"
-                 domain="[('type', '=', 'purchase')]"/>
+                 on_change="onchange_agreement(framework_agreement_id, requisition_line_id, proposed_qty, proposed_product_id, context)"/>
+          <field name="framework_agreement_po_id"
+                 readonly="1"
+                 attrs="{'invisible': [('procurement_method', 'not in', ['fw_agreement','other'])]}"
+                                  
+                 />
 
           <field name="supplier_id"
                  invisible="1"/>
         </field>
         <field name="proposed_uom_id"
                position="attributes">
-            <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
-          </field>
-          <field name="unit_cost"
-               position="attributes">
-            <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
-          </field>
-          <field name="total_cost"
-               position="attributes">
-            <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
-          </field>
-          <field name="price_is"
-               position="attributes">
-            <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
-          </field>
-      </field>
-    </record>
-
-    <record id="add_hide_button_create_bids" model="ir.ui.view">
-      <field name="name">hidde button</field>
-      <field name="model">logistic.requisition.source</field>
-      <field name="inherit_id" ref="logistic_requisition.view_logistic_requisition_source_form"/>
-      <field name="priority" eval="10"/>
-      <field name="arch" type="xml">
-          <button position="replace">
-          </button>
-      </field>
-    </record>
-
-
-    <record id="add_create_po_button" model="ir.ui.view">
-      <field name="name">add create po button</field>
-      <field name="model">logistic.requisition.source</field>
-      <field name="inherit_id" ref="logistic_requisition.view_logistic_requisition_source_form"/>
-      <field name="arch" type="xml">
-        <sheet position="before">
-          <header>
-          <button name="action_create_agreement_po_requisition"
-                  context="{}"
-                  string="Create Draft PO"
-                  type="object"
-                  attrs="{'invisible': [('procurement_method', '!=', 'fw_agreement')]}"/>
-          <button name="action_create_po_requisition"
-                  string="Call for Bids"
-                  type="object"
-                  attrs="{'invisible': ['|', ('po_requisition_id', '!=', False), ('procurement_method', '!=', 'procurement')]}"
-                  />
-          </header>
-        </sheet>
+          <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
+        </field>
+        <field name="unit_cost"
+               position="attributes">
+          <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
+        </field>
+        <field name="total_cost"
+               position="attributes">
+          <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
+        </field>
+        <field name="price_is"
+               position="attributes">
+          <attribute name="attrs">{'invisible': [('procurement_method', '=', 'fw_agreement')]}</attribute>
+        </field>
       </field>
     </record>
 
     <record id="addd_agreement_source_line_onchange" model="ir.ui.view">
-      <field name="name">addd agreement source line onchange</field>
+      <field name="name">ad agreement source line onchange</field>
       <field name="model">logistic.requisition.source</field>
       <field name="inherit_id" ref="logistic_requisition.view_logistic_requisition_source_form"/>
       <field name="arch" type="xml">
         <data>
           <field name="procurement_method"
                  position="attributes">
-            <attribute name="on_change">onchange_sourcing_method(procurement_method, requisition_line_id, proposed_product_id, purchase_pricelist_id, proposed_qty)</attribute>
+            <attribute name="on_change">onchange_sourcing_method(procurement_method, requisition_line_id, proposed_product_id, proposed_qty)</attribute>
           </field>
 
           <field name="proposed_qty"
                  position="attributes">
-            <attribute name="on_change">onchange_quantity(procurement_method, requisition_line_id, proposed_qty, proposed_product_id, purchase_pricelist_id)</attribute>
+            <attribute name="on_change">onchange_quantity(procurement_method, requisition_line_id, proposed_qty, proposed_product_id)</attribute>
           </field>
           <field name="proposed_product_id"
                  position="attributes">
-            <attribute name="on_change">onchange_product_id(procurement_method, requisition_line_id, proposed_product_id, proposed_qty, purchase_pricelist_id)</attribute>
+            <attribute name="on_change">onchange_product_id(procurement_method, requisition_line_id, proposed_product_id, proposed_qty)</attribute>
           </field>
 
         </data>
       </field>
     </record>
 
-
-<!-- Deactivate button on tree to ensure choose of the sourcing method before calling action -->
-    <record id="hide_button_on_soure_line in req line tree" model="ir.ui.view">
-      <field name="name">hide button on soure line in req line tree</field>
-      <field name="model">logistic.requisition.line</field>
-      <field name="inherit_id" ref="logistic_requisition.view_logistic_requisition_line_form" />
-      <field name="arch" type="xml">
-        <button name="action_create_po_requisition" position="attributes">
-          <attribute name="attrs">{}</attribute>
-          <attribute name="invisible">1</attribute>
-        </button>
-      </field>
-    </record>
-
   </data>
 </openerp>

=== added directory 'framework_agreement_sourcing/wizard'
=== added file 'framework_agreement_sourcing/wizard/__init__.py'
--- framework_agreement_sourcing/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ framework_agreement_sourcing/wizard/__init__.py	2014-05-07 09:53:02 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: joel Grand-Guillaume
+#    Copyright 2013 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import logistic_requisition_source_create_po

=== added file 'framework_agreement_sourcing/wizard/logistic_requisition_source_create_po.py'
--- framework_agreement_sourcing/wizard/logistic_requisition_source_create_po.py	1970-01-01 00:00:00 +0000
+++ framework_agreement_sourcing/wizard/logistic_requisition_source_create_po.py	2014-05-07 09:53:02 +0000
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi
+#    Copyright 2013 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+class logistic_requisition_source_po_creator(orm.TransientModel):
+
+    _name = 'logistic.requisition.source.create.agr.po'
+
+    _columns = {
+        'pricelist_id': fields.many2one('product.pricelist',
+                                          string='Pricelist / Currency',
+                                          required=True),
+        'framework_currency_ids': fields.many2many('framework.agreement.pricelist',
+                                                   rel='framework_agr_id_po_create_rel',
+                                                   string='Available Currency',
+                                                   readonly=True)
+    }
+
+    def default_get(self, cr, uid, fields_list, context=None):
+        """ Take the pricelist of the lrs by default. Show the
+        available choice for the user.
+        """
+        if context is None:
+            context = {}
+        defaults = super(logistic_requisition_source_po_creator, self).\
+            default_get(cr, uid, fields_list, context=context)
+        line_obj = self.pool.get('logistic.requisition.source')
+        fmwk_price_obj = self.pool.get('framework.agreement.pricelist')
+        line_ids = context['active_ids']
+        pricelist_id = None
+        line = next((x for x in line_obj.browse(cr, uid, line_ids, context=context)
+                    if x.framework_agreement_id), None)
+        if not line:
+            raise orm.except_orm(_('No sourcing line with agreement selected'),
+                                 _('Please correct selection'))
+
+        pricelist_id = line_obj._get_purchase_pricelist_from_currency(
+                cr,
+                uid,
+                line.requisition_id.pricelist_id.currency_id.id,
+                context=context
+                )
+        defaults['pricelist_id'] = pricelist_id
+
+        frwk_ids = fmwk_price_obj.search(
+            cr, uid,
+            [('framework_agreement_id', '=', line.framework_agreement_id.id)],
+            context=context
+        )
+        defaults['framework_currency_ids'] = frwk_ids
+        return defaults
+
+    def _make_purchase_order(self, cr, uid, pricelist, source_ids, context=None):
+        """Create PO from source line ids"""
+        lr_model = self.pool['logistic.requisition.source']
+        po_id = lr_model.make_purchase_order(cr, uid, source_ids,
+                                              pricelist, context=context)
+        return po_id
+
+    def action_create_agreement_po_requisition(self, cr, uid, ids, context=None):
+        """ Implement buttons that create PO from selected source lines"""
+        act_obj = self.pool['ir.actions.act_window']
+        source_ids = context['active_ids']
+        form = self.browse(cr, uid, ids, context=context)[0]
+        pricelist=form.pricelist_id
+
+        available_currency = [x.currency_id for x in form.framework_currency_ids]
+        if available_currency and pricelist.currency_id not in available_currency:
+            raise orm.except_orm(_('User Error'), _(
+                'You must chose a pricelist that is in the same currency '
+                'than one of the available in the framework agreement.'))
+        po_id = self._make_purchase_order(cr, uid, pricelist, source_ids,
+                                           context=context)
+        # TODO : update LRS price from PO depending on the chosen currency
+
+        res = act_obj.for_xml_id(cr, uid,
+                                 'purchase', 'purchase_rfq', context=context)
+        res.update({'domain': [('id', '=', po_id)],
+                    'res_id': po_id,
+                    'context': '{}',
+                    'search_view_id': False,
+                    })
+        return res

=== added file 'framework_agreement_sourcing/wizard/logistic_requisition_source_create_po_view.xml'
--- framework_agreement_sourcing/wizard/logistic_requisition_source_create_po_view.xml	1970-01-01 00:00:00 +0000
+++ framework_agreement_sourcing/wizard/logistic_requisition_source_create_po_view.xml	2014-05-07 09:53:02 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+    <record id="view_create_agr_po_from_source" model="ir.ui.view">
+      <field name="name">Create Purchase Order From Requisition Source</field>
+      <field name="model">logistic.requisition.source.create.agr.po</field>
+      <field name="arch" type="xml">
+        <form string="Create Purchase Order" version="7.0">
+          <separator string="Which pricelist / currency you want ?"/>
+          <label string="You can only chose a pricelist with a currency that is included
+            in the framewrok agreement you have chosen." colspan="4"/>
+          <field name="framework_currency_ids"/>
+          <field name="pricelist_id" domain="[('type','=','purchase')]"/>
+
+          <group>
+            <separator string="Are you sure you want to create a Purchase Order from those lines ?"/>
+            <label string="
+                           Please note that: &#10; &#10;
+                           Requisition will only be created if: &#10;
+                           * Lines belong to the same company &#10;
+                           * There is only one agreement line in selection &#10;
+                           * Products are define on all selected lines &#10;
+                           * Non agreement line are of type other &#10;
+                           &#10; &#10;
+                           " colspan="4"/>
+          </group>
+          <footer>
+            <button name="action_create_agreement_po_requisition"
+                    string="Create Purchase Order"
+                    type="object" class="oe_highlight"/>
+            or
+            <button string="Cancel"
+                    class="oe_link"
+                    special="cancel" />
+          </footer>
+        </form>
+      </field>
+    </record>
+
+    <act_window
+        name="Create Agreement Purchase Order"
+        res_model="logistic.requisition.source.create.agr.po"
+        src_model="logistic.requisition.source"
+        view_mode="form"
+        target="new"
+        multi="True"
+        key2="client_action_multi"
+        id="action_view_create_agr_po_from_source"/>
+
+  </data>
+</openerp>

=== modified file 'logistic_requisition/__openerp__.py'
--- logistic_requisition/__openerp__.py	2014-03-17 09:29:28 +0000
+++ logistic_requisition/__openerp__.py	2014-05-07 09:53:02 +0000
@@ -31,8 +31,38 @@
 This module allows you to manage your Logistic Requisitions.
 ============================================================
 
-A Logistic requisition express a need that is requested somewhere.
-
+A Logistic requisition express a need that is requested somewhere. It allows to 
+manage the sourcing of the needs before making a cost estimate to the requestor.
+
+This invert the logic that is in standard in OpenERP in the way that the sourcing 
+of the procuremnt is made before the order confirmation and we built the link incase 
+of validation. In standard, th SO confirmation generate the procurement then it
+generate the needed procurement.
+
+The sourcing can be of various type:
+ 
+ * Warehouse dispatch: You will deliver the requested goods from one of your 
+ stock location
+ * Procurement : You will go for tender to chose the best supplier for the 
+ requiredgoods
+ * Framework agreement : You will use the existing Framework agreement
+ * Other : Nothing of those choices. In that case, the line can be selected
+and included in either a PO or a tender
+
+The simple process is the following:
+
+ * LR are recorded as the to represent the need of the customer/requestor
+ * LR are confirm and sourced of different way (dispatch, tender, ..)
+ * If sourced from tender, you need to go all along the tendering process (CBA).
+ Once you chose one bid, the system will automatically put back the prices 
+ information on the sourcing line of the LR.
+  * You can create a cost estimate from sourced LR lines for your 
+ resquestor/customer
+ * If the requestor accept the cost estimate, his validation will automatically:
+   * Create the link between the chosen winning bid and the line sourced this way. 
+     A new draft PO will be generatedand managed as drop shipping.
+   * Lines sourced as a dispatch will create a delivery order. 
+   * Lines sourced a LTA will create a PO of type LTA
 """,
  "depends": ["transport_plan",
              "purchase",

=== modified file 'logistic_requisition/i18n/en_US.po'
--- logistic_requisition/i18n/en_US.po	2013-08-29 09:53:01 +0000
+++ logistic_requisition/i18n/en_US.po	2014-05-07 09:53:02 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-29 09:51+0000\n"
-"PO-Revision-Date: 2013-08-29 09:51+0000\n"
+"POT-Creation-Date: 2014-02-04 13:11+0000\n"
+"PO-Revision-Date: 2014-02-04 13:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,14 +21,14 @@
 msgstr "Logistic Specialist"
 
 #. module: logistic_requisition
-#: field:logistic.requisition.source,offer_ids:0
-msgid "Sales Quotation Lines"
-msgstr "Sales Quotation Lines"
+#: field:logistic.requisition.line,amount_total:0
+msgid "Total Amount"
+msgstr "Total Amount"
 
 #. module: logistic_requisition
-#: field:logistic.requisition,finance_officer_id:0
-msgid "Finance Officer"
-msgstr "Finance Officer"
+#: view:logistic.requisition.line:0
+msgid "View Stock"
+msgstr "View Stock"
 
 #. module: logistic_requisition
 #: view:logistic.requisition:0
@@ -49,6 +49,11 @@
 msgstr "Shipping / Transport"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:140
+msgid "Preferred transport"
+msgstr "Preferred transport"
+
+#. module: logistic_requisition
 #: model:ir.actions.act_window,name:logistic_requisition.act_window_requisition_source_transport
 #: model:ir.actions.act_window,name:logistic_requisition.action_requisition_source_transport
 msgid "Create Transport Plan"
@@ -70,10 +75,20 @@
 msgstr "View Lines"
 
 #. module: logistic_requisition
-#: selection:logistic.requisition.source,price_is:0
-#: selection:sale.order.line,price_is:0
-msgid "Fixed"
-msgstr "Fixed"
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:119
+msgid "Consignee address:"
+msgstr "Consignee address:"
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:634
+#, python-format
+msgid "This new requisition concerns %s and is due for %s."
+msgstr "This new requisition concerns %s and is due for %s."
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:139
+msgid "Desired delivery date"
+msgstr "Desired delivery date"
 
 #. module: logistic_requisition
 #: field:logistic.requisition,message_unread:0
@@ -93,6 +108,11 @@
 msgstr "Company"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:149
+msgid "No"
+msgstr "No"
+
+#. module: logistic_requisition
 #: selection:logistic.requisition.source,procurement_method:0
 msgid "Framework Agreement"
 msgstr "Framework Agreement"
@@ -114,15 +134,11 @@
 msgstr "Just for Quotation"
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "Requestor is External or National Societe"
-msgstr "Requestor is External or National Societe"
-
-#. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/transport_plan.py:154
 #: model:ir.model,name:logistic_requisition.model_transport_plan
 #: view:logistic.requisition.source:0
 #: field:logistic.requisition.source,transport_plan_id:0
+#, python-format
 msgid "Transport Plan"
 msgstr "Transport Plan"
 
@@ -138,9 +154,14 @@
 msgstr "Delivery Address"
 
 #. module: logistic_requisition
-#: field:logistic.requisition.line,budget_unit_price:0
-msgid "Budget Unit Price"
-msgstr "Budget Unit Price"
+#: help:logistic.requisition.line.assign,logistic_user_id:0
+msgid "Logistic Specialist in charge of the Logistic Requisition Line"
+msgstr "Logistic Specialist in charge of the Logistic Requisition Line"
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:163
+msgid "UoM"
+msgstr "UoM"
 
 #. module: logistic_requisition
 #: view:logistic.requisition:0
@@ -149,6 +170,12 @@
 msgstr "Business Unit Officer"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:262
+#, python-format
+msgid "The cost estimate cannot be created, because no lines are sourced."
+msgstr "The cost estimate cannot be created, because no lines are sourced."
+
+#. module: logistic_requisition
 #: view:logistic.requisition:0
 #: field:logistic.requisition.line,note:0
 msgid "Notes"
@@ -162,9 +189,9 @@
 msgstr "Messages"
 
 #. module: logistic_requisition
-#: constraint:logistic.requisition.source:0
-msgid "The total cost cannot be more than the total budget."
-msgstr "The total cost cannot be more than the total budget."
+#: view:logistic.requisition.line:0
+msgid "Total Proposed"
+msgstr "Total Proposed"
 
 #. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_purchase_order
@@ -172,12 +199,19 @@
 msgstr "Purchase Order"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:142
 #: view:logistic.requisition:0
 #: field:logistic.requisition,analytic_id:0
 msgid "Project"
 msgstr "Project"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:522
+#, python-format
+msgid "Please create source ressource using various source line actions"
+msgstr "Please create source ressource using various source line actions"
+
+#. module: logistic_requisition
 #: help:logistic.requisition.source,date_eta:0
 msgid "Estimated Date of Arrival"
 msgstr "Estimated Date of Arrival"
@@ -202,11 +236,10 @@
 "                    sourced logistic requisition lines."
 
 #. module: logistic_requisition
-#: selection:logistic.requisition,requester_type:0
-#: selection:logistic.requisition.line,requester_type:0
-#: selection:res.partner,requester_type:0
-msgid "External Organization"
-msgstr "External Organization"
+#: selection:logistic.requisition.source,price_is:0
+#: selection:sale.order.line,price_is:0
+msgid "Fixed"
+msgstr "Fixed"
 
 #. module: logistic_requisition
 #: help:logistic.requisition,message_unread:0
@@ -221,9 +254,28 @@
 msgstr "Incoterm Place"
 
 #. module: logistic_requisition
-#: field:logistic.requisition,date_budget_holder:0
-msgid "Budget Holder Validation Date"
-msgstr "Budget Holder Validation Date"
+#: code:addons/logistic_requisition/model/purchase.py:174
+#: code:addons/logistic_requisition/model/purchase.py:194
+#, python-format
+msgid "UserError"
+msgstr "UserError"
+
+#. module: logistic_requisition
+#: field:logistic.requisition.source,unit_cost:0
+msgid "Unit Cost"
+msgstr "Unit Cost"
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:588
+#, python-format
+msgid "Prices for location"
+msgstr "Prices for location"
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1067
+#, python-format
+msgid "The sourcing lines do not have the same delivery address."
+msgstr "The sourcing lines do not have the same delivery address."
 
 #. module: logistic_requisition
 #: field:logistic.requisition,name:0
@@ -244,11 +296,6 @@
 msgstr "Desired Delivery Date"
 
 #. module: logistic_requisition
-#: view:logistic.requisition.line:0
-msgid "View Stock"
-msgstr "View Stock"
-
-#. module: logistic_requisition
 #: field:logistic.requisition,consignee_id:0
 msgid "Consignee"
 msgstr "Consignee"
@@ -293,19 +340,17 @@
 msgstr "Partner"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/purchase.py:178
+#, python-format
+msgid "You cannot change the informations because this PO line is already linked to a Logistic Requsition Line %s marked as sourced or quoted."
+msgstr "You cannot change the informations because this PO line is already linked to a Logistic Requsition Line %s marked as sourced or quoted."
+
+#. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_sale_order
 msgid "Sales Order"
 msgstr "Sales Order"
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: field:logistic.requisition,amount_total:0
-#: view:logistic.requisition.line:0
-#: view:logistic.requisition.source:0
-msgid "Total Budget"
-msgstr "Total Budget"
-
-#. module: logistic_requisition
 #: help:logistic.requisition,incoterm_id:0
 msgid "International Commercial Terms are a series of predefined commercial terms used in international transactions."
 msgstr "International Commercial Terms are a series of predefined commercial terms used in international transactions."
@@ -365,6 +410,11 @@
 msgstr "State"
 
 #. module: logistic_requisition
+#: view:logistic.requisition.source.create.requisition:0
+msgid "Which pricelist / currency you want ?"
+msgstr "Which pricelist / currency you want ?"
+
+#. module: logistic_requisition
 #: field:logistic.requisition,message_follower_ids:0
 #: field:logistic.requisition.line,message_follower_ids:0
 #: field:logistic.requisition.source,message_follower_ids:0
@@ -393,17 +443,13 @@
 msgstr "Unassigned Requisition"
 
 #. module: logistic_requisition
-#: selection:logistic.requisition,requester_type:0
-#: selection:logistic.requisition.line,requester_type:0
-#: selection:res.partner,requester_type:0
-msgid "National Society"
-msgstr "National Society"
-
-#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1146
+#: code:addons/logistic_requisition/wizard/logistic_line_create_requisition.py:63
 #: model:ir.model,name:logistic_requisition.model_purchase_requisition
 #: view:logistic.requisition.line:0
 #: view:logistic.requisition.source:0
 #: field:logistic.requisition.source,po_requisition_id:0
+#, python-format
 msgid "Purchase Requisition"
 msgstr "Call for Bids"
 
@@ -418,14 +464,9 @@
 msgstr "Skipped"
 
 #. module: logistic_requisition
-#: field:logistic.requisition.source,selected_po_id:0
-msgid "Selected Purchase Order"
-msgstr "Selected Purchase Order"
-
-#. module: logistic_requisition
-#: constraint:logistic.requisition.source:0
-msgid "A purchase requisition cannot be linked to lines of different logistics requisitions."
-msgstr "A call for bids cannot be linked to lines of different logistics requisitions."
+#: help:logistic.requisition.line,logistic_user_id:0
+msgid "User in charge of the Logistic Requisition Line"
+msgstr "User in charge of the Logistic Requisition Line"
 
 #. module: logistic_requisition
 #: model:logistic.requisition.cancel.reason,name:logistic_requisition.cancel_reason_other_provider
@@ -443,9 +484,27 @@
 msgstr "Skipped Lines"
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-msgid "View Sourcing Lines"
-msgstr "View Sourcing Lines"
+#: field:logistic.requisition.source,selected_bid_id:0
+msgid "Selected Bid"
+msgstr "Selected Bid"
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:566
+#, python-format
+msgid "Stock by Location"
+msgstr "Stock by Location"
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1092
+#, python-format
+msgid "The logistic requisition sourcing line %s is already linked to a Purchase Requisition."
+msgstr "The logistic requisition sourcing line %s is already linked to a Purchase Requisition."
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:219
+#, python-format
+msgid "Cannot create a cost estimate because:"
+msgstr "Cannot create a cost estimate because:"
 
 #. module: logistic_requisition
 #: field:logistic.requisition.source,price_is:0
@@ -459,6 +518,12 @@
 msgstr "Reset to Draft"
 
 #. module: logistic_requisition
+#: view:logistic.requisition:0
+#: view:logistic.requisition.line:0
+msgid "Show cost estimate only"
+msgstr "Show cost estimate only"
+
+#. module: logistic_requisition
 #: view:logistic.requisition.cost.estimate:0
 msgid "The lines in the Skipped section will be ignored\n"
 "                    because they are not sourced or are already linked\n"
@@ -468,11 +533,22 @@
 "                    to a cost estimate."
 
 #. module: logistic_requisition
+#: field:logistic.requisition,pricelist_id:0
+msgid "Pricelist"
+msgstr "Pricelist"
+
+#. module: logistic_requisition
 #: field:logistic.requisition.source,dispatch_location_id:0
 msgid "Dispatch From"
 msgstr "Dispatch From"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1113
+#, python-format
+msgid "There should be at least one selectedline with procurement method Procurement"
+msgstr "There should be at least one selectedline with procurement method Procurement"
+
+#. module: logistic_requisition
 #: view:logistic.requisition:0
 #: field:logistic.requisition.line,logistic_user_id:0
 msgid "Assigned To"
@@ -489,10 +565,25 @@
 msgstr "draft,confirmed,exception"
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "Show cost estimate only"
-msgstr "Show cost estimate only"
+#: field:logistic.requisition.source,transport_applicable:0
+msgid "Transport Applicable"
+msgstr "Transport Applicable"
+
+#. module: logistic_requisition
+#: field:logistic.requisition.source,default_source_address:0
+msgid "Default source"
+msgstr "Default source"
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:141
+msgid "Cost estimate only"
+msgstr "Cost estimate only"
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/purchase.py:198
+#, python-format
+msgid "You cannot delete this PO line because it is already linked to a Logistic Requsition Line %s marked as sourced or quoted."
+msgstr "You cannot delete this PO line because it is already linked to a Logistic Requsition Line %s marked as sourced or quoted."
 
 #. module: logistic_requisition
 #: view:logistic.requisition:0
@@ -521,6 +612,11 @@
 msgstr "Logistic Requisition Reference must be unique!"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:192
+msgid "Signature"
+msgstr "Signature"
+
+#. module: logistic_requisition
 #: view:logistic.requisition.line:0
 msgid "Country:"
 msgstr "Country:"
@@ -531,14 +627,21 @@
 msgstr "Your assigned Requisition"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:196
+#, python-format
+msgid "Sourcing %s: no account code has been stored"
+msgstr "Sourcing %s: no account code has been stored"
+
+#. module: logistic_requisition
 #: field:logistic.requisition.source,proposed_qty:0
 msgid "Proposed Qty"
 msgstr "Proposed Qty"
 
 #. module: logistic_requisition
-#: field:purchase.order.line,po_line_from_bid_ids:0
-msgid "Lines generated by the bid"
-msgstr "Lines generated by the bid"
+#: selection:logistic.requisition.source,price_is:0
+#: selection:sale.order.line,price_is:0
+msgid "Estimated"
+msgstr "Estimated"
 
 #. module: logistic_requisition
 #: model:ir.actions.act_window,name:logistic_requisition.action_requisition_line_assign
@@ -552,19 +655,32 @@
 msgstr "Purchase Cancel Reasons"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1045
+#, python-format
+msgid "The lines are not assigned to the same User."
+msgstr "The lines are not assigned to the same User."
+
+#. module: logistic_requisition
 #: constraint:logistic.requisition.cost.estimate:0
 msgid "All the lines should belong to the same requisition."
 msgstr "All the lines should belong to the same requisition."
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1118
+#, python-format
+msgid "Selected line procurement method should be procurement or other"
+msgstr "Selected line procurement method should be procurement or other"
+
+#. module: logistic_requisition
 #: view:logistic.requisition:0
 msgid "Delivery Date"
 msgstr "Delivery Date"
 
 #. module: logistic_requisition
-#: field:logistic.requisition,budget_holder_id:0
-msgid "Budget Holder"
-msgstr "Budget Holder"
+#: model:ir.actions.act_window,name:logistic_requisition.action_logistic_requisition_cancel
+#: view:logistic.requisition.cancel:0
+msgid "Reason for the cancellation"
+msgstr "Reason for the cancellation"
 
 #. module: logistic_requisition
 #: constraint:logistic.requisition.source:0
@@ -573,7 +689,6 @@
 
 #. module: logistic_requisition
 #: view:logistic.requisition.source:0
-#: field:purchase.requisition,logistic_requisition_source_ids:0
 msgid "Logistic Requisition Sourcing Lines"
 msgstr "Logistic Requisition Sourcing Lines"
 
@@ -583,8 +698,11 @@
 msgstr "Line's State"
 
 #. module: logistic_requisition
+#: view:logistic.requisition:0
 #: field:logistic.requisition,currency_id:0
+#: view:logistic.requisition.line:0
 #: field:logistic.requisition.line,currency_id:0
+#: field:logistic.requisition.source,currency_id:0
 msgid "Currency"
 msgstr "Currency"
 
@@ -600,36 +718,53 @@
 msgstr "Incoterm Place of Delivery. International Commercial Terms are a series of predefined commercial terms used in international transactions."
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:191
+#, python-format
+msgid "Sourcing %s: no quantity has been proposed"
+msgstr "Sourcing %s: no quantity has been proposed"
+
+#. module: logistic_requisition
 #: model:ir.actions.act_window,name:logistic_requisition.action_logistic_requisition
 #: model:ir.ui.menu,name:logistic_requisition.menu_logistic_requisition
 msgid "Requisitions"
 msgstr "Requisitions"
 
 #. module: logistic_requisition
-#: field:logistic.requisition,date_finance_officer:0
-msgid "Finance Officer Validation Date"
-msgstr "Finance Officer Validation Date"
-
-#. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "Internal (Federation)"
-msgstr "Internal (Federation)"
-
-#. module: logistic_requisition
-#: field:logistic.requisition.source,transport_applicable:0
-msgid "Transport Applicable"
-msgstr "Transport Applicable"
-
-#. module: logistic_requisition
-#: field:logistic.requisition.source,purchase_requisition_line_ids:0
-msgid "Purchase Requisition Lines"
-msgstr "Call for Bids Lines"
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:149
+msgid "Yes"
+msgstr "Yes"
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1115
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1120
+#, python-format
+msgid "Please correct selection"
+msgstr "Please correct selection"
+
+#. module: logistic_requisition
+#: field:logistic.requisition.source,offer_ids:0
+msgid "Sales Quotation Lines"
+msgstr "Sales Quotation Lines"
+
+#. module: logistic_requisition
+#: constraint:logistic.requisition.source:0
+msgid "A purchase requisition cannot be linked to lines of different logistics requisitions."
+msgstr "A call for bids cannot be linked to lines of different logistics requisitions."
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:136
+msgid "Logistic requisition"
+msgstr "Logistic requisition"
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:190
+msgid "Requesting entity"
+msgstr "Requesting entity"
 
 #. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_purchase_order_line
-#: field:logistic.requisition.source,bid_line_id:0
 #: field:logistic.requisition.source,purchase_line_id:0
+#: field:logistic.requisition.source,selected_bid_line_id:0
 msgid "Purchase Order Line"
 msgstr "Purchase Order Line"
 
@@ -644,6 +779,12 @@
 msgstr "Assigned Specialist"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:521
+#, python-format
+msgid "line %s is not sourced"
+msgstr "line %s is not sourced"
+
+#. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_logistic_requisition_source_transport_plan
 msgid "Create a transport plan for logistic requisition source lines"
 msgstr "Create a transport plan for logistic requisition source lines"
@@ -703,18 +844,13 @@
 msgstr "Activity Code"
 
 #. module: logistic_requisition
+#: field:purchase.requisition.line,logistic_requisition_source_ids:0
 #: view:transport.plan:0
 #: field:transport.plan,logistic_requisition_source_ids:0
 msgid "Logistic Requisition Source Lines"
 msgstr "Logistic Requisition Source Lines"
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "External (NS, Others)"
-msgstr "External (NS, Others)"
-
-#. module: logistic_requisition
 #: field:logistic.requisition.source.transport.plan,transport_estimated_cost:0
 msgid "Transportation Estimated Costs"
 msgstr "Transportation Estimated Costs"
@@ -750,16 +886,6 @@
 msgstr "offers"
 
 #. module: logistic_requisition
-#: field:purchase.requisition.line,logistic_requisition_source_id:0
-msgid "Logistic Requisition Source Line"
-msgstr "Logistic Requisition Source Line"
-
-#. module: logistic_requisition
-#: view:logistic.requisition:0
-msgid "Validation"
-msgstr "Validation"
-
-#. module: logistic_requisition
 #: help:logistic.requisition.source.transport.plan,date_eta:0
 msgid "Estimated Date of Arrival if not set requisition ETA will be used"
 msgstr "Estimated Date of Arrival if not set requisition ETA will be used"
@@ -772,9 +898,15 @@
 msgstr "Is a Follower"
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-msgid " validated on "
-msgstr " validated on "
+#: code:addons/logistic_requisition/model/sale_order.py:45
+#, python-format
+msgid "The logistic requisition line %s has no purchase order line."
+msgstr "The logistic requisition line %s has no purchase order line."
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:187
+msgid "Approval"
+msgstr "Approval"
 
 #. module: logistic_requisition
 #: help:logistic.requisition.source,date_etd:0
@@ -788,6 +920,11 @@
 msgstr "Create Call for Bids From Requisition Source"
 
 #. module: logistic_requisition
+#: help:logistic.requisition,pricelist_id:0
+msgid "Pricelist that represent the currency for current logistic request."
+msgstr "Pricelist that represent the currency for current logistic request."
+
+#. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_stock_incoterms
 msgid "Incoterms"
 msgstr "Incoterms"
@@ -813,7 +950,6 @@
 
 #. module: logistic_requisition
 #: view:logistic.requisition:0
-#: field:logistic.requisition,partner_id:0
 msgid "Requesting Entity"
 msgstr "Requesting Entity"
 
@@ -848,6 +984,17 @@
 msgstr "View Prices"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1044
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1052
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1059
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1066
+#: code:addons/logistic_requisition/model/sale_order.py:44
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:261
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: logistic_requisition
 #: model:logistic.requisition.cancel.reason,name:logistic_requisition.cancel_reason_no_service_needed
 msgid "No service needed anymore"
 msgstr "No service needed anymore"
@@ -859,11 +1006,7 @@
 msgstr "Assign"
 
 #. module: logistic_requisition
-#: field:logistic.requisition.source,unit_cost:0
-msgid "Unit Cost"
-msgstr "Unit Cost"
-
-#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:162
 #: view:logistic.requisition:0
 #: field:logistic.requisition.line,requested_qty:0
 msgid "Quantity"
@@ -891,12 +1034,9 @@
 msgstr "Line Sourced"
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: field:logistic.requisition,requester_type:0
-#: view:logistic.requisition.line:0
-#: field:logistic.requisition.line,requester_type:0
-msgid "Type of Requestor"
-msgstr "Type of Requestor"
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:160
+msgid "Number"
+msgstr "Number"
 
 #. module: logistic_requisition
 #: view:logistic.requisition.source.create.requisition:0
@@ -904,6 +1044,12 @@
 msgstr "Create Requisition"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1091
+#, python-format
+msgid "Existing"
+msgstr "Existing"
+
+#. module: logistic_requisition
 #: view:logistic.requisition.line:0
 #: selection:logistic.requisition.line,state:0
 #: selection:logistic.requisition.source,state:0
@@ -911,9 +1057,10 @@
 msgstr "Assigned"
 
 #. module: logistic_requisition
-#: field:logistic.requisition.line,budget_tot_price:0
-msgid "Budget Total Price"
-msgstr "Budget Total Price"
+#: view:logistic.requisition.line:0
+#: view:logistic.requisition.source:0
+msgid "Total Budget"
+msgstr "Total Budget"
 
 #. module: logistic_requisition
 #: view:logistic.requisition:0
@@ -947,16 +1094,9 @@
 msgstr "Create Cost Estimate"
 
 #. module: logistic_requisition
-#: selection:logistic.requisition.source,price_is:0
-#: selection:sale.order.line,price_is:0
-msgid "Estimated"
-msgstr "Estimated"
-
-#. module: logistic_requisition
-#: model:ir.actions.act_window,name:logistic_requisition.action_logistic_requisition_cancel
-#: view:logistic.requisition.cancel:0
-msgid "Reason for the cancellation"
-msgstr "Reason for the cancellation"
+#: field:purchase.order.line,po_line_from_bid_ids:0
+msgid "Lines generated by the bid"
+msgstr "Lines generated by the bid"
 
 #. module: logistic_requisition
 #: field:logistic.requisition.line,name:0
@@ -979,18 +1119,16 @@
 msgstr "Your assigned Requisition Line"
 
 #. module: logistic_requisition
-#: selection:logistic.requisition,requester_type:0
-#: selection:logistic.requisition.line,requester_type:0
-#: selection:res.partner,requester_type:0
-msgid "Federation (internal)"
-msgstr "Federation (internal)"
-
-#. module: logistic_requisition
 #: view:logistic.requisition.line:0
 msgid "Req. Date:"
 msgstr "Req. Date:"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:182
+msgid "General Remarks"
+msgstr "General Remarks"
+
+#. module: logistic_requisition
 #: view:logistic.requisition:0
 #: field:logistic.requisition,cost_estimate_only:0
 #: view:logistic.requisition.line:0
@@ -1014,9 +1152,9 @@
 msgstr "Supplier Address"
 
 #. module: logistic_requisition
-#: field:res.partner,requester_type:0
-msgid "Requester Type"
-msgstr "Requester Type"
+#: selection:logistic.requisition.source,procurement_method:0
+msgid "Other"
+msgstr "Other"
 
 #. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_logistic_requisition_line
@@ -1042,6 +1180,7 @@
 
 #. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_purchase_requisition_line
+#: field:logistic.requisition.source,purchase_requisition_line_id:0
 msgid "Purchase Requisition Line"
 msgstr "Call for Bids Line"
 
@@ -1058,6 +1197,7 @@
 msgstr "Product"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:161
 #: field:logistic.requisition.line,description:0
 msgid "Description"
 msgstr "Description"
@@ -1069,10 +1209,10 @@
 msgstr "Procurement"
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "Requestor is the Federation"
-msgstr "Requestor is the Federation"
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1053
+#, python-format
+msgid "The sourcing lines do not belong to the same company."
+msgstr "The sourcing lines do not belong to the same company."
 
 #. module: logistic_requisition
 #: help:transport.plan,product_id:0
@@ -1080,6 +1220,12 @@
 msgstr "Product used for the transport, will be used in the cost estimate"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1097
+#, python-format
+msgid "The sourcing line %d does not have any product defined, please choose one."
+msgstr "The sourcing line %d does not have any product defined, please choose one."
+
+#. module: logistic_requisition
 #: field:logistic.requisition.source.transport.plan,transport_mode_id:0
 msgid "Transport by"
 msgstr "Transport by"
@@ -1090,9 +1236,15 @@
 msgstr "Cancellation reason:"
 
 #. module: logistic_requisition
-#: help:logistic.requisition.line,logistic_user_id:0
-msgid "User in charge of the Logistic Requisition Line"
-msgstr "User in charge of the Logistic Requisition Line"
+#: code:addons/logistic_requisition/model/logistic_requisition.py:632
+#, python-format
+msgid "Logistic Requisition Line %s Assigned"
+msgstr "Logistic Requisition Line %s Assigned"
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:191
+msgid "Requested date"
+msgstr "Requested date"
 
 #. module: logistic_requisition
 #: view:logistic.requisition.line:0
@@ -1100,9 +1252,9 @@
 msgstr "My Requisition Line"
 
 #. module: logistic_requisition
-#: field:logistic.requisition,allowed_budget:0
-msgid "Allowed Budget"
-msgstr "Allowed Budget"
+#: field:logistic.requisition,partner_id:0
+msgid "Customer"
+msgstr "Customer"
 
 #. module: logistic_requisition
 #: model:ir.actions.act_window,name:logistic_requisition.action_logistic_requisition_source
@@ -1110,11 +1262,6 @@
 msgstr "Requisitions Sourcing Lines"
 
 #. module: logistic_requisition
-#: help:logistic.requisition.line.assign,logistic_user_id:0
-msgid "Logistic Specialist in charge of the Logistic Requisition Line"
-msgstr "Logistic Specialist in charge of the Logistic Requisition Line"
-
-#. module: logistic_requisition
 #: field:logistic.requisition,line_ids:0
 msgid "Products to Purchase"
 msgstr "Products to Purchase"
@@ -1125,6 +1272,7 @@
 msgstr "Mobilization Officer or Logistic Coordinator in charge of the Logistic Requisition"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:143
 #: view:logistic.requisition:0
 #: field:logistic.requisition,country_id:0
 #: view:logistic.requisition.line:0
@@ -1133,8 +1281,11 @@
 msgstr "Country"
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:693
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:293
 #: view:logistic.requisition.cost.estimate:0
 #: field:logistic.requisition.line,cost_estimate_id:0
+#, python-format
 msgid "Cost Estimate"
 msgstr "Cost Estimate"
 
@@ -1154,17 +1305,13 @@
 msgstr "Product UoM"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:144
 #: view:logistic.requisition:0
 #: field:logistic.requisition,date:0
 msgid "Requisition Date"
 msgstr "Requisition Date"
 
 #. module: logistic_requisition
-#: view:logistic.requisition.line:0
-msgid "Total Proposed"
-msgstr "Total Proposed"
-
-#. module: logistic_requisition
 #: view:logistic.requisition.cancel:0
 msgid "Choose the reason for the cancellation of the\n"
 "                    logistic requisition."
@@ -1172,6 +1319,11 @@
 "                    logistic requisition."
 
 #. module: logistic_requisition
+#: field:logistic.requisition.source,proposed_product_id:0
+msgid "Proposed Product"
+msgstr "Proposed Product"
+
+#. module: logistic_requisition
 #: view:logistic.requisition.line.assign:0
 msgid "Select the assignee"
 msgstr "Select the assignee"
@@ -1179,6 +1331,7 @@
 #. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_logistic_requisition_source
 #: view:logistic.requisition.source:0
+#: field:purchase.order.line,lr_source_line_id:0
 msgid "Logistic Requisition Source"
 msgstr "Logistic Requisition Source"
 
@@ -1197,6 +1350,11 @@
 msgstr "Messages and communication history"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:102
+msgid "Shipping address:"
+msgstr "Shipping address:"
+
+#. module: logistic_requisition
 #: view:logistic.requisition.source.create.requisition:0
 msgid " Please note that: \n"
 " \n"
@@ -1224,7 +1382,13 @@
 msgstr "Sourced"
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:178
+msgid "Delivery Remarks"
+msgstr "Delivery Remarks"
+
+#. module: logistic_requisition
 #: field:logistic.requisition.line,account_code:0
+#: field:sale.order.line,account_code:0
 msgid "Account Code"
 msgstr "Account Code"
 
@@ -1234,6 +1398,17 @@
 msgstr "Generated from bid"
 
 #. module: logistic_requisition
+#: field:logistic.requisition.source.create.requisition,pricelist_id:0
+msgid "Pricelist / Currency"
+msgstr "Pricelist / Currency"
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1060
+#, python-format
+msgid "The sourcing lines do not have the same consignee."
+msgstr "The sourcing lines do not have the same consignee."
+
+#. module: logistic_requisition
 #: view:logistic.requisition.cancel:0
 #: view:logistic.requisition.cost.estimate:0
 #: view:logistic.requisition.line.assign:0
@@ -1243,7 +1418,24 @@
 msgstr "or"
 
 #. module: logistic_requisition
+#: view:logistic.requisition:0
+msgid "View Sourcing Lines"
+msgstr "View Sourcing Lines"
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1096
+#, python-format
+msgid "Missing information"
+msgstr "Missing information"
+
+#. module: logistic_requisition
 #: view:logistic.requisition.line:0
 msgid "Open Cost Estimate"
 msgstr "Open Cost Estimate"
 
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:105
+#, python-format
+msgid "Transport from %s to %s by %s (Ref. %s)"
+msgstr "Transport from %s to %s by %s (Ref. %s)"
+

=== modified file 'logistic_requisition/i18n/logistic_requisition.pot'
--- logistic_requisition/i18n/logistic_requisition.pot	2013-08-29 09:53:01 +0000
+++ logistic_requisition/i18n/logistic_requisition.pot	2014-05-07 09:53:02 +0000
@@ -1,13 +1,13 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* logistic_requisition
+#       * logistic_requisition
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-29 09:50+0000\n"
-"PO-Revision-Date: 2013-08-29 09:50+0000\n"
+"POT-Creation-Date: 2014-02-04 13:09+0000\n"
+"PO-Revision-Date: 2014-02-04 13:09+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,13 +21,13 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition.source,offer_ids:0
-msgid "Sales Quotation Lines"
+#: field:logistic.requisition.line,amount_total:0
+msgid "Total Amount"
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition,finance_officer_id:0
-msgid "Finance Officer"
+#: view:logistic.requisition.line:0
+msgid "View Stock"
 msgstr ""
 
 #. module: logistic_requisition
@@ -49,6 +49,11 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:140
+msgid "Preferred transport"
+msgstr ""
+
+#. module: logistic_requisition
 #: model:ir.actions.act_window,name:logistic_requisition.act_window_requisition_source_transport
 #: model:ir.actions.act_window,name:logistic_requisition.action_requisition_source_transport
 msgid "Create Transport Plan"
@@ -70,9 +75,19 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: selection:logistic.requisition.source,price_is:0
-#: selection:sale.order.line,price_is:0
-msgid "Fixed"
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:119
+msgid "Consignee address:"
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:634
+#, python-format
+msgid "This new requisition concerns %s and is due for %s."
+msgstr ""
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:139
+msgid "Desired delivery date"
 msgstr ""
 
 #. module: logistic_requisition
@@ -93,6 +108,11 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:149
+msgid "No"
+msgstr ""
+
+#. module: logistic_requisition
 #: selection:logistic.requisition.source,procurement_method:0
 msgid "Framework Agreement"
 msgstr ""
@@ -114,15 +134,11 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "Requestor is External or National Societe"
-msgstr ""
-
-#. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/transport_plan.py:154
 #: model:ir.model,name:logistic_requisition.model_transport_plan
 #: view:logistic.requisition.source:0
 #: field:logistic.requisition.source,transport_plan_id:0
+#, python-format
 msgid "Transport Plan"
 msgstr ""
 
@@ -138,8 +154,13 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition.line,budget_unit_price:0
-msgid "Budget Unit Price"
+#: help:logistic.requisition.line.assign,logistic_user_id:0
+msgid "Logistic Specialist in charge of the Logistic Requisition Line"
+msgstr ""
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:163
+msgid "UoM"
 msgstr ""
 
 #. module: logistic_requisition
@@ -149,6 +170,12 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:262
+#, python-format
+msgid "The cost estimate cannot be created, because no lines are sourced."
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition:0
 #: field:logistic.requisition.line,note:0
 msgid "Notes"
@@ -162,8 +189,8 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: constraint:logistic.requisition.source:0
-msgid "The total cost cannot be more than the total budget."
+#: view:logistic.requisition.line:0
+msgid "Total Proposed"
 msgstr ""
 
 #. module: logistic_requisition
@@ -172,12 +199,19 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:142
 #: view:logistic.requisition:0
 #: field:logistic.requisition,analytic_id:0
 msgid "Project"
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:522
+#, python-format
+msgid "Please create source ressource using various source line actions"
+msgstr ""
+
+#. module: logistic_requisition
 #: help:logistic.requisition.source,date_eta:0
 msgid "Estimated Date of Arrival"
 msgstr ""
@@ -201,10 +235,9 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: selection:logistic.requisition,requester_type:0
-#: selection:logistic.requisition.line,requester_type:0
-#: selection:res.partner,requester_type:0
-msgid "External Organization"
+#: selection:logistic.requisition.source,price_is:0
+#: selection:sale.order.line,price_is:0
+msgid "Fixed"
 msgstr ""
 
 #. module: logistic_requisition
@@ -220,8 +253,27 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition,date_budget_holder:0
-msgid "Budget Holder Validation Date"
+#: code:addons/logistic_requisition/model/purchase.py:174
+#: code:addons/logistic_requisition/model/purchase.py:194
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: logistic_requisition
+#: field:logistic.requisition.source,unit_cost:0
+msgid "Unit Cost"
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:588
+#, python-format
+msgid "Prices for location"
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1067
+#, python-format
+msgid "The sourcing lines do not have the same delivery address."
 msgstr ""
 
 #. module: logistic_requisition
@@ -243,11 +295,6 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition.line:0
-msgid "View Stock"
-msgstr ""
-
-#. module: logistic_requisition
 #: field:logistic.requisition,consignee_id:0
 msgid "Consignee"
 msgstr ""
@@ -292,19 +339,17 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/purchase.py:178
+#, python-format
+msgid "You cannot change the informations because this PO line is already linked to a Logistic Requsition Line %s marked as sourced or quoted."
+msgstr ""
+
+#. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_sale_order
 msgid "Sales Order"
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: field:logistic.requisition,amount_total:0
-#: view:logistic.requisition.line:0
-#: view:logistic.requisition.source:0
-msgid "Total Budget"
-msgstr ""
-
-#. module: logistic_requisition
 #: help:logistic.requisition,incoterm_id:0
 msgid "International Commercial Terms are a series of predefined commercial terms used in international transactions."
 msgstr ""
@@ -364,6 +409,11 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: view:logistic.requisition.source.create.requisition:0
+msgid "Which pricelist / currency you want ?"
+msgstr ""
+
+#. module: logistic_requisition
 #: field:logistic.requisition,message_follower_ids:0
 #: field:logistic.requisition.line,message_follower_ids:0
 #: field:logistic.requisition.source,message_follower_ids:0
@@ -392,17 +442,13 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: selection:logistic.requisition,requester_type:0
-#: selection:logistic.requisition.line,requester_type:0
-#: selection:res.partner,requester_type:0
-msgid "National Society"
-msgstr ""
-
-#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1146
+#: code:addons/logistic_requisition/wizard/logistic_line_create_requisition.py:63
 #: model:ir.model,name:logistic_requisition.model_purchase_requisition
 #: view:logistic.requisition.line:0
 #: view:logistic.requisition.source:0
 #: field:logistic.requisition.source,po_requisition_id:0
+#, python-format
 msgid "Purchase Requisition"
 msgstr ""
 
@@ -417,13 +463,8 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition.source,selected_po_id:0
-msgid "Selected Purchase Order"
-msgstr ""
-
-#. module: logistic_requisition
-#: constraint:logistic.requisition.source:0
-msgid "A purchase requisition cannot be linked to lines of different logistics requisitions."
+#: help:logistic.requisition.line,logistic_user_id:0
+msgid "User in charge of the Logistic Requisition Line"
 msgstr ""
 
 #. module: logistic_requisition
@@ -442,8 +483,26 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-msgid "View Sourcing Lines"
+#: field:logistic.requisition.source,selected_bid_id:0
+msgid "Selected Bid"
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:566
+#, python-format
+msgid "Stock by Location"
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1092
+#, python-format
+msgid "The logistic requisition sourcing line %s is already linked to a Purchase Requisition."
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:219
+#, python-format
+msgid "Cannot create a cost estimate because:"
 msgstr ""
 
 #. module: logistic_requisition
@@ -458,6 +517,12 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: view:logistic.requisition:0
+#: view:logistic.requisition.line:0
+msgid "Show cost estimate only"
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition.cost.estimate:0
 msgid "The lines in the Skipped section will be ignored\n"
 "                    because they are not sourced or are already linked\n"
@@ -465,11 +530,22 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: field:logistic.requisition,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: logistic_requisition
 #: field:logistic.requisition.source,dispatch_location_id:0
 msgid "Dispatch From"
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1113
+#, python-format
+msgid "There should be at least one selectedline with procurement method Procurement"
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition:0
 #: field:logistic.requisition.line,logistic_user_id:0
 msgid "Assigned To"
@@ -486,9 +562,24 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "Show cost estimate only"
+#: field:logistic.requisition.source,transport_applicable:0
+msgid "Transport Applicable"
+msgstr ""
+
+#. module: logistic_requisition
+#: field:logistic.requisition.source,default_source_address:0
+msgid "Default source"
+msgstr ""
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:141
+msgid "Cost estimate only"
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/purchase.py:198
+#, python-format
+msgid "You cannot delete this PO line because it is already linked to a Logistic Requsition Line %s marked as sourced or quoted."
 msgstr ""
 
 #. module: logistic_requisition
@@ -518,6 +609,11 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:192
+msgid "Signature"
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition.line:0
 msgid "Country:"
 msgstr ""
@@ -528,13 +624,20 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:196
+#, python-format
+msgid "Sourcing %s: no account code has been stored"
+msgstr ""
+
+#. module: logistic_requisition
 #: field:logistic.requisition.source,proposed_qty:0
 msgid "Proposed Qty"
 msgstr ""
 
 #. module: logistic_requisition
-#: field:purchase.order.line,po_line_from_bid_ids:0
-msgid "Lines generated by the bid"
+#: selection:logistic.requisition.source,price_is:0
+#: selection:sale.order.line,price_is:0
+msgid "Estimated"
 msgstr ""
 
 #. module: logistic_requisition
@@ -549,18 +652,31 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1045
+#, python-format
+msgid "The lines are not assigned to the same User."
+msgstr ""
+
+#. module: logistic_requisition
 #: constraint:logistic.requisition.cost.estimate:0
 msgid "All the lines should belong to the same requisition."
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1118
+#, python-format
+msgid "Selected line procurement method should be procurement or other"
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition:0
 msgid "Delivery Date"
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition,budget_holder_id:0
-msgid "Budget Holder"
+#: model:ir.actions.act_window,name:logistic_requisition.action_logistic_requisition_cancel
+#: view:logistic.requisition.cancel:0
+msgid "Reason for the cancellation"
 msgstr ""
 
 #. module: logistic_requisition
@@ -570,7 +686,6 @@
 
 #. module: logistic_requisition
 #: view:logistic.requisition.source:0
-#: field:purchase.requisition,logistic_requisition_source_ids:0
 msgid "Logistic Requisition Sourcing Lines"
 msgstr ""
 
@@ -580,8 +695,11 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: view:logistic.requisition:0
 #: field:logistic.requisition,currency_id:0
+#: view:logistic.requisition.line:0
 #: field:logistic.requisition.line,currency_id:0
+#: field:logistic.requisition.source,currency_id:0
 msgid "Currency"
 msgstr ""
 
@@ -597,36 +715,53 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:191
+#, python-format
+msgid "Sourcing %s: no quantity has been proposed"
+msgstr ""
+
+#. module: logistic_requisition
 #: model:ir.actions.act_window,name:logistic_requisition.action_logistic_requisition
 #: model:ir.ui.menu,name:logistic_requisition.menu_logistic_requisition
 msgid "Requisitions"
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition,date_finance_officer:0
-msgid "Finance Officer Validation Date"
-msgstr ""
-
-#. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "Internal (Federation)"
-msgstr ""
-
-#. module: logistic_requisition
-#: field:logistic.requisition.source,transport_applicable:0
-msgid "Transport Applicable"
-msgstr ""
-
-#. module: logistic_requisition
-#: field:logistic.requisition.source,purchase_requisition_line_ids:0
-msgid "Purchase Requisition Lines"
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:149
+msgid "Yes"
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1115
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1120
+#, python-format
+msgid "Please correct selection"
+msgstr ""
+
+#. module: logistic_requisition
+#: field:logistic.requisition.source,offer_ids:0
+msgid "Sales Quotation Lines"
+msgstr ""
+
+#. module: logistic_requisition
+#: constraint:logistic.requisition.source:0
+msgid "A call for bids cannot be linked to lines of different logistics requisitions."
+msgstr ""
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:136
+msgid "Logistic requisition"
+msgstr ""
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:190
+msgid "Requesting entity"
 msgstr ""
 
 #. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_purchase_order_line
-#: field:logistic.requisition.source,bid_line_id:0
 #: field:logistic.requisition.source,purchase_line_id:0
+#: field:logistic.requisition.source,selected_bid_line_id:0
 msgid "Purchase Order Line"
 msgstr ""
 
@@ -641,6 +776,12 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:521
+#, python-format
+msgid "line %s is not sourced"
+msgstr ""
+
+#. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_logistic_requisition_source_transport_plan
 msgid "Create a transport plan for logistic requisition source lines"
 msgstr ""
@@ -695,18 +836,13 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: field:purchase.requisition.line,logistic_requisition_source_ids:0
 #: view:transport.plan:0
 #: field:transport.plan,logistic_requisition_source_ids:0
 msgid "Logistic Requisition Source Lines"
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "External (NS, Others)"
-msgstr ""
-
-#. module: logistic_requisition
 #: field:logistic.requisition.source.transport.plan,transport_estimated_cost:0
 msgid "Transportation Estimated Costs"
 msgstr ""
@@ -742,16 +878,6 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: field:purchase.requisition.line,logistic_requisition_source_id:0
-msgid "Logistic Requisition Source Line"
-msgstr ""
-
-#. module: logistic_requisition
-#: view:logistic.requisition:0
-msgid "Validation"
-msgstr ""
-
-#. module: logistic_requisition
 #: help:logistic.requisition.source.transport.plan,date_eta:0
 msgid "Estimated Date of Arrival if not set requisition ETA will be used"
 msgstr ""
@@ -764,8 +890,14 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-msgid " validated on "
+#: code:addons/logistic_requisition/model/sale_order.py:45
+#, python-format
+msgid "The logistic requisition line %s has no purchase order line."
+msgstr ""
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:187
+msgid "Approval"
 msgstr ""
 
 #. module: logistic_requisition
@@ -780,6 +912,11 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: help:logistic.requisition,pricelist_id:0
+msgid "Pricelist that represent the currency for current logistic request."
+msgstr ""
+
+#. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_stock_incoterms
 msgid "Incoterms"
 msgstr ""
@@ -805,7 +942,6 @@
 
 #. module: logistic_requisition
 #: view:logistic.requisition:0
-#: field:logistic.requisition,partner_id:0
 msgid "Requesting Entity"
 msgstr ""
 
@@ -840,6 +976,17 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1044
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1052
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1059
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1066
+#: code:addons/logistic_requisition/model/sale_order.py:44
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:261
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: logistic_requisition
 #: model:logistic.requisition.cancel.reason,name:logistic_requisition.cancel_reason_no_service_needed
 msgid "No service needed anymore"
 msgstr ""
@@ -851,11 +998,7 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition.source,unit_cost:0
-msgid "Unit Cost"
-msgstr ""
-
-#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:162
 #: view:logistic.requisition:0
 #: field:logistic.requisition.line,requested_qty:0
 msgid "Quantity"
@@ -883,11 +1026,8 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: field:logistic.requisition,requester_type:0
-#: view:logistic.requisition.line:0
-#: field:logistic.requisition.line,requester_type:0
-msgid "Type of Requestor"
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:160
+msgid "Number"
 msgstr ""
 
 #. module: logistic_requisition
@@ -896,6 +1036,12 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1091
+#, python-format
+msgid "Existing"
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition.line:0
 #: selection:logistic.requisition.line,state:0
 #: selection:logistic.requisition.source,state:0
@@ -903,8 +1049,9 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition.line,budget_tot_price:0
-msgid "Budget Total Price"
+#: view:logistic.requisition.line:0
+#: view:logistic.requisition.source:0
+msgid "Total Budget"
 msgstr ""
 
 #. module: logistic_requisition
@@ -939,15 +1086,8 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: selection:logistic.requisition.source,price_is:0
-#: selection:sale.order.line,price_is:0
-msgid "Estimated"
-msgstr ""
-
-#. module: logistic_requisition
-#: model:ir.actions.act_window,name:logistic_requisition.action_logistic_requisition_cancel
-#: view:logistic.requisition.cancel:0
-msgid "Reason for the cancellation"
+#: field:purchase.order.line,po_line_from_bid_ids:0
+msgid "Lines generated by the bid"
 msgstr ""
 
 #. module: logistic_requisition
@@ -971,18 +1111,16 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: selection:logistic.requisition,requester_type:0
-#: selection:logistic.requisition.line,requester_type:0
-#: selection:res.partner,requester_type:0
-msgid "Federation (internal)"
-msgstr ""
-
-#. module: logistic_requisition
 #: view:logistic.requisition.line:0
 msgid "Req. Date:"
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:182
+msgid "General Remarks"
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition:0
 #: field:logistic.requisition,cost_estimate_only:0
 #: view:logistic.requisition.line:0
@@ -1006,8 +1144,8 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: field:res.partner,requester_type:0
-msgid "Requester Type"
+#: selection:logistic.requisition.source,procurement_method:0
+msgid "Other"
 msgstr ""
 
 #. module: logistic_requisition
@@ -1034,6 +1172,7 @@
 
 #. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_purchase_requisition_line
+#: field:logistic.requisition.source,purchase_requisition_line_id:0
 msgid "Purchase Requisition Line"
 msgstr ""
 
@@ -1050,6 +1189,7 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:161
 #: field:logistic.requisition.line,description:0
 msgid "Description"
 msgstr ""
@@ -1061,9 +1201,9 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition:0
-#: view:logistic.requisition.line:0
-msgid "Requestor is the Federation"
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1053
+#, python-format
+msgid "The sourcing lines do not belong to the same company."
 msgstr ""
 
 #. module: logistic_requisition
@@ -1072,6 +1212,12 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1097
+#, python-format
+msgid "The sourcing line %d does not have any product defined, please choose one."
+msgstr ""
+
+#. module: logistic_requisition
 #: field:logistic.requisition.source.transport.plan,transport_mode_id:0
 msgid "Transport by"
 msgstr ""
@@ -1082,8 +1228,14 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: help:logistic.requisition.line,logistic_user_id:0
-msgid "User in charge of the Logistic Requisition Line"
+#: code:addons/logistic_requisition/model/logistic_requisition.py:632
+#, python-format
+msgid "Logistic Requisition Line %s Assigned"
+msgstr ""
+
+#. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:191
+msgid "Requested date"
 msgstr ""
 
 #. module: logistic_requisition
@@ -1092,8 +1244,8 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: field:logistic.requisition,allowed_budget:0
-msgid "Allowed Budget"
+#: field:logistic.requisition,partner_id:0
+msgid "Customer"
 msgstr ""
 
 #. module: logistic_requisition
@@ -1102,11 +1254,6 @@
 msgstr ""
 
 #. module: logistic_requisition
-#: help:logistic.requisition.line.assign,logistic_user_id:0
-msgid "Logistic Specialist in charge of the Logistic Requisition Line"
-msgstr ""
-
-#. module: logistic_requisition
 #: field:logistic.requisition,line_ids:0
 msgid "Products to Purchase"
 msgstr ""
@@ -1117,6 +1264,7 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:143
 #: view:logistic.requisition:0
 #: field:logistic.requisition,country_id:0
 #: view:logistic.requisition.line:0
@@ -1125,8 +1273,11 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:693
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:293
 #: view:logistic.requisition.cost.estimate:0
 #: field:logistic.requisition.line,cost_estimate_id:0
+#, python-format
 msgid "Cost Estimate"
 msgstr ""
 
@@ -1146,23 +1297,24 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:144
 #: view:logistic.requisition:0
 #: field:logistic.requisition,date:0
 msgid "Requisition Date"
 msgstr ""
 
 #. module: logistic_requisition
-#: view:logistic.requisition.line:0
-msgid "Total Proposed"
-msgstr ""
-
-#. module: logistic_requisition
 #: view:logistic.requisition.cancel:0
 msgid "Choose the reason for the cancellation of the\n"
 "                    logistic requisition."
 msgstr ""
 
 #. module: logistic_requisition
+#: field:logistic.requisition.source,proposed_product_id:0
+msgid "Proposed Product"
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition.line.assign:0
 msgid "Select the assignee"
 msgstr ""
@@ -1170,6 +1322,7 @@
 #. module: logistic_requisition
 #: model:ir.model,name:logistic_requisition.model_logistic_requisition_source
 #: view:logistic.requisition.source:0
+#: field:purchase.order.line,lr_source_line_id:0
 msgid "Logistic Requisition Source"
 msgstr ""
 
@@ -1188,6 +1341,11 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:102
+msgid "Shipping address:"
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition.source.create.requisition:0
 msgid " Please note that: \n"
 " \n"
@@ -1208,7 +1366,13 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: report:addons/logistic_requisition/report/logistic_requisition.mako:178
+msgid "Delivery Remarks"
+msgstr ""
+
+#. module: logistic_requisition
 #: field:logistic.requisition.line,account_code:0
+#: field:sale.order.line,account_code:0
 msgid "Account Code"
 msgstr ""
 
@@ -1218,6 +1382,17 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: field:logistic.requisition.source.create.requisition,pricelist_id:0
+msgid "Pricelist / Currency"
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1060
+#, python-format
+msgid "The sourcing lines do not have the same consignee."
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition.cancel:0
 #: view:logistic.requisition.cost.estimate:0
 #: view:logistic.requisition.line.assign:0
@@ -1227,7 +1402,24 @@
 msgstr ""
 
 #. module: logistic_requisition
+#: view:logistic.requisition:0
+msgid "View Sourcing Lines"
+msgstr ""
+
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/model/logistic_requisition.py:1096
+#, python-format
+msgid "Missing information"
+msgstr ""
+
+#. module: logistic_requisition
 #: view:logistic.requisition.line:0
 msgid "Open Cost Estimate"
 msgstr ""
 
+#. module: logistic_requisition
+#: code:addons/logistic_requisition/wizard/cost_estimate.py:105
+#, python-format
+msgid "Transport from %s to %s by %s (Ref. %s)"
+msgstr ""
+ 

=== modified file 'logistic_requisition/model/logistic_requisition.py'
--- logistic_requisition/model/logistic_requisition.py	2014-01-30 16:26:37 +0000
+++ logistic_requisition/model/logistic_requisition.py	2014-05-07 09:53:02 +0000
@@ -158,40 +158,22 @@
             readonly=True,
             required=True
         ),
-        'amount_total': fields.function(
-            lambda self, *args, **kwargs: self._get_amount(*args, **kwargs),
-            digits_compute=dp.get_precision('Account'),
-            string='Total Budget',
-            store={
-                'logistic.requisition': (
-                    lambda self, cr, uid, ids, c=None: ids,
-                    ['line_ids'], 20),
-                'logistic.requisition.line': (
-                    lambda self, *a, **kw: self._store_get_requisition_ids(*a, **kw),
-                    ['requested_qty', 'budget_unit_price', 'budget_tot_price', 'requisition_id'], 20),
-            }),
         'sourced': fields.function(
             lambda self, *args, **kwargs: self._get_sourced(*args, **kwargs),
             string='Sourced',
             type='float'
         ),
-        'allowed_budget': fields.boolean('Allowed Budget'),
-        'currency_id': fields.related('company_id',
+        'pricelist_id': fields.many2one('product.pricelist',
+            'Pricelist',
+            required=True,
+            states=REQ_STATES,
+            help="Pricelist that represent the currency for current logistic request."),
+        'currency_id': fields.related('pricelist_id',
                                       'currency_id',
                                       type='many2one',
                                       relation='res.currency',
                                       string='Currency',
                                       readonly=True),
-        'budget_holder_id': fields.many2one(
-            'res.users',
-            string='Budget Holder'),
-        'date_budget_holder': fields.datetime(
-            'Budget Holder Validation Date'),
-        'finance_officer_id': fields.many2one(
-            'res.users',
-            string='Finance Officer'),
-        'date_finance_officer': fields.datetime(
-            'Finance Officer Validation Date'),
         'cancel_reason_id': fields.many2one(
             'logistic.requisition.cancel.reason',
             string='Reason for Cancellation',
@@ -214,13 +196,6 @@
          'Logistic Requisition Reference must be unique!'),
     ]
 
-    def _get_amount(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        for requisition in self.browse(cr, uid, ids, context=context):
-            res[requisition.id] = sum(line.budget_tot_price for line
-                                      in requisition.line_ids)
-        return res
-
     def _get_sourced(self, cr, uid, ids, name, args, context=None):
         res = {}
         for requisition in self.browse(cr, uid, ids, context=context):
@@ -268,10 +243,6 @@
             line_obj = self.pool.get('logistic.requisition.line')
             line_obj._do_draft(cr, uid, line_ids, context=context)
         vals = {'state': 'draft',
-                'budget_holder_id': False,
-                'date_budget_holder': False,
-                'finance_officer_id': False,
-                'date_finance_officer': False,
                 'cancel_reason_id': False,
                 }
         self.write(cr, uid, ids, vals, context=context)
@@ -296,13 +267,24 @@
         default.update({
             'state': 'draft',
             'name': '/',
-            'budget_holder_id': False,
-            'date_budget_holder': False,
-            'finance_officer_id': False,
-            'date_finance_officer': False,
         })
         return super(logistic_requisition, self).copy(cr, uid, id, default=default, context=context)
 
+    def onchange_partner_id(self, cr, uid, ids, part, context=None):
+        """We take the pricelist of the chosen partner"""
+        values = {'pricelist_id': False}
+        if not part:
+            return {'value': values}
+
+        part = self.pool.get('res.partner').browse(cr, uid, part,
+                                                   context=context)
+        pricelist = part.property_product_pricelist
+        pricelist = pricelist.id if pricelist else False
+        values = {}
+        if pricelist:
+            values['pricelist_id'] = pricelist
+        return {'value': values}
+
     def onchange_consignee_id(self, cr, uid, ids, consignee_id, context=None):
         values = {'consignee_shipping_id': False}
         if not consignee_id:
@@ -425,13 +407,9 @@
                                             'Product UoM',
                                             states=REQUEST_STATES,
                                             required=True),
-        'budget_tot_price': fields.float(
-            'Budget Total Price',
-            states=REQUEST_STATES,
-            digits_compute=dp.get_precision('Account')),
-        'budget_unit_price': fields.function(
-            lambda self, *args, **kwargs: self._get_unit_amount_line(*args, **kwargs),
-            string='Budget Unit Price',
+        'amount_total': fields.function(
+            lambda self, *args, **kwargs: self._get_total_cost(*args, **kwargs),
+            string='Total Amount',
             type="float",
             digits_compute=dp.get_precision('Account'),
             store=True),
@@ -572,11 +550,13 @@
                          context=context, load='_classic_write')
         return list(set([x['requisition_id'] for x in reqs]))
 
-    def _get_unit_amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict, context=None):
+    def _get_total_cost(self, cr, uid, ids, name, args, context=None):
         res = {}
+        for i in ids:
+            res[i] = 0.0
         for line in self.browse(cr, uid, ids, context=context):
-            price = line.budget_tot_price / line.requested_qty
-            res[line.id] = price
+            for source_line in line.source_ids:
+                res[line.id] += source_line.total_cost
         return res
 
     def view_stock_by_location(self, cr, uid, ids, context=None):
@@ -749,25 +729,6 @@
                       'quoted': [('readonly', True)]
                       }
 
-    def _purchase_line_id(self, cr, uid, ids, field_name, arg, context=None):
-        """ For each line, returns the generated purchase line from the
-        purchase requisition.
-        """
-        result = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            result[line.id] = False
-            bid_line = line.bid_line_id
-            if not bid_line:
-                continue
-            po_lines = bid_line.po_line_from_bid_ids
-            if not po_lines:
-                continue
-            assert len(po_lines) == 1, (
-                "We should not have several purchase order lines "
-                "for a logistic requisition line")
-            result[line.id] = po_lines[0].id if po_lines else False
-        return result
-
     def _default_source_address(self, cr, uid, ids, field_name, arg, context=None):
         """Return the default source address depending of the procurment method"""
         res = {}
@@ -818,6 +779,7 @@
             [('procurement', 'Procurement'),
              ('wh_dispatch', 'Warehouse Dispatch'),
              ('fw_agreement', 'Framework Agreement'),
+             ('other', 'Other'),
              ],
             string='Procurement Method',
             required=True,
@@ -859,6 +821,12 @@
             type='float',
             digits_compute=dp.get_precision('Account'),
             store=True),
+        'currency_id': fields.related('requisition_id',
+                                      'currency_id',
+                                      type='many2one',
+                                      relation='res.currency',
+                                      string='Currency',
+                                      readonly=True),
         'transport_applicable': fields.boolean(
             'Transport Applicable',
             states=SOURCED_STATES),
@@ -928,6 +896,8 @@
         'transport_applicable': False,
         'price_is': 'fixed',
         'name': '/',
+        'procurement_method': 'other',
+        'proposed_qty': 1
     }
     _constraints = [
         (lambda self, *a, **kw: self._check_transport_plan(*a, **kw),
@@ -938,9 +908,6 @@
          "A transport plan cannot be linked to lines of different "
          "logistic requisitions.",
          ['transport_plan_id', 'requisition_id']),
-        (lambda self, *a, **kw: self._check_source_lines_total_amount(*a, **kw),
-         'The total cost cannot be more than the total budget.',
-         ['proposed_qty', 'unit_cost', 'requisition_line_id']),
         (lambda self, *a, **kw: self._check_purchase_requisition_unique(*a, **kw),
          "A call for bids cannot be linked to lines of different "
          "logistics requisitions.",
@@ -955,10 +922,16 @@
             return False
         return True
 
+    def _is_sourced_other(self, cr, uid, source, context=None):
+        """Predicate function to test if line on other
+        method are sourced"""
+        return self._is_sourced_procurement(cr, uid, source,
+                                            context=context)
+
     def _is_sourced_wh_dispatch(self, cr, uid, source, context=None):
-       """Predicate function to test if line on warehouse
-       method are sourced"""
-       return True
+        """Predicate function to test if line on warehouse
+        method are sourced"""
+        return True
 
     def _is_sourced(self, cr, uid, source_id, context=None):
         """ check if line is source using predicate function
@@ -1011,32 +984,32 @@
                         return False
         return True
 
-    def _check_source_lines_total_amount(self, cr, uid, ids, context=None):
-        for source in self.browse(cr, uid, ids, context=context):
-            line = source.requisition_line_id
-            total = sum(source.unit_cost * source.proposed_qty
-                        for source in line.source_ids)
-            if total > line.budget_tot_price:
-                return False
-        return True
-
     def _get_purchase_line_id(self, cr, uid, ids, field_name, arg, context=None):
         """ For each line, returns the generated purchase line from the
         purchase requisition.
         """
         result = {}
+        po_line_model = self.pool['purchase.order.line']
+        po_lines = None
         for line in self.browse(cr, uid, ids, context=context):
             result[line.id] = False
-            bid_line = line.selected_bid_line_id
-            if not bid_line:
-                continue
-            po_lines = bid_line.po_line_from_bid_ids
-            if not po_lines:
-                continue
+            if line.selected_bid_line_id:
+                bid_line = line.selected_bid_line_id
+                if not bid_line:
+                    continue
+                po_lines = [x.id for x in bid_line.po_line_from_bid_ids]
+                if not po_lines:
+                    continue
+            else:
+                po_lines = po_line_model.search(cr, uid,
+                                                [('lr_source_line_id', '=', line.id),
+                                                 ('state', '!=', 'cancel')],
+                                                context=context)
             assert len(po_lines) == 1, (
                 "We should not have several purchase order lines "
                 "for a logistic requisition line")
-            result[line.id] = po_lines[0].id if po_lines else False
+            result[line.id] = po_lines[0] if po_lines else False
+
         return result
 
     def create(self, cr, uid, vals, context=None):
@@ -1046,7 +1019,18 @@
         return super(logistic_requisition_source, self).create(cr, uid, vals,
                                                                context=context)
 
-    def _prepare_po_requisition(self, cr, uid, sources, purch_req_lines, context=None):
+    def _get_purchase_pricelist_from_currency(self, cr, uid, currency_id, context=None):
+        """ This method will look for a pricelist of type 'purchase' using
+        the same currency than than the given one.
+        return : ID of product.pricelist type Integer
+        """
+        pricelist_obj = self.pool.get('product.pricelist')
+        pricelist_id = pricelist_obj.search(cr, uid,
+            [('currency_id','=',currency_id),('type','=','purchase')], limit=1)
+        return pricelist_id[0]
+
+    def _prepare_po_requisition(self, cr, uid, sources, purch_req_lines,
+            pricelist=None, context=None):
         company_id = None
         user_id = None
         consignee_id = None
@@ -1084,6 +1068,14 @@
                     _('Error'),
                     _('The sourcing lines do not have the '
                       'same delivery address.'))
+            line_pricelist_id = self._get_purchase_pricelist_from_currency(
+                cr,
+                uid,
+                line.requisition_id.pricelist_id.currency_id.id,
+                context=context
+                )
+            if pricelist is None:
+                pricelist = line_pricelist_id
         return {'user_id': user_id or uid,
                 'company_id': company_id,
                 'consignee_id': consignee_id,
@@ -1092,6 +1084,8 @@
                 'origin': ", ".join(origin),
                 'req_incoterm_id': line.requisition_id.incoterm_id.id,
                 'req_incoterm_address': line.requisition_id.incoterm_address,
+                'pricelist_id': pricelist,
+                'schedule_date': line.requisition_id.date_delivery,
                 }
 
     def _prepare_po_requisition_line(self, cr, uid, line, context=None):
@@ -1113,17 +1107,27 @@
                 'logistic_requisition_source_ids': [(4, line.id)],
                 }
 
-    def _action_create_po_requisition(self, cr, uid, ids, context=None):
+    def _action_create_po_requisition(self, cr, uid, ids, pricelist=None, context=None):
         purch_req_obj = self.pool.get('purchase.requisition')
         purch_req_lines = []
         lines = self.browse(cr, uid, ids, context=context)
+        if not next((x for x in lines
+                     if x.procurement_method == 'procurement'), None):
+            raise orm.except_orm(_('There should be at least one selected'
+                                   ' line with procurement method Procurement'),
+                                 _('Please correct selection'))
         for line in lines:
+            if line.procurement_method not in ('other', 'procurement'):
+                raise orm.except_orm(_('Selected line procurement method should'
+                                       ' be procurement or other'),
+                                     _('Please correct selection'))
             vals = self._prepare_po_requisition_line(cr, uid, line,
                                                      context=context)
             purch_req_lines.append(vals)
         vals = self._prepare_po_requisition(cr, uid,
                                             lines,
                                             purch_req_lines,
+                                            pricelist=pricelist,
                                             context=context)
         purch_req_id = purch_req_obj.create(cr, uid, vals, context=context)
         self.write(cr, uid, ids,
@@ -1131,8 +1135,10 @@
                    context=context)
         return purch_req_id
 
-    def action_create_po_requisition(self, cr, uid, ids, context=None):
-        self._action_create_po_requisition(cr, uid, ids, context=context)
+    def action_create_po_requisition(self, cr, uid, ids,
+            pricelist=None, context=None):
+        self._action_create_po_requisition(cr, uid, ids,
+                pricelist=pricelist, context=context)
         return self.action_open_po_requisition(cr, uid, ids, context=context)
 
     def action_open_po_requisition(self, cr, uid, ids, context=None):

=== modified file 'logistic_requisition/model/purchase.py'
--- logistic_requisition/model/purchase.py	2014-01-22 12:08:36 +0000
+++ logistic_requisition/model/purchase.py	2014-05-07 09:53:02 +0000
@@ -21,6 +21,7 @@
 
 from openerp.osv import orm, fields
 from openerp import netsvc
+from openerp.tools.translate import _
 
 
 class purchase_order(orm.Model):
@@ -36,10 +37,11 @@
         """
         wf_service = netsvc.LocalService("workflow")
         proc_obj = self.pool.get('procurement.order')
-        # Proc product of type service should be confirm at this 
+        # Proc product of type service should be confirm at this
         # stage, otherwise, when picking of related PO is created
         # then done, it stay blocked at running stage
-        proc_ids = proc_obj.search(cr, uid, [('purchase_id','in', ids)], context=context)
+        proc_ids = proc_obj.search(cr, uid, [('purchase_id', 'in', ids)],
+                                   context=context)
         for proc in proc_obj.browse(cr, uid, proc_ids, context=context):
             if proc.product_id.type == 'service':
                 wf_service.trg_validate(uid, 'procurement.order',
@@ -74,7 +76,7 @@
                     and sale_line.sale_flow == 'direct_delivery'):
                 continue
             procurement = sale_line.procurement_id
-            if not procurement.move_id:
+            if procurement and not procurement.move_id:
                 # the procurement for the sales and purchase is the same!
                 # So when the move will be done, the sales order and the
                 # purchase order will be shipped at the same time
@@ -107,3 +109,93 @@
             'Lines generated by the bid',
             readonly=True),
     }
+
+    def _prepare_lrs_update_from_po_line(self, cr, uid, vals,
+            po_line, context=None):
+        """ Take the vals dict from po line and return a vals dict for LRS
+
+        :param dict vals: value of to be written in new po line
+        :param browse_record po_line: purchase.order.line
+        :returns dict : vals to be written on logistic.requisition.source
+
+        """
+        lrs_vals = {}
+        if vals.get('product_qty'):
+            lrs_vals['proposed_qty'] = vals.get('product_qty')
+        if vals.get('product_id'):
+            lrs_vals['proposed_product_id'] = vals.get('product_id')
+        if vals.get('product_uom'):
+            lrs_vals['proposed_uom_id'] = vals.get('product_uom')
+        if vals.get('price_unit'):
+            currency_obj = self.pool['res.currency']
+            to_curr = po_line.lr_source_line_id.requisition_id.currency_id.id
+            from_curr = po_line.order_id.pricelist_id.currency_id.id
+            price = currency_obj.compute(cr, uid, from_curr, to_curr,
+                    vals.get('price_unit'), False)
+            lrs_vals['unit_cost'] = price
+        if vals.get('date_planned'):
+            if po_line.lr_source_line_id.transport_applicable:
+                if pr_bid_line.order_id.transport == 'included':
+                    lrs_vals['date_etd'] = False
+                    lrs_vals['date_eta'] = vals.get('date_planned')
+
+                else:
+                    lrs_vals['date_etd'] = vals.get('date_planned')
+                    lrs_vals['date_eta'] = False
+            else:
+                lrs_vals['date_etd'] = vals.get('date_planned')
+                lrs_vals['date_eta'] = vals.get('date_planned')
+        return lrs_vals
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """ Here we implement something to allow the update of LRS when some
+        information are changed in PO line. It should be possible to do it when :
+        PO is still in draft
+        LRL is not marked as sourced
+        Once done, nobody should be able to change the PO line infos
+        """
+        if context is None:
+            context = {}
+        if not ids:
+            return True
+        #We have to enforce list as it is called by function_inv
+        if not isinstance(ids, list):
+            ids = [ids]
+        if (vals.get('product_qty') or vals.get('product_id')
+                                    or vals.get('product_uom')
+                                    or vals.get('price_unit')
+                                    or vals.get('date_planned')):
+            lrs_obj = self.pool.get('logistic.requisition.source')
+            for line in self.browse(cr, uid, ids, context=context):
+                if line.lr_source_line_id:
+                    if (line.lr_source_line_id.requisition_line_id in
+                                                ('sourced', 'quoted')):
+                        raise osv.except_osv(
+                            _('UserError'),
+                            _(
+                                "You cannot change the informations because this PO line "
+                                "is already linked to a Logistic Requsition Line %s marked "
+                                "as sourced or quoted." % (line.lr_source_line_id.name)
+                            )
+                    )
+                    else:
+                        lrs_vals = self._prepare_lrs_update_from_po_line(cr,
+                            uid, vals, line, context=context)
+                        lrs_obj.write(cr, uid, [line.lr_source_line_id.id],
+                            lrs_vals, context=context)
+        return super(purchase_order_line, self).write(cr, uid, ids, vals,
+                                                      context=context)
+    def unlink(self, cr, uid, ids, context=None):
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.lr_source_line_id:
+                if (line.lr_source_line_id.requisition_line_id in
+                                            ('sourced', 'quoted')):
+                    raise osv.except_osv(
+                        _('UserError'),
+                        _(
+                            "You cannot delete this PO line because it is "
+                            "already linked to a Logistic Requsition Line %s marked "
+                            "as sourced or quoted." % (line.lr_source_line_id.name)
+                        )
+                )
+        return super(purchase_order_line, self).unlink(cr, uid, ids, context=context)

=== modified file 'logistic_requisition/model/purchase_requisition.py'
--- logistic_requisition/model/purchase_requisition.py	2013-11-01 09:05:44 +0000
+++ logistic_requisition/model/purchase_requisition.py	2014-05-07 09:53:02 +0000
@@ -31,6 +31,7 @@
         For each selected bid line, we ensure there is a corresponding source
         (one2one relation) and we update the source data with the bid line data.
         """
+        currency_obj = self.pool['res.currency']
         if isinstance(id, (tuple, list)):
             assert len(id) == 1, (
                 "_split_requisition_source_lines() accepts only 1 ID, "
@@ -43,16 +44,24 @@
                 # this call for bid line has been added manually
                 continue
             source = pr_line.logistic_requisition_source_ids[0]
+            has_requisition = source.requisition_id
+            if not has_requisition:
+                continue
+            to_curr = source.requisition_id.currency_id.id
             set_sources = set()
             # Look for po lines of this purchase_requisition line
             for pr_bid_line in pr_line.purchase_line_ids:
+                # Compute from bid currency to LRS currency
+                from_curr = pr_bid_line.order_id.pricelist_id.currency_id.id
+                price = currency_obj.compute(cr, uid, from_curr, to_curr,
+                    pr_bid_line.price_unit, False)
                 vals = {
                     'price_is': 'fixed',
                     'proposed_qty': pr_bid_line.quantity_bid,
                     'proposed_product_id': pr_bid_line.product_id.id,
                     'proposed_uom_id': pr_bid_line.product_uom.id,
                     'selected_bid_line_id': pr_bid_line.id,
-                    'unit_cost': pr_bid_line.price_unit,
+                    'unit_cost': price,
                     #FIXME: we need to take care of the scheduled date
                     # set eta or etd depending if transport is included
                     }
@@ -119,19 +128,6 @@
         vals['from_bid_line_id'] = line.id
         return vals
 
-    #FIXME: we should not do that, the location must be known from the beginning of the RFQ-Bid process
-    #def _prepare_purchase_order(self, cr, uid, requisition, supplier, context=None):
-    #    vals = super(purchase_requisition, self)._prepare_purchase_order(
-    #        cr, uid, requisition, supplier, context=context)
-    #    if requisition.logistic_requisition_source_ids:
-    #        # comes from a logistic.requisition -> generate direct
-    #        # delivery purchases, so we put the location customer
-    #        # of the first consignee_id (same consignee on all lines)
-    #        source = requisition.logistic_requisition_source_ids[0]
-    #        req = source.requisition_id
-    #        vals['location_id'] = req.consignee_id.property_stock_customer.id
-    #    return vals
-
 
 class purchase_requisition_line(orm.Model):
     _inherit = 'purchase.requisition.line'

=== modified file 'logistic_requisition/report/logistic_requisition.mako'
--- logistic_requisition/report/logistic_requisition.mako	2013-08-14 14:26:08 +0000
+++ logistic_requisition/report/logistic_requisition.mako	2014-05-07 09:53:02 +0000
@@ -197,29 +197,6 @@
             <td>&nbsp;</td>
         </tr>
     </table>
-    <p><b>${_("Budget")}</b></p>
-    <p>${_("Budget limit:")} ${formatLang(requisition.allowed_budget)}</p>
-    <table class="basic_table" width="100%">
-        <tr>
-            <td style="font-weight:bold;width:40%">${_("Budget/financial holder")}</td>
-            <td style="font-weight:bold;width:30%">${_("Validation date")}</td>
-            <td style="font-weight:bold;">${_("Signature")}</td>
-        </tr>
-        %if requisition.budget_holder_id:
-        <tr>
-            <td>${requisition.budget_holder_id.name}</td>
-            <td>${requisition.date_budget_holder if requisition.date_budget_holder else 'N/A'}</td>
-            <td>&nbsp;</td>
-        </tr>
-        %endif
-        %if requisition.finance_officer_id:
-        <tr>
-            <td>${requisition.finance_officer_id.name}</td>
-            <td>${requisition.date_finance_officer if requisition.date_finance_officer else 'N/A'}</td>
-            <td>&nbsp;</td>
-        </tr>
-        %endif
-    </table>
     <p style="page-break-after: always"/>
     %endfor
 </body>

=== modified file 'logistic_requisition/security/ir.model.access.csv'
--- logistic_requisition/security/ir.model.access.csv	2013-08-06 14:04:56 +0000
+++ logistic_requisition/security/ir.model.access.csv	2014-05-07 09:53:02 +0000
@@ -3,3 +3,5 @@
 access_logistic_requisition_line_purchase_user,logistic.requisition.line,model_logistic_requisition_line,purchase.group_purchase_user,1,1,1,1
 access_logreq_cancel_reason_user,access_logistic_requisition_cancel_reason user,model_logistic_requisition_cancel_reason,purchase.group_purchase_user,1,0,0,0
 access_logreq_cancel_reason_manager,access_logistic_requisition_cancel_reason manager,model_logistic_requisition_cancel_reason,purchase.group_purchase_manager,1,1,1,1
+access_log_cost_create_user,logistic.requisition.cost.estimate,model_logistic_requisition_cost_estimate,base.group_sale_salesman,1,1,1,1
+access_log_cost_create_manager,logistic.requisition.cost.estimate,model_logistic_requisition_cost_estimate,base.group_sale_manager,1,1,1,1

=== modified file 'logistic_requisition/test/line_assigned.yml'
--- logistic_requisition/test/line_assigned.yml	2013-08-26 18:20:48 +0000
+++ logistic_requisition/test/line_assigned.yml	2014-05-07 09:53:02 +0000
@@ -6,6 +6,7 @@
     consignee_id: base.res_partner_3
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
+    pricelist_id: product.list0
 -
   And I add a line with an assignee
 -
@@ -14,7 +15,6 @@
     product_id: product.product_product_7
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
 -
   And I add a line without assignee
@@ -24,7 +24,6 @@
     product_id: product.product_product_8
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
 -
   When I confirm the logistic requisition
 -

=== modified file 'logistic_requisition/test/logistic_requisition_report_test.yml'
--- logistic_requisition/test/logistic_requisition_report_test.yml	2013-08-27 14:33:41 +0000
+++ logistic_requisition/test/logistic_requisition_report_test.yml	2014-05-07 09:53:02 +0000
@@ -8,11 +8,11 @@
     consignee_id: base.res_partner_3
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
+    pricelist_id: product.list0
     line_ids:
       - product_id: product.product_product_7
         requested_qty: 100
         date_delivery: !eval "time.strftime('%Y-%m-%d')"
-        budget_tot_price: 1000
         logistic_user_id: base.user_demo
         account_code: 'Shazam!'
 -

=== modified file 'logistic_requisition/test/requisition_cancel_reason.yml'
--- logistic_requisition/test/requisition_cancel_reason.yml	2013-08-06 14:04:56 +0000
+++ logistic_requisition/test/requisition_cancel_reason.yml	2014-05-07 09:53:02 +0000
@@ -12,6 +12,7 @@
     consignee_id: base.res_partner_3
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
+    pricelist_id: product.list0
 -
   When I cancel it with the wizard asking for the reason
 -

=== modified file 'logistic_requisition/test/requisition_create_cost_estimate.yml'
--- logistic_requisition/test/requisition_create_cost_estimate.yml	2013-11-01 11:17:26 +0000
+++ logistic_requisition/test/requisition_create_cost_estimate.yml	2014-05-07 09:53:02 +0000
@@ -9,6 +9,7 @@
     incoterm_id: stock.incoterm_FCA
     incoterm_address: incoterm address as text
     analytic_id: account.analytic_consultancy
+    pricelist_id: product.list0
 -
   And I add a line 1
 -
@@ -18,7 +19,6 @@
     requested_qty: 100
     requested_uom_id: product.product_uom_unit
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
 -
   And I add a source line to the line 1
@@ -42,7 +42,6 @@
     requested_qty: 100
     requested_uom_id: product.product_uom_unit
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
 -
   And I add a source line to the line 2
@@ -88,8 +87,6 @@
     try:
         self.cost_estimate(cr, uid, wizard_id)
     except orm.except_orm as err:
-        assert 'NO_BUDGET_VALID' in err.error_codes, (
-                'Expected an error because the budget holder is missing')
         assert 'NO_ACCOUNT_CODE' in err.error_codes, (
                 'Expected an error because the account code is missing')
     else:
@@ -97,9 +94,6 @@
 -
   I set some data to fulfill the business rules
 -
-  !record {model: logistic.requisition, id: logistic_requisition_cost_estimate_01}:
-    budget_holder_id: base.user_demo
--
   !record {model: logistic.requisition.line, id: logistic_requisition_line_cost_estimate_01}:
     account_code: 'XXXX'
 -

=== modified file 'logistic_requisition/test/transport_plan.yml'
--- logistic_requisition/test/transport_plan.yml	2013-11-01 11:17:26 +0000
+++ logistic_requisition/test/transport_plan.yml	2014-05-07 09:53:02 +0000
@@ -23,6 +23,7 @@
     consignee_id: base.res_partner_3
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
+    pricelist_id: product.list0
 -
   And I add a line 1
 -
@@ -31,7 +32,6 @@
     product_id: product.product_product_7
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
 -
   And I add a source line 1
@@ -52,7 +52,6 @@
     product_id: product.product_product_8
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
 -
   And I add a source line 2
@@ -93,6 +92,7 @@
     consignee_id: base.res_partner_3
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
+    pricelist_id: product.list0
 -
   With a line
 -
@@ -101,7 +101,6 @@
     product_id: product.product_product_7
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
 -
   And I add a source line

=== modified file 'logistic_requisition/test/transport_plan_from_lr_line_wizard.yml'
--- logistic_requisition/test/transport_plan_from_lr_line_wizard.yml	2013-11-01 11:17:26 +0000
+++ logistic_requisition/test/transport_plan_from_lr_line_wizard.yml	2014-05-07 09:53:02 +0000
@@ -7,6 +7,7 @@
     consignee_id: base.res_partner_3
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
+    pricelist_id: product.list0
 -
   And I add a first line with an assignee
 -
@@ -15,7 +16,6 @@
     product_id: product.product_product_7
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
 -
   And I add a first source line
@@ -34,7 +34,6 @@
     product_id: product.product_product_8
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
 -
   And I add a second source line

=== modified file 'logistic_requisition/test/transport_plan_to_cost_estimate.yml'
--- logistic_requisition/test/transport_plan_to_cost_estimate.yml	2013-11-01 11:17:26 +0000
+++ logistic_requisition/test/transport_plan_to_cost_estimate.yml	2014-05-07 09:53:02 +0000
@@ -27,8 +27,7 @@
     consignee_id: base.res_partner_3
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
     user_id: base.user_demo
-    budget_holder_id: base.user_demo
-    finance_officer_id: base.user_demo
+    pricelist_id: product.list0
 -
   And I add a line 1
 -
@@ -37,7 +36,6 @@
     product_id: product.product_product_7
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
     account_code: 'XXXX'
 -
@@ -60,7 +58,6 @@
     product_id: product.product_product_8
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
     account_code: 'YYYY'
 -
@@ -83,7 +80,6 @@
     product_id: product.product_product_8
     requested_qty: 100
     date_delivery: !eval "time.strftime('%Y-%m-%d')"
-    budget_tot_price: 1000
     logistic_user_id: base.user_demo
     account_code: 'ZZZZ'
 -

=== modified file 'logistic_requisition/tests/__init__.py'
--- logistic_requisition/tests/__init__.py	2013-08-27 14:13:33 +0000
+++ logistic_requisition/tests/__init__.py	2014-05-07 09:53:02 +0000
@@ -22,6 +22,7 @@
 from . import test_sale_order_from_lr_confirm
 from . import test_mto_workflow
 from . import transport_plan_date
+from . import test_mutlicurrency_update_po_line
 
 
 fast_suite = [
@@ -32,4 +33,5 @@
     test_sale_order_from_lr_confirm,
     test_mto_workflow,
     transport_plan_date,
+    test_mutlicurrency_update_po_line,
 ]

=== modified file 'logistic_requisition/tests/logistic_requisition.py'
--- logistic_requisition/tests/logistic_requisition.py	2013-11-01 11:17:26 +0000
+++ logistic_requisition/tests/logistic_requisition.py	2014-05-07 09:53:02 +0000
@@ -43,20 +43,6 @@
         log_req_obj.onchange_consignee_id(
             cr, uid, [], vals.get('consignee_id'))['value']
     )
-    vals.update(
-        log_req_obj.onchange_validate(
-            cr, uid, [],
-            vals.get('budget_holder_id'),
-            False,