Merge lp:~unifield-team/unifield-addons/uf-108-default-supplier-suggestion into lp:unifield-addons

[Quentin THEURET @Amaris]

[jftempo (jfb-tempo-consulting)]

Please set supplier selection on procurement.list.line and move buttons "create_rfq", "create_po" from procurement.choose.supplier to procurement.list.

review: Needs Fixing

[lp:~unifield-team/unifield-addons/uf-108-default-supplier-suggestion]

4473. By Quentin THEURET <quentin@tempo-quentin> on 2011-03-24

UF-108: [IMP] Set supplier selection on procurement.list.line and move buttons create_rfq, create_po from procurement.choose.supplier to procurement.list

Unmerged revisions

4473. By Quentin THEURET <quentin@tempo-quentin> on 2011-03-24

UF-108: [IMP] Set supplier selection on procurement.list.line and move buttons create_rfq, create_po from procurement.choose.supplier to procurement.list

=== removed directory 'msf_partner'
=== removed file 'msf_partner/__init__.py'
--- msf_partner/__init__.py	2011-03-15 15:01:14 +0000
+++ msf_partner/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF
-#
-#    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/>.
-#
-##############################################################################
-
-import partner
-import product
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== removed file 'msf_partner/__openerp__.py'
--- msf_partner/__openerp__.py	2011-03-15 15:01:14 +0000
+++ msf_partner/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF
-#
-#    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/>.
-#
-##############################################################################
-{
-    "name" : "MSF Partners",
-    "version" : "1.0",
-    "author" : "TeMPO Consulting, MSF",
-    "category": "Others",
-    "description": """
-        This modules aims to differentiate Internal/External partners
-        It also aims to create a new type of partner: Manufacturer
-    """,
-    "website": "http://unifield.msf.org",
-    "init_xml": [
-    ],
-    "depends" : [
-        "base",
-        "product",
-    ],
-    "update_xml": [
-        "partner_view.xml",
-        "product_view.xml",
-    ],
-    "demo_xml": [
-        "partner_demo.xml",
-    ],
-    "test": [
-        "test/msf_partner.yml",
-    ],
-    "installable": True,
-    "active": False,
-}

=== removed file 'msf_partner/partner.py'
--- msf_partner/partner.py	2011-03-15 15:01:14 +0000
+++ msf_partner/partner.py	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF
-#
-#    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 osv import osv
-from osv import fields
-
-
-class res_partner(osv.osv):
-    _name = 'res.partner'
-    _inherit = 'res.partner'
-
-    _columns = {
-        'manufacturer': fields.boolean(string='Manufacturer', help='Check this box if the partner is a manufacturer'),
-        'partner_type': fields.selection([('internal', 'Internal'), ('section', 'Inter-section'),
-                                          ('external', 'External')], string='Partner type', required=True),
-    }
-
-    _defaults = {
-        'manufacturer': lambda *a: False,
-        'partner_type': lambda *a: 'internal',
-    }
-
-res_partner()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== removed file 'msf_partner/partner_demo.xml'
--- msf_partner/partner_demo.xml	2011-03-15 14:05:12 +0000
+++ msf_partner/partner_demo.xml	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<openerp>
-	<data noupdate="0">
-	
-		<record id="base.res_partner_desertic_hispafuentes" model="res.partner">
-			<field name="manufacturer">1</field>
-			<field name="partner_type">section</field>
-		</record>
-		
-		<record id="base.res_partner_tinyatwork" model="res.partner">
-			<field name="manufacturer">1</field>
-		</record>
-		
-		<record id="base.res_partner_asus" model="res.partner">
-            <field name="partner_type">external</field>
-        </record>
-        <record id="base.res_partner_agrolait" model="res.partner">
-        	<field name="partner_type">external</field>
-        </record>
-        <record id="base.res_partner_c2c" model="res.partner">
-        	<field name="partner_type">section</field>
-        </record>
-        <record id="base.res_partner_sednacom" model="res.partner">
-            <field name="partner_type">internal</field>
-        </record>
-        <record id="base.res_partner_thymbra" model="res.partner">
-            <field name="partner_type">internal</field>
-        </record>
-        
-        <record id="product.supplierinfo10" model="product.supplierinfo">
-        	<field name="manufacturer_id" ref="base.res_partner_tinyatwork" />
-        </record>
-		
-        <record id="product.supplierinfo11" model="product.supplierinfo">
-        	<field name="manufacturer_id" ref="base.res_partner_tinyatwork" />
-        </record>
-        
-        <record id="product.supplierinfo6" model="product.supplierinfo">
-        	<field name="manufacturer_id" ref="base.res_partner_desertic_hispafuentes" />
-        </record>
-        
-        <record id="product.supplierinfo7" model="product.supplierinfo">
-        	<field name="manufacturer_id" ref="base.res_partner_tinyatwork" />
-        </record>
-	</data>
-</openerp>

=== removed file 'msf_partner/partner_view.xml'
--- msf_partner/partner_view.xml	2011-03-15 15:01:14 +0000
+++ msf_partner/partner_view.xml	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<openerp>
-	<data>
-
-        <record id="msf_view_partner_tree" model="ir.ui.view">
-            <field name="name">msf.view.partner.tree</field>
-            <field name="model">res.partner</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="base.view_partner_tree" />
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='ref']" position="after">
-                    <field name="partner_type" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="msf_view_partner_form" model="ir.ui.view">
-            <field name="name">msf.view.partner.form</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/group/group/field[@name='title']" position="replace">
-                        <field name="partner_type" />
-                    </xpath>
-                    <xpath expr="/form/group/group[2]/field[@name='supplier']" position="after">
-                        <field name="manufacturer" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <record id="msf_view_res_partner_filter" model="ir.ui.view">
-            <field name="name">msf.view.res.partner.filter</field>
-            <field name="model">res.partner</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="base.view_res_partner_filter" />
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/search/group/filter[@name='supplier']" position="after">
-                        <filter string="Manufacturers" name="manufacturer" icon="terp-personal" domain="[('manufacturer','=',1)]" help="Manufacturer Partners"/>
-                    </xpath>
-                    <xpath expr="/search/group/field[@name='name']" position="before">
-                        <filter string="Internal" name="internal" icon="gtk-leave-fullscreen" domain="[('partner_type','=','internal')]" help="Internal Partners"/>
-                        <filter string="Inter-section" name="inter-section" icon="gtk-refresh" domain="[('partner_type','=','section')]" help="Inter-section Partners"/>
-                        <filter string="External" name="external" icon="gtk-quit" domain="[('partner_type','=','external')]" help="External Partners"/>
-                        <separator orientation="vertical" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-	</data>
-</openerp>
-

=== removed file 'msf_partner/product.py'
--- msf_partner/product.py	2011-03-15 15:01:14 +0000
+++ msf_partner/product.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF
-#
-#    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 osv import osv
-from osv import fields
-
-
-class product_supplierinfo(osv.osv):
-    _name = 'product.supplierinfo'
-    _inherit = 'product.supplierinfo'
-
-    _columns = {
-        'manufacturer_id': fields.many2one('res.partner', string='Manufacturer', domain=[('manufacturer', '=', 1)]),
-    }
-
-product_supplierinfo()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== removed file 'msf_partner/product_view.xml'
--- msf_partner/product_view.xml	2011-03-10 09:07:17 +0000
+++ msf_partner/product_view.xml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<openerp>
-	<data>
-
-        <record id="manufacturer_supplierinfo_form_view" model="ir.ui.view">
-            <field name="name">manufacture.supplierinfo.form.view</field>
-            <field name="model">product.supplierinfo</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="product.product_supplierinfo_form_view" />
-            <field name="arch" type="xml">
-                <xpath expr="/form/field[@name='product_code']" position="after">
-                    <field name="manufacturer_id" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="manufacturer_supplierinfo_tree_view" model="ir.ui.view">
-            <field name="name">manufacturer.supplierinfo.tree.view</field>
-            <field name="model">product.supplierinfo</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="product.product_supplierinfo_tree_view" />
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='min_qty']" position="after">
-                    <field name="manufacturer_id" />
-                </xpath>
-            </field>
-        </record>
-
-	</data>
-</openerp>
-

=== removed directory 'msf_partner/test'
=== removed file 'msf_partner/test/msf_partner.yml'
--- msf_partner/test/msf_partner.yml	2011-03-15 15:01:14 +0000
+++ msf_partner/test/msf_partner.yml	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
--
-    In order to test the module msf_partne, I will create a partner
-    and check that the default values are well applied.
--
-    I create the first partner
--
-  !record {model: res.partner, id: partner1}:
-    name: A
-    supplier: 1
-    customer: 1
-    address:
-      - name: A
--
-    I check if the default values are good
--
-  !assert {model: res.partner, id: partner1}:
-    - partner_type == 'internal', "Default value 'internal' for partner_type is not applied"
-    - manufacturer == 0, "Default value 'False' for manufacturer is not applied"

=== modified file 'procurement_list/__init__.py'
--- procurement_list/__init__.py	2011-03-16 13:17:54 +0000
+++ procurement_list/__init__.py	2011-03-24 15:56:19 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import procurement_list
+import partner
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'procurement_list/__openerp__.py'
--- procurement_list/__openerp__.py	2011-03-16 18:18:33 +0000
+++ procurement_list/__openerp__.py	2011-03-24 15:56:19 +0000
@@ -32,13 +32,16 @@
     'init_xml': [
     ],
     'depends' : [
+        'base',
         'purchase',
     ],
     'update_xml': [
         'procurement_list_sequence.xml',
         'procurement_list_view.xml',
+        'partner_view.xml',
         'procurement_list_wizard.xml',
         'wizard/wizard_import_list_view.xml',
+        'wizard/choose_supplier_view.xml',
         'security/ir.model.access.csv',
     ],
     'demo_xml': [

=== added file 'procurement_list/partner.py'
--- procurement_list/partner.py	1970-01-01 00:00:00 +0000
+++ procurement_list/partner.py	2011-03-24 15:56:19 +0000
@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 osv import osv
+from osv import fields
+
+class res_partner(osv.osv):
+    _name= 'res.partner'
+    _inherit = 'res.partner'
+    
+    _order = 'name'
+    
+    def _set_in_product(self, cr, uid, ids, field_name, arg, context={}):
+        '''
+        Returns according to the context if the partner is in product form
+        '''
+        res = {}
+        
+        product_obj = self.pool.get('product.product')
+        
+        # If we aren't in the context of choose supplier on procurement list
+        if not context.get('product_id', False) or 'choose_supplier' not in context:
+            for i in ids:
+                res[i] = False
+        else:
+            product = product_obj.browse(cr, uid, context.get('product_id'))
+            seller_ids = []
+            # Get all suppliers defined on product form
+            for s in product.seller_ids:
+                seller_ids.append(s.name.id)
+            # Check if the partner is in product form
+            for i in ids:
+                if i in seller_ids:
+                    res[i] = True
+                else:
+                    res[i] = False
+            
+        return res
+    
+    _columns = {
+        'in_product': fields.function(_set_in_product, string='In product', type="boolean", readonly=True, method=True),     
+    }
+    
+    def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
+        '''
+        Sort the supplier according to the context
+        '''
+        res = super(res_partner, self).read(cr, uid, ids, fields, context=context, load=load)
+        # If we are in the context of choose supplier on procurement list
+        if context.get('product_id', False) and 'choose_supplier' in context:
+            # Add in_product field in read
+            if not 'in_product' in fields:
+                fields.append('in_product')
+            
+            seller_ids =[]
+            not_seller_ids = []
+            
+            for r in res:
+                if r.get('in_product', False):
+                    seller_ids.append(r)
+                else:
+                    not_seller_ids.append(r)
+                    
+            result = seller_ids + not_seller_ids
+        else:
+            result = res
+        
+        return result
+    
+res_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'procurement_list/partner_view.xml'
--- procurement_list/partner_view.xml	1970-01-01 00:00:00 +0000
+++ procurement_list/partner_view.xml	2011-03-24 15:56:19 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+	<data>
+	
+		<record id="in_product_view_partner_tree" model="ir.ui.view">
+			<field name="name">in.product.view.partner.tree</field>
+			<field name="model">res.partner</field>
+			<field name="type">tree</field>
+			<field name="inherit_id" ref="base.view_partner_tree" />
+			<field name="arch" type="xml">
+				<xpath expr="/tree" position="replace">
+					<tree string="Partners" colors="red:in_product==True">
+						<field name="name" />
+						<field name="ref" groups="base.group_extended" />
+						<field name="phone" />
+						<field name="email" />
+						<field name="city" />
+						<field name="country" />
+						<field name="user_id" />
+						<field name="in_product" invisible="1" />
+					</tree>
+				</xpath>
+			</field>
+		</record>
+	
+	</data>
+</openerp>
\ No newline at end of file

=== modified file 'procurement_list/procurement_list.py'
--- procurement_list/procurement_list.py	2011-03-16 18:05:16 +0000
+++ procurement_list/procurement_list.py	2011-03-24 15:56:19 +0000
@@ -43,10 +43,6 @@
         'line_ids': fields.one2many('procurement.list.line', 'list_id', string='Lines', readonly=True,
                                     states={'draft': [('readonly', False)]}),
         'notes': fields.text(string='Notes'),
-        'supplier_ids': fields.many2many('res.partner', 'procurement_list_supplier_rel',
-                                         'list_id', 'supplier_id', string='Suppliers',
-                                         domain="[('supplier', '=', True)]",
-                                         states={'done': [('readonly', True)]}),
         'order_ids': fields.many2many('purchase.order', 'procurement_list_order_rel',
                                       'list_id', 'order_id', string='Orders', readonly=True),
     }
@@ -75,6 +71,82 @@
         self.write(cr, uid, ids, {'state': 'cancel'})
 
         return True
+    
+    def create_po(self, cr, uid, ids, context={}):
+        '''
+        Creates all purchase orders according to choices on lines
+        '''
+        if ids and isinstance(ids, (int, long)):
+            ids = [ids]
+            
+        order_obj = self.pool.get('purchase.order')
+        order_line_obj = self.pool.get('purchase.order.line')
+        proc_obj = self.pool.get('procurement.list')
+        line_obj = self.pool.get('procurement.list.line')
+        prod_sup_obj = self.pool.get('product.supplierinfo')
+
+        # We search if at least one line hasn't defined supplier
+        for list in self.browse(cr, uid, ids):
+            for line in list.line_ids:
+                if not line.supplier_id:
+                    raise osv.except_osv(_('Error'), _('You cannot create purchase orders while all lines haven\'t a defined supplier'))
+
+            # We search lines group by supplier_id
+            po_exists = {}
+            po_id = False
+            po_ids = []
+            line_ids = line_obj.search(cr, uid, [('list_id', 'in', ids)], order='supplier_id')
+            for l in line_obj.browse(cr, uid, line_ids):
+                # Search if a PO already exists in the system
+                if not po_exists.get(l.supplier_id.id, False):
+                    # If no PO in local memory, search in DB
+                    po_exist = order_obj.search(cr, uid, [('origin', '=', l.list_id.name), ('partner_id', '=', l.supplier_id.id)])
+                    if po_exist:
+                        # A PO exists in DB, set the id in local memory
+                        po_exists[l.supplier_id.id] = po_exist[0]
+                    else: 
+                        # try to create a new PO, and set its id in local memory
+                        address = l.supplier_id.address_get().get('default')
+                        # Returns an error when the supplier has not defined address
+                        if not address:
+                            raise osv.except_osv(_('Error'), _('The supplier %s has no address defined on its form' %l.supplier_id.name))
+                        # When starting or when the supplier changed, we create a Purchase Order
+                        po_id = order_obj.create(cr, uid, {'partner_id': l.supplier_id.id,
+                                                           'partner_address_id': address,
+                                                           'pricelist_id': l.supplier_id.property_product_pricelist.id,
+                                                           'origin': l.list_id.name,
+                                                           'location_id': proc_obj._get_location(cr, uid, l.list_id.warehouse_id)})
+                        po_exists[l.supplier_id.id] = po_id
+    
+                # Get the PO id in local memory
+                po_id = po_exists.get(l.supplier_id.id)
+                    
+                # We create all lines for this supplier
+                price_unit = prod_sup_obj.price_get(cr, uid, [l.supplier_id.id], l.product_id.id, l.product_qty)
+                order_line_obj.create(cr, uid, {'product_uom': l.product_uom_id.id,
+                                                'product_id': l.product_id.id,
+                                                'order_id': po_id,
+                                                'price_unit': price_unit[l.supplier_id.id],
+                                                'date_planned': l.list_id.order_date,
+                                                'product_qty': l.product_qty,
+                                                'name': l.product_id.name,})
+    
+            for supplier in po_exists:
+                po_ids.append(po_exists.get(supplier))
+    
+            # We confirm all created orders
+            wf_service = netsvc.LocalService("workflow")
+            for po in po_ids:
+                wf_service.trg_validate(uid, 'purchase.order', po, 'purchase_confirm', cr)
+    
+            proc_obj.write(cr, uid, ids[0], {'state': 'done', 'order_ids': [(6, 0, po_ids)]}) 
+
+        return {'type': 'ir.actions.act_window',
+                'res_model': 'purchase.order',
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'domain': [('id', 'in', po_ids)],
+               }
 
     def create_rfq(self, cr, uid, ids, context={}):
         ''' 
@@ -86,43 +158,21 @@
         order_ids = []
 
         for list in self.browse(cr, uid, ids, context=context):
-            # Returns an error message if no suppliers or no products
-            if not list.supplier_ids or len(list.supplier_ids) == 0:
-                raise osv.except_osv(_('Error'), _('No supplier defined for this list !'))
+            # Returns an error message if no products defined
             if not list.line_ids or len(list.line_ids) == 0:
                 raise osv.except_osv(_('Error'), _('No line defined for this list !'))
 
             location_id = self._get_location(cr, uid, list.warehouse_id)
-            # Creates a RfQ for each supplier...
-            for supplier in list.supplier_ids:
-                po_id = purchase_obj.create(cr, uid, {'partner_id': supplier.id,
-                                                      'partner_address_id': supplier.address_get().get('default'),
-                                                      'pricelist_id': supplier.property_product_pricelist.id,
-                                                      'origin': list.name,
-                                                      'location_id': location_id})
-                order_ids.append(po_id)
-
-                # ... with all lines...
-                for line in list.line_ids:
-                    # ... which aren't from stock
-                    if not line.from_stock:
-                        line_obj.create(cr, uid, {'product_uom': line.product_uom_id.id,
-                                                  'product_id': line.product_id.id,
-                                                  'order_id': po_id,
-                                                  'price_unit': 0.00,
-                                                  'date_planned': list.order_date,
-                                                  'product_qty': line.product_qty,
-                                                  'procurement_line_id': line.id,
-                                                  'name': line.product_id.name,})
-                    self.pool.get('procurement.list.line').write(cr, uid, line.id, {'latest': 'RfQ In Progress'})
-
-        self.write(cr, uid, ids, {'state': 'done', 'order_ids': [(6, 0, order_ids)]})
+
+        context['active_ids'] = ids
+        context['active_id'] = ids[0]
 
         return {'type': 'ir.actions.act_window',
-                'res_model': 'purchase.order',
+                'res_model': 'procurement.choose.supplier.rfq',
+                'target': 'new',
                 'view_type': 'form',
-                'view_mode': 'tree,form',
-                'domain': [('id', 'in', order_ids)]}
+                'view_mode': 'form',
+                'context': context}
 
     def reset(self, cr, uid, ids, context={}):
         '''
@@ -158,6 +208,7 @@
         'from_stock': fields.boolean(string='From stock ?'),
         'latest': fields.char(size=64, string='Latest document', readonly=True),
         'list_id': fields.many2one('procurement.list', string='List', required=True, ondelete='cascade'),
+        'supplier_id': fields.many2one('res.partner', string='Supplier'),
     }
     
     _defaults = {
@@ -183,12 +234,48 @@
 
         v = {}
         if not product_id:
-            v.update({'product_uom_id': False})
+            v.update({'product_uom_id': False, 'supplier_id': False})
         else:
             product = product_obj.browse(cr, uid, product_id, context=context)
-            v.update({'product_uom_id': product.uom_id.id})
+            v.update({'product_uom_id': product.uom_id.id, 'supplier_id': product.seller_id.id})
 
         return {'value': v}
+    
+    
+    def split_line(self, cr, uid, ids, context={}):
+        '''
+        Split a line into two lines
+        '''
+        if ids and isinstance(ids, (int, long)):
+            ids = [ids]
+        for line in self.browse(cr, uid, ids):
+            state = line.list_id.state
+        context.update({'line_id': ids[0], 'state': state})
+        return {'type': 'ir.actions.act_window',
+                'res_model': 'procurement.list.line.split',
+                'target': 'new',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'context': context,
+                }
+        
+    def merge_line(self, cr, uid, ids, context={}):
+        '''
+        Merges two lines
+        '''
+        if ids and isinstance(ids, (int, long)):
+            ids = [ids]
+        for line in self.browse(cr, uid, ids):
+            state = line.list_id.state
+        context.update({'line_id': ids[0], 'state': state})
+        
+        return {'type': 'ir.actions.act_window',
+                'res_model': 'procurement.list.line.merge',
+                'target': 'new',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'context': context,
+                }
 
 procurement_list_line()
 

=== modified file 'procurement_list/procurement_list_view.xml'
--- procurement_list/procurement_list_view.xml	2011-03-15 16:28:59 +0000
+++ procurement_list/procurement_list_view.xml	2011-03-24 15:56:19 +0000
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
 	<data>
+	
+	    <record id="action_choose_supplier" model="ir.actions.server">
+            <field name="name">Choose Supplier</field>
+            <field name="model_id" ref="model_procurement_choose_supplier"/>
+            <field name="state">code</field>
+            <field name="code">action = obj.start_choose_supplier(context=context)</field>
+        </record>
 
         <record id="procurement_list_form_view" model="ir.ui.view">
             <field name="name">procurement.list.form.view</field>
@@ -25,18 +32,19 @@
                                     <field name="comment" />
                                     <field name="from_stock" />
                                     <field name="latest" />
+                                    <field name="supplier_id" context="{'product_id': product_id, 'choose_supplier': True}" />
+                                    <button name="split_line" type="object" string="Split Line" icon="terp-stock_effects-object-colorize" />
+                                    <button name="merge_line" type="object" string="Merge Line" icon="terp-gtk-jump-to-ltr" context="{'wizard_id': active_id}" />
                                 </tree>
                             </field>
                             <group colspan="4" col="6">
                                 <field name="state" />
                                 <button name="cancel" string="Cancel" icon="gtk-cancel" type="object" states="draft"/>
-                                <button name="create_rfq" string="Create RfQ" icon="gtk-execute" type="object" states="draft" />
+                                <button name="create_rfq" type="object" string="Create RfQ" icon="gtk-execute" states="draft" />
+                                <button name="create_po" type="object" string="Create PO" icon="gtk-execute" states="draft" />
                                 <button name="reset" string="Reset to Draft" icon="gtk-ok" type="object" states="cancel" />
                             </group>
                         </page>
-                        <page string="Suppliers">
-                            <field name="supplier_ids" nolabel="1" />
-                        </page>
                         <page string="Sourcing Documents">
                         	<field name="order_ids" nolabel="1" colspan="4">
                         		<tree string="Sourcing Documents" colors="blue:state=='draft'">

=== modified file 'procurement_list/security/ir.model.access.csv'
--- procurement_list/security/ir.model.access.csv	2011-03-09 13:24:58 +0000
+++ procurement_list/security/ir.model.access.csv	2011-03-24 15:56:19 +0000
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_procurement_list_all","procurement.list all","model_procurement_list",,1,1,1,1
-"access_procurement_list_line_all","procurement.list.line all","model_procurement_list_line",,1,1,1,1
+"access_procurement_list_line_all","procurement.list.line all","model_procurement_list_line",,1,1,1,1
\ No newline at end of file

=== modified file 'procurement_list/test/procurement_list.yml'
--- procurement_list/test/procurement_list.yml	2011-03-16 16:38:58 +0000
+++ procurement_list/test/procurement_list.yml	2011-03-24 15:56:19 +0000
@@ -1,4 +1,59 @@
 -
+    In order to test the procurement list module, I will create 6 suppliers,
+    5 products and 3 procurement request.
+    After, I try all possibility to test the supplier default selection
+-
+    I create the 6 partners
+-
+    I create supplier S1
+-
+  !record {model: res.partner, id: supplier1}:
+    name: S1
+    supplier: True
+    address:
+      - name: S1
+-
+    I create the supplier S2
+-
+  !record {model: res.partner, id: supplier2}:
+    name: S2
+    supplier: True
+    address:
+      - name: S2
+-
+    I create the supplier S3
+-
+  !record {model: res.partner, id: supplier3}:
+    name: S3
+    supplier: True
+    address:
+      - name: S3
+-
+    I create the supplier S4
+-
+  !record {model: res.partner, id: supplier4}:
+    name: S4
+    supplier: True
+    address:
+      - name: S4
+-
+    I create the supplier S5
+-
+  !record {model: res.partner, id: supplier5}:
+    name: S5
+    supplier: True
+    address:
+      - name: S5
+-
+    I create the supplier S6
+-
+  !record {model: res.partner, id: supplier6}:
+    name: S6
+    supplier: True
+    address:
+      - name: S6
+-
+    I create the product P1
     In order to test the procurement list module, I start by creating a new product category
 -
   !record {model: product.category, id: product_cat1}:
@@ -22,10 +77,20 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
-    volume: 0.0
+    volume : 0.0
     warranty: 0.0
     weight: 0.0
     weight_net: 0.0
+    seller_ids:
+      - sequence: 10
+        min_qty: 0.00
+        name: supplier1
+      - sequence: 20
+        min_qty: 0.00
+        name: supplier2
+      - sequence: 30
+        min_qty: 0.00
+        name: supplier3
 -
     I create a second product, P2
 -
@@ -43,34 +108,106 @@
     standard_price: 100.0
     supply_method: buy
     type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-    I create a partner
--
-  !record {model: res.partner, id: partner1}:
-    name: Supplier 1
--
-    I create an address for this partner
--
-  !record {model: res.partner.address, id: addr1}:
-    partner_id: partner1
-    name: Supplier1
--
-    I create a second partner
--
-  !record {model: res.partner, id: partner2}:
-    name: Supplier 2
--
-    I create an address for this second partner
--
-  !record {model: res.partner.address, id: addr2}:
-    partner_id: partner2
-    name: Supplier2
+    uom_id: product.product_uom_unit    
+    uom_po_id: product.product_uom_unit
+    volume : 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+    seller_ids:
+      - sequence: 10
+        min_qty: 0.00
+        name: supplier2
+      - sequence: 20
+        min_qty: 0.00
+        name: supplier1
+-
+    I create the product P3
+-
+  !record {model: product.product, id: product3}:
+    categ_id: product.cat0
+    cost_method: standard
+    mes_type: fixed
+    name: P3
+    price_margin: 2.0
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 100.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit    
+    uom_po_id: product.product_uom_unit
+    volume : 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+    seller_ids:
+      - sequence: 10
+        min_qty: 0.00
+        name: supplier3
+-
+    I create the product P4
+-
+  !record {model: product.product, id: product4}:
+    categ_id: product.cat0
+    cost_method: standard
+    mes_type: fixed
+    name: P4
+    price_margin: 2.0
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 100.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit    
+    uom_po_id: product.product_uom_unit
+    volume : 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+    seller_ids:
+      - sequence: 10
+        min_qty: 0.00
+        name: supplier3
+      - sequence: 20
+        min_qty: 0.00
+        name: supplier4
+-
+    I create the product P5
+-
+  !record {model: product.product, id: product5}:
+    categ_id: product.cat0
+    cost_method: standard
+    mes_type: fixed
+    name: P5
+    price_margin: 2.0
+    procure_method: make_to_stock
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    seller_delay: '1'
+    standard_price: 100.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit    
+    uom_po_id: product.product_uom_unit
+    volume : 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+    seller_ids:
+      - sequence: 10
+        min_qty: 0.00
+        name: supplier4
+      - sequence: 20
+        min_qty: 0.00
+        name: supplier5
 -
     I create a procurement list for these two products 
 -
@@ -78,28 +215,67 @@
     requestor: Administration
     warehouse_id: stock.warehouse0
     origin: R 20043
-    supplier_ids:
-      - partner1
-      - partner2
 -
-    I add two lines in this procurement list
+    I create a Procurement Request Line 1 for list1 
 -
   !record {model: procurement.list.line, id: list1_line1}:
     product_id: product1
     product_uom_id: product.product_uom_unit
-    product_qty: 100.00
+    product_qty: 12.0
     comment: special comment
     from_stock: False
     list_id: list1
+    supplier_id: supplier1
 -
-    The second line
+    I create a Procurement Request Line 2 for list1 
 -
   !record {model: procurement.list.line, id: list1_line2}:
     product_id: product2
     product_uom_id: product.product_uom_unit
-    product_qty: 50.0
+    product_qty: 10.0
     from_stock: True
     list_id: list1
+    supplier_id: supplier2
+-
+    I create a second Procurement Request
+-
+  !record {model: procurement.list, id: list2}:
+    requestor: Administration
+    warehouse_id: stock.warehouse0
+-
+  I create Procurement Request line 1 for list2 
+-
+  !record {model: procurement.list.line, id: list2_line1}:
+    product_id: product3
+    product_uom_id: product.product_uom_unit
+    product_qty: 20.0
+    list_id: list2
+    supplier_id: supplier3
+-
+  I create Procurement Request line 2 for list2 
+-
+  !record {model: procurement.list.line, id: list2_line2}:
+    product_id: product4
+    product_uom_id: product.product_uom_unit
+    product_qty: 30.0
+    list_id: list2
+    supplier_id: supplier3
+-
+    I create a third Procurement Request
+-
+  !record {model: procurement.list, id: list3}:
+    requestor: Administration
+    warehouse_id: stock.warehouse0
+    origin: R 20045
+-
+    I create a Procurement Request Line 1 for list3
+-
+  !record {model: procurement.list.line, id: list3_line1}:
+    product_id: product5
+    product_uom_id: product.product_uom_unit
+    product_qty: 30.0
+    list_id: list3
+    supplier_id: supplier3
 -
     I check that the list which was initially in the draft state
 -
@@ -108,36 +284,107 @@
     - requestor == 'Administration'
     - origin == 'R 20043'
 -
-    I create RfQ from this list
--
-  !python {model: procurement.list}: |
-    pl_obj = self.pool.get('procurement.list')
-    pl_id1 = pl_obj.browse(cr, uid, ref('list1'))
-    pl_id1.create_rfq()
--
-    I check if the latest message in procurement line is 'RfQ In Progress'
--
-  !assert {model: procurement.list.line, id: list1_line1}:
-    - latest == 'RfQ In Progress'
--
-    I check if only one RfQ will be created for the 
--
-  !python {model: procurement.list}: |
-    pl_obj = self.pool.get('procurement.list')
+    I check if the creation of PO is ok
+-
+  !python {model: procurement.list}: |
+    self.create_po(cr, uid, [ref('list1')])
+-
+    I check if documents in 'Sourcing' tab are filled
+-
+  !assert {model: procurement.list, id: list1}:
+    - len(order_ids) == 2, "Number of sourcing documents is wrong"
+- 
+    I check if the creation of RfQ is ok
+-
+  !record {model: procurement.choose.supplier.rfq, id: supplier_choose2}:
+    choose_id: list2
+    supplier_ids:
+      - supplier3
+      - supplier4
+-
+    I confirm the creation of RfQ
+-
+  !python {model: procurement.choose.supplier.rfq}: |
+    self.create_rfq(cr, uid, [ref('supplier_choose2')])
+-
+    I check if the latest message in procurement line is 'RfQ In Progress'
+-
+  !assert {model: procurement.list.line, id: list2_line1}:
+    - latest == 'RfQ In Progress', "Rfq In Progress not applied in latest field of line"
+-
+    I check if the latest message in procurement line is 'RfQ In Progress'
+-
+  !assert {model: procurement.list.line, id: list2_line2}:
+    - latest == 'RfQ In Progress', "Rfq In Progress not applied in latest field of line"
+-
+    I check if documents in 'Sourcing' tab are filled
+-
+  !assert {model: procurement.list, id: list2}:
+    - len(order_ids) == 2, "Number of sourcing documents is wrong"
+-
+    I check if only one RfQ will be created for the line
+-
+  !python {model: procurement.list}: |
+    list2 = self.browse(cr, uid, ref('list2'))
     pol_obj = self.pool.get('purchase.order.line')
     order_obj = self.pool.get('purchase.order')
-    pol_ids = pol_obj.search(cr, uid, [('product_id', '=', ref('product1'))])
-    pl = pl_obj.browse(cr, uid, ref('list1'))
+
+    list_line_ids = []
+    for line in list2.line_ids:
+        list_line_ids.append(line.id)
+
+    pol_ids = pol_obj.search(cr, uid, [('product_id', '=', ref('product3')), ('procurement_line_id', 'in', list_line_ids)])
 
     for pol in pol_obj.browse(cr, uid, pol_ids):
-        assert pol.order_id.origin == pl.name, "Bad name for the name of the generated Purchase Order"
-    order_obj.wkf_confirm_order(cr, uid, [pol.order_id.id])
-    assert pol.procurement_line_id.latest == pol.order_id.name, "Procurement line not updated"
--
-    I check that no purchase order line with P2
--
-  !python {model: procurement.list}: |
-    pl_obj = self.pool.get('procurement.list')
-    pol_obj = self.pool.get('purchase.order.line')
-    pol_ids = pol_obj.search(cr, uid, [('product_id', '=', ref('product2'))])
-    assert len(pol_ids) == 0, "No purchase order line found !"
+        assert pol.order_id.origin == pl.name, "Bad origin for the generated Purchase Order"
+        order_obj.wkf_confirm_order(cr, uid, [pol.order_id.id])
+        print pol.procurement_line_id.latest, pol.order_id.name
+        assert pol.procurement_line_id.latest == pol.order_id.name, "Procurement line not updated"
+-
+    Split the line
+-
+  !record {model: procurement.list.line.split, id: split1}:
+    line_id: list3_line1
+    qty: 20.00
+-
+    I check if we have two lines for the product P5 now
+-
+  !python {model: procurement.list.line}: |
+    self.pool.get('procurement.list.line.split').split(cr, uid, ref('split1'))
+    assert len(self.search(cr, uid, [('product_id', '=', ref('product5')), ('list_id', '=', ref('list3'))])) == 2, "Line isn't split"
+-
+    I check if the quantity in old line is decrease of 20 PCE
+-
+  !python {model: procurement.list.line}: |
+    assert self.browse(cr, uid, ref('list3_line1')).product_qty == 10.0, "Quantity of old line isn't updated"
+-
+    I check if the quantity of the new line is good
+-
+  !python {model: procurement.list.line}: |
+    line_id = self.search(cr, uid, [('product_id', '=', ref('product5')), ('list_id', '=', ref('list3'))])
+    for line in line_id:
+      if line != ref('list3_line1'):
+        assert self.browse(cr, uid, line).product_qty == 20.00, "Quantity of new line is wrong"
+-
+    I change the supplier of the second line
+-
+  !python {model: procurement.list.line}: |
+    line_id = self.search(cr, uid, [('product_id', '=', ref('product5')), ('list_id', '=', ref('list3')), ('id', '!=', ref('list3_line1'))])
+    self.write(cr, uid, line_id, {'supplier_id': ref('supplier6')})
+-
+    I simulate a click on Create Purchase Order button
+-
+  !python {model: procurement.list}: |
+    self.create_po(cr, uid, [ref('list3')])
+-
+    I check if two purchase orders have well created
+-
+  !assert {model: procurement.list, id: list3}:
+    - len(order_ids) == 2, "Number of sourcing documents is wrong"
+-
+    I check if the purchase orders have well confirmed
+-
+  !python {model: procurement.list}: |
+    for order in self.browse(cr, uid, ref('list3')).order_ids:
+      assert order.state == 'approved', "PO state isn't confirmed"
+    
\ No newline at end of file

=== modified file 'procurement_list/wizard/__init__.py'
--- procurement_list/wizard/__init__.py	2011-03-16 13:17:54 +0000
+++ procurement_list/wizard/__init__.py	2011-03-24 15:56:19 +0000
@@ -23,6 +23,7 @@
 import wizard_list_to_order
 import wizard_list_to_rfq
 import wizard_import_list
+import choose_supplier
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== added file 'procurement_list/wizard/choose_supplier.py'
--- procurement_list/wizard/choose_supplier.py	1970-01-01 00:00:00 +0000
+++ procurement_list/wizard/choose_supplier.py	2011-03-24 15:56:19 +0000
@@ -0,0 +1,241 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 osv import osv
+from osv import fields
+
+import netsvc
+import time
+
+from tools.translate import _
+
+
+class procurement_list_line_split(osv.osv_memory):
+    _name = 'procurement.list.line.split'
+    _description = 'Wizard to split a line into two lines'
+    
+    _columns = {
+        'line_id': fields.many2one('procurement.list.line', string='Line to split'),
+        'qty': fields.float(digits=(16,2), string='Quantity for the new line', required=True),
+    }
+    
+    def default_get(self, cr, uid, fields, context={}):
+        '''
+        Fills information for the wizard
+        '''
+        line_obj = self.pool.get('procurement.list.line')
+        
+        res = super(procurement_list_line_split, self).default_get(cr, uid, fields, context)
+        line_id = context.get('line_id', False)
+        state = context.get('state', False)
+        
+        if not line_id:
+            return res
+        
+        line = line_obj.browse(cr, uid, line_id, context=context)
+        if state == 'done':
+            raise osv.except_osv(_('Error'), _('You cannot split a line in a Done Procurement Request'))
+        
+        res['line_id'] = line_id
+        
+        # Default quantity = Old quantity divided by 2
+        res['qty'] = line_obj.browse(cr, uid, line_id, context=context).product_qty/2
+        
+        return res
+    
+    def split(self, cr, uid, ids, context={}):
+        '''
+        Changes the quantity of the old line and creates a new line with the
+        new quantity
+        '''
+        if ids and isinstance(ids, (int, long)):
+            ids = [ids]
+        line_obj = self.pool.get('procurement.list.line')
+        
+        for obj in self.browse(cr, uid, ids, context=context):
+            # Returns an error if the quantity is negative
+            if obj.qty < 0.00:
+                raise osv.except_osv(_('Error'), _('The new quantity should be positive'))
+            if obj.qty > obj.line_id.product_qty:
+                raise osv.except_osv(_('Error'), _('The new quantity can\'t be superior to the quantity of initial line'))
+            # Changes the quantity on the old line
+            line_obj.write(cr, uid, [obj.line_id.id], {'product_qty': obj.line_id.product_qty-obj.qty})
+            # Creates the new line with new quantity
+            line_obj.create(cr, uid, {'list_id': obj.line_id.list_id.id,
+                                      'product_id': obj.line_id.product_id.id,
+                                      'product_uom_id': obj.line_id.product_uom_id.id,
+                                      'product_qty': obj.qty,
+                                      'supplier_id': False,})
+            
+        return {'type': 'ir.actions.act_window_close'}
+            
+procurement_list_line_split()
+
+
+class procurement_list_line_merge(osv.osv_memory):
+    _name = 'procurement.list.line.merge'
+    _description = 'Merge Lines'
+    
+    _columns = {
+        'line_id': fields.many2one('procurement.list.line', string='Line to merged', readonly=True),
+        'line_ids': fields.many2many('procurement.list.line', 'merge_line_rel', 'merge_id', 'line_id',
+                                     string='Lines to merged'),
+    }
+    
+    def default_get(self, cr, uid, fields, context={}):
+        '''
+        Initializes data with only lines with the same product and the same
+        procurement list
+        
+        '''
+        line_obj = self.pool.get('procurement.list.line')
+        res = {}
+        
+        line_id = context.get('line_id', False)
+        state = context.get('state', False)
+        if not line_id:
+            raise osv.except_osv(_('Error'), _('No lines to merged'))
+        
+        line = line_obj.browse(cr, uid, line_id, context=context)
+        if state == 'done':
+            raise osv.except_osv(_('Error'), _('You cannot merge a line in a Done Procurement Request'))
+        product_id = line.product_id.id
+        product_uom = line.product_uom_id.id
+        wizard_id = line.list_id.id
+        
+        res['line_id'] = line_id
+        res['line_ids']= line_obj.search(cr, uid, [('list_id', '=', wizard_id), 
+                                                   ('product_id', '=', product_id),
+                                                   ('product_uom_id', '=', product_uom)])
+        
+        if line_id in res['line_ids']:
+            res['line_ids'].remove(line_id)
+        
+        return res
+    
+    def merge_confirm(self, cr, uid, ids, context={}):
+        '''
+        Merged lines
+        '''
+        if ids and isinstance(ids, (int, long)):
+            ids = [ids]
+        line_obj = self.pool.get('procurement.list.line')
+        
+        for obj in self.browse(cr, uid, ids, context=context):
+            # Get the supplier of the main line because if merge no lines, 
+            # the supplier shouldn't removed
+            supplier_id = obj.line_id.supplier_id.id
+            qty = obj.line_id.product_qty
+            for line in obj.line_ids:
+                qty += line.product_qty
+                supplier_id = False
+                line_obj.unlink(cr, uid, [line.id])
+                
+            line_obj.write(cr, uid, [obj.line_id.id], {'product_qty': qty, 'supplier_id': supplier_id})
+            
+        return {'type': 'ir.actions.act_window_close'}
+            
+procurement_list_line_merge()
+
+
+class procurement_choose_supplier_rfq(osv.osv_memory):
+    _name = 'procurement.choose.supplier.rfq'
+    _description = 'Choose Supplier tp generate RfQ'
+
+    _columns = {
+        'choose_id': fields.many2one('procurement.list', string='Wizard'),
+        'supplier_ids': fields.many2many('res.partner', 'supplier_rfq_rel', 'rfq_id', 'supplier_id',
+                                         string='Suppliers', domain=[('supplier', '=', 1)]),
+    }
+    
+    def default_get(self, cr, uid, fields, context={}):
+        '''
+        Fills information in the wizard 
+        '''
+        res = super(procurement_choose_supplier_rfq, self).default_get(cr, uid, fields, context=context)
+        wizard_id = context.get('active_id', False)
+        
+        if not wizard_id:
+            return res
+        
+        res['choose_id'] = wizard_id
+        
+        return res
+    
+    def create_rfq(self, cr, uid, ids, context={}):
+        '''
+        Creates Requests for Quotation for each supplier with all lines
+        '''
+        if ids and isinstance(ids, (int, long)):
+            ids = [ids]
+        order_obj = self.pool.get('purchase.order')
+        order_line_obj = self.pool.get('purchase.order.line')
+        proc_list_obj = self.pool.get('procurement.list')
+        proc_line_obj = self.pool.get('procurement.list.line')
+        
+        po_ids = []  # List of all created RfQ
+        
+        for obj in self.browse(cr, uid, ids):
+            origin = obj.choose_id.name
+            location_id = proc_list_obj._get_location(cr, uid, obj.choose_id.warehouse_id)
+            
+            lines = []
+            for l in obj.choose_id.line_ids: 
+                lines.append({'line_id': l.id,
+                              'product_id': l.product_id.id,
+                              'product_uom': l.product_uom_id.id,
+                              'product_name': l.product_id.name,
+                              'product_qty': l.product_qty,})
+             
+            # Creates one RfQ for each supplier
+            for s in obj.supplier_ids:
+                po_id = order_obj.create(cr, uid, {'partner_id': s.id,
+                                                   'partner_address_id': s.address_get().get('default'),
+                                                   'pricelist_id': s.property_product_pricelist.id,
+                                                   'origin': origin,
+                                                   'location_id': location_id})
+                po_ids.append(po_id)
+                # Creates lines
+                for l in lines:
+                    order_line_obj.create(cr, uid, {'product_uom': l.get('product_uom'),
+                                                    'product_id': l.get('product_id'),
+                                                    'order_id': po_id,
+                                                    'price_unit': 0.00,
+                                                    'date_planned': obj.choose_id.order_date,
+                                                    'product_qty': l.get('product_qty'),
+                                                    'name': l.get('product_name'),
+                                                    })
+                    
+        proc_id = self.browse(cr, uid, ids[0]).choose_id.id
+        proc_list_obj.write(cr, uid, proc_id, {'state': 'done', 'order_ids': [(6, 0, po_ids)]})
+        
+        return {'type': 'ir.actions.act_window',
+                'res_model': 'purchase.order',
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'domain': [('id', 'in', po_ids)]}
+
+procurement_choose_supplier_rfq()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'procurement_list/wizard/choose_supplier_view.xml'
--- procurement_list/wizard/choose_supplier_view.xml	1970-01-01 00:00:00 +0000
+++ procurement_list/wizard/choose_supplier_view.xml	2011-03-24 15:56:19 +0000
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+	<data>
+        
+        <record id="choose_supplier_line_split_qty" model="ir.ui.view">
+        	<field name="name">choose.supplier.line.split.qty</field>
+        	<field name="model">procurement.list.line.split</field>
+        	<field name="type">form</field>
+        	<field name="arch" type="xml">
+        		<form string="Split line">
+        			<separator colspan="4" string="New quantity" />
+        			<field name="qty" colspan="4" />
+        			<separator colspan="4" string="Actions" />
+        			<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2" type="object" />
+        			<button name="split" string="New line" icon="gtk-ok" colspan="2" type="object" />
+        		</form>
+        	</field>
+        </record>
+        
+        <record id="choose_supplier_line_merge" model="ir.ui.view">
+        	<field name="name">choose.supplier.line.merge</field>
+        	<field name="model">procurement.list.line.merge</field>
+        	<field name="type">form</field>
+        	<field name="arch" type="xml">
+        		<form string="Merge lines">
+        		    <separator colspan="4" string="Possible lines to merge" />
+        			<field name="line_ids" colspan="4" nolabel="1" >
+        			    <tree string="Lines">
+        			        <field name="product_id" />
+        			        <field name="product_qty" />
+        			        <field name="product_uom_id" />
+        			        <field name="supplier_id" />
+        			    </tree>
+        			</field>
+        			<separator colspan="4" />
+        			<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2" type="object" />
+        			<button name="merge_confirm" string="Merge" icon="gtk-ok" colspan="2" type="object" />
+        		</form>
+        	</field>
+        </record>
+
+        <record id="choose_supplier_rfq_form_view" model="ir.ui.view">
+            <field name="name">choose.supplier.rfq.form.view</field>
+            <field name="model">procurement.choose.supplier.rfq</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Choose Suppliers">
+                    <separator colspan="4" string="Suppliers" />
+                    <field name="supplier_ids" colspan="4" nolabel="1" />
+                    <separator colspan="4" />
+                    <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2" type="object" />
+                    <button name="create_rfq" type="object" string="Create RfQ" icon="gtk-execute" />
+                </form>
+            </field>
+        </record>
+
+	</data>
+</openerp>
+

=== removed directory 'stock_inventory_type'
=== removed file 'stock_inventory_type/__init__.py'
--- stock_inventory_type/__init__.py	2011-03-15 17:05:15 +0000
+++ stock_inventory_type/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF
-#
-#    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/>.
-#
-##############################################################################
-
-
-import stock
-import stock_move_report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== removed file 'stock_inventory_type/__openerp__.py'
--- stock_inventory_type/__openerp__.py	2011-03-15 17:05:15 +0000
+++ stock_inventory_type/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF
-#
-#    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/>.
-#
-##############################################################################
-{
-    "name" : "Stock Adjustment/Move Report",
-    "version" : "1.0",
-    "author" : "TeMPO Consulting, MSF",
-    "category": "Inventory Control",
-    "description": """
-        This module aims to help you to determine the type \
-    of your inventory adjustment and to search stock move \
-    by type of adjustment.
-    """,
-    "website": "http://unifield.msf.org",
-    "init_xml": [
-    ],
-    "depends" : [
-        "stock",
-    ],
-    "update_xml": [
-        "stock_view.xml",
-        "stock_data.xml",
-        "security/ir.model.access.csv",
-    ],
-    "demo_xml": [
-    ],
-    "test": [
-        "test/adjustment_type.yml",
-    ],
-    "installable": True,
-    "active": False,
-}

=== removed directory 'stock_inventory_type/security'
=== removed file 'stock_inventory_type/security/ir.model.access.csv'
--- stock_inventory_type/security/ir.model.access.csv	2011-03-09 14:54:31 +0000
+++ stock_inventory_type/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_adjustment_type_all","stock.adjustment.type all","model_stock_adjustment_type",,1,1,1,1

=== removed file 'stock_inventory_type/stock.py'
--- stock_inventory_type/stock.py	2011-03-15 17:05:15 +0000
+++ stock_inventory_type/stock.py	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF
-#
-#    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 osv import osv
-from osv import fields
-
-from tools.translate import _
-
-
-class stock_adjustment_type(osv.osv):
-    _name = 'stock.adjustment.type'
-    _description = 'Inventory/Move Adjustment Types'
-
-    _columns = {
-        'name': fields.char(size=64, string='Name', required=True),
-    }
-
-stock_adjustment_type()
-
-
-class stock_inventory_line(osv.osv):
-    _name = 'stock.inventory.line'
-    _inherit = 'stock.inventory.line'
-
-    _columns = {
-        'type_id': fields.many2one('stock.adjustment.type', string='Adjustment type'),
-        'comment': fields.char(size=128, string='Comment'),
-    }
-
-stock_inventory_line()
-
-
-class stock_move(osv.osv):
-    _name = 'stock.move'
-    _inherit = 'stock.move'
-
-    _columns = {
-        'type_id': fields.many2one('stock.adjustment.type', string='Adjustment type', readonly=True),
-        'comment': fields.char(size=128, string='Comment'),
-    }
-
-stock_move()
-
-
-class stock_inventory(osv.osv):
-    _name = 'stock.inventory'
-    _inherit = 'stock.inventory'
-
-    def action_confirm(self, cr, uid, ids, context={}):
-        """ Confirm the inventory and writes its finished date
-        @return True
-        """
-        # @@@override@ stock.stock_inventory.action_confirm()
-        # to perform the correct inventory corrections we need analyze stock location by
-        # location, never recursively, so we use a special context
-        product_context = dict(context, compute_child=False)
-
-        location_obj = self.pool.get('stock.location')
-        for inv in self.browse(cr, uid, ids, context=context):
-            move_ids = []
-            for line in inv.inventory_line_id:
-                pid = line.product_id.id
-                product_context.update(uom=line.product_uom.id,date=inv.date)
-                amount = location_obj._product_get(cr, uid, line.location_id.id, [pid], product_context)[pid]
-         
-                change = line.product_qty - amount
-                lot_id = line.prod_lot_id.id
-                type_id = line.type_id.id
-                if change:
-                    location_id = line.product_id.product_tmpl_id.property_stock_inventory.id
-                    value = {
-                        'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
-                        'product_id': line.product_id.id,
-                        'product_uom': line.product_uom.id,
-                        'prodlot_id': lot_id,
-                        'date': inv.date,
-                        # msf
-                        'comment': line.comment,
-                        # 
-                    }
-                    if change > 0:
-                        value.update( {
-                            'product_qty': change,
-                            'location_id': location_id,
-                            'location_dest_id': line.location_id.id,
-                        })
-                    else:
-                        value.update( {
-                            'product_qty': -change,
-                            'location_id': line.location_id.id,
-                            'location_dest_id': location_id,
-                        })
-                    if lot_id:
-                        value.update({
-                            'prodlot_id': lot_id,
-                            'product_qty': line.product_qty
-                        })
-                    # msf 
-                    if type_id:
-                        value.update({
-                            'type_id': type_id,
-                        })
-                    # 
-                    move_ids.append(self._inventory_line_hook(cr, uid, line, value))
-            message = _('Inventory') + " '" + inv.name + "' "+ _("is done.")
-            self.log(cr, uid, inv.id, message)
-            self.write(cr, uid, [inv.id], {'state': 'confirm', 'move_ids': [(6, 0, move_ids)]})
-            
-        return True
-        # @@@end
-
-stock_inventory()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== removed file 'stock_inventory_type/stock_data.xml'
--- stock_inventory_type/stock_data.xml	2011-03-09 14:54:31 +0000
+++ stock_inventory_type/stock_data.xml	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<openerp>
-	<data>
-
-        <record id="adjustment_type_loss" model="stock.adjustment.type">
-            <field name="name">Loss</field>
-        </record>
-
-        <record id="adjustment_type_scrap" model="stock.adjustment.type">
-            <field name="name">Scrap</field>
-        </record>
-
-        <record id="adjustment_type_expired" model="stock.adjustment.type">
-            <field name="name">Expired</field>
-        </record>
-
-        <record id="adjustment_type_broken" model="stock.adjustment.type">
-            <field name="name">Broken</field>
-        </record>
-
-	</data>
-</openerp>
-

=== removed file 'stock_inventory_type/stock_move_report.py'
--- stock_inventory_type/stock_move_report.py	2011-03-15 17:05:15 +0000
+++ stock_inventory_type/stock_move_report.py	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF
-#
-#    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 osv import osv
-from osv import fields
-
-from decimal_precision import decimal_precision as dp
-
-import tools
-
-
-class report_stock_move(osv.osv):
-    _name = 'report.stock.move'
-    _inherit = 'report.stock.move'
-    
-    _columns = {
-        'type_id': fields.many2one('stock.adjustment.type', string='Adjustment type'),
-    }
-    
-    def init(self, cr):
-        # @@@override@ stock.report_stock_move.init
-        tools.drop_view_if_exists(cr, 'report_stock_move')
-        cr.execute("""
-            CREATE OR REPLACE view report_stock_move AS (
-                SELECT
-                        min(sm_id) as id,
-                        sm_type_id as type_id,
-                        date_trunc('day',al.dp) as date,
-                        al.curr_year as year,
-                        al.curr_month as month,
-                        al.curr_day as day,
-                        al.curr_day_diff as day_diff,
-                        al.curr_day_diff1 as day_diff1,
-                        al.curr_day_diff2 as day_diff2,
-                        al.location_id as location_id,
-                        al.picking_id as picking_id,
-                        al.company_id as company_id,
-                        al.location_dest_id as location_dest_id,
-                        al.product_qty,
-                        al.out_qty as product_qty_out,
-                        al.in_qty as product_qty_in,
-                        al.address_id as partner_id,
-                        al.product_id as product_id,
-                        al.state as state ,
-                        al.product_uom as product_uom,
-                        al.categ_id as categ_id,
-                        coalesce(al.type, 'other') as type,
-                        al.stock_journal as stock_journal,
-                        sum(al.in_value - al.out_value) as value
-                    FROM (SELECT
-                        CASE WHEN sp.type in ('out') THEN
-                            sum(sm.product_qty * pu.factor)
-                            ELSE 0.0
-                            END AS out_qty,
-                        CASE WHEN sp.type in ('in') THEN
-                            sum(sm.product_qty * pu.factor)
-                            ELSE 0.0
-                            END AS in_qty,
-                        CASE WHEN sp.type in ('out') THEN
-                            sum(sm.product_qty * pu.factor) * pt.standard_price
-                            ELSE 0.0
-                            END AS out_value,
-                        CASE WHEN sp.type in ('in') THEN
-                            sum(sm.product_qty * pu.factor) * pt.standard_price
-                            ELSE 0.0
-                            END AS in_value,
-                        min(sm.id) as sm_id,
-                        sm.date as dp,
-                        sm.type_id as sm_type_id,
-                        to_char(date_trunc('day',sm.date), 'YYYY') as curr_year,
-                        to_char(date_trunc('day',sm.date), 'MM') as curr_month,
-                        to_char(date_trunc('day',sm.date), 'YYYY-MM-DD') as curr_day,
-                        avg(date(sm.date)-date(sm.create_date)) as curr_day_diff,
-                        avg(date(sm.date_expected)-date(sm.create_date)) as curr_day_diff1,
-                        avg(date(sm.date)-date(sm.date_expected)) as curr_day_diff2,
-                        sm.location_id as location_id,
-                        sm.location_dest_id as location_dest_id,
-                        sum(sm.product_qty) as product_qty,
-                        pt.categ_id as categ_id ,
-                        sm.address_id as address_id,
-                        sm.product_id as product_id,
-                        sm.picking_id as picking_id,
-                            sm.company_id as company_id,
-                            sm.state as state,
-                            sm.product_uom as product_uom,
-                            sp.type as type,
-                            sp.stock_journal_id AS stock_journal
-                    FROM
-                        stock_move sm
-                        LEFT JOIN stock_picking sp ON (sm.picking_id=sp.id)
-                        LEFT JOIN product_product pp ON (sm.product_id=pp.id)
-                        LEFT JOIN product_uom pu ON (sm.product_uom=pu.id)
-                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
-                        LEFT JOIN stock_location sl ON (sm.location_id = sl.id)
-
-                    GROUP BY
-                        sm.id,sp.type, sm.date,sm.address_id, sm.type_id,
-                        sm.product_id,sm.state,sm.product_uom,sm.date_expected,
-                        sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
-                        sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id, sp.stock_journal_id)
-                    AS al
-
-                    GROUP BY
-                        al.out_qty,al.in_qty,al.curr_year,al.curr_month, al.sm_type_id,
-                        al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
-                        al.address_id,al.product_id,al.state,al.product_uom,
-                        al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id, al.stock_journal
-               )
-        """)
-        # @@@end
-
-report_stock_move()

=== removed file 'stock_inventory_type/stock_view.xml'
--- stock_inventory_type/stock_view.xml	2011-03-15 17:05:15 +0000
+++ stock_inventory_type/stock_view.xml	1970-01-01 00:00:00 +0000
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<openerp>
-	<data>
-
-        <!-- Stock Adjustment Types -->
-
-        <record id="stock_adjustment_type_form_view" model="ir.ui.view">
-            <field name="name">stock.adjustment.type.form.view</field>
-            <field name="model">stock.adjustment.type</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Adjustment Type">
-                    <field name="name" colspan="4" select="1" />
-                </form>
-            </field>
-        </record>
-
-        <record id="stock_adjustment_type_tree_view" model="ir.ui.view">
-            <field name="name">stock.adjustment.type.tree.view</field>
-            <field name="model">stock.adjustment.type</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Adjustment Types">
-                    <field name="name" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_stock_adjustment_type" model="ir.actions.act_window">
-            <field name="name">Stock Adjustment Types</field>
-            <field name="res_model">stock.adjustment.type</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem
-            name="Inventory"
-            id="menu_configuration_inventory"
-            parent="stock.menu_stock_configuration" />
-
-        <menuitem
-            action="action_stock_adjustment_type"
-            id="menu_stock_adjustment_type"
-            parent="menu_configuration_inventory" />
-
-
-        <!-- Overrirde Stock Inventory Lines -->
-        <record id="stock_inventory_line_tree_type_id" model="ir.ui.view">
-            <field name="name">stock.inventory.line.tree.type.id</field>
-            <field name="model">stock.inventory.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="stock.stock_inventory_line_tree" />
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='prodlot_id']" position="after">
-                    <field name="type_id" widget="selection" />
-                    <field name="comment" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="stock_inventory_line_form_type_id" model="ir.ui.view">
-            <field name="name">stock.inventory.line.form.type.id</field>
-            <field name="model">stock.inventory.line</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="stock.stock_inventory_line_tree" />
-            <field name="arch" type="xml">
-                <xpath expr="/form/field[@name='prodlot_id']" position="after">
-                    <field name="type_id" widget="selection" />
-                    <field name="comment" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="stock_inventory_form_type_id" model="ir.ui.view">
-            <field name="name">stock.inventory.form.type.id</field>
-            <field name="model">stock.inventory</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="stock.view_inventory_form" />
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/notebook/page/field[@name='inventory_line_id']/tree/field[@name='product_id']" position="after">
-                        <field name="type_id" widget="selection" />
-                        <field name="comment" />
-                    </xpath>
-                    <xpath expr="/form/notebook/page/field[@name='inventory_line_id']/form/field[@name='product_id']" position="after">
-                        <field name="type_id" widget="selection" />
-                        <field name="comment" />
-                    </xpath>
-                    <xpath expr="/form/notebook/page[@string='Posted Inventory']/field[@name='move_ids']/tree/field[@name='prodlot_id']" position="after">
-                        <field name="type_id" widget="selection" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <!-- Override Stock Moves -->
-        <record id="stock_move_tree_type_id" model="ir.ui.view">
-            <field name="name">stock.move.tree.type.id</field>
-            <field name="model">stock.move</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="stock.stock_move_tree" />
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='prodlot_id']" position="after">
-                    <field name="type_id" widget="selection" />
-                    <field name="comment" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="stock_move_tree2_type_id" model="ir.ui.view">
-            <field name="name">stock.move.tree2.type.id</field>
-            <field name="model">stock.move</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="stock.stock_move_tree2" />
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='prodlot_id']" position="after">
-                    <field name="type_id" widget="selection" />
-                    <field name="comment" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_move_tree_type_id" model="ir.ui.view">
-            <field name="name">view.move.tree.type.id</field>
-            <field name="model">stock.move</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="stock.view_move_tree" />
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='create_date']" position="after">
-                    <field name="type_id" widget="selection" />
-                    <field name="comment" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_move_form_type_id" model="ir.ui.view">
-            <field name="name">view.move.form.type.id</field>
-            <field name="model">stock.move</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="stock.view_move_form" />
-            <field name="arch" type="xml">
-                <xpath expr="/form/group/button[@string='Scrap']" position="after">
-                    <field name="type_id" widget="selection" />
-                    <field name="comment" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_move_search_type_id" model="ir.ui.view">
-            <field name="name">view.move.search.type.id</field>
-            <field name="model">stock.move</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="stock.view_move_search" />
-            <field name="arch" type="xml">
-                <xpath expr="/search/group/field[@name='product_id']" position="before">
-                    <field name="type_id" widget="selection" />
-                    <field name="comment" />
-                </xpath>
-            </field>
-        </record>
-        
-        <record id="view_stock_tree_type_id" model="ir.ui.view">
-        	<field name="name">view.stock.tree.type.id</field>
-        	<field name="model">report.stock.move</field>
-        	<field name="type">tree</field>
-        	<field name="inherit_id" ref="stock.view_stock_tree" />
-        	<field name="arch" type="xml">
-        		<xpath expr="/tree/field[@name='type']" position="after">
-        			<field name="type_id" />
-        		</xpath>
-        	</field>
-        </record>
-        
-        <record id="view_stock_search_type_id" model="ir.ui.view">
-        	<field name="name">view.stock.search.type.id</field>
-        	<field name="model">report.stock.move</field>
-        	<field name="type">search</field>
-        	<field name="inherit_id" ref="stock.view_stock_search" />
-        	<field name="arch" type="xml">
-        		<data>
-	        		<xpath expr="/search/group/separator[3]" position="after">
-	        			<field name="type_id" widget="selection" />
-	        		</xpath>
-	        		<xpath expr="/search/group[@string='Group By...']/filter[@name='group_type']" position="after">
-	        			<filter string="Adjustment Type" name="group_type_id" icon="terp-stock_symbol-selection" context="{'group_by':'type_id'}" />
-	        		</xpath>
-                    <xpath expr="/search/group[@string='Group By...']/separator[5]" position="replace">
-                        <newline />
-                    </xpath>
-        		</data>
-        	</field>
-        </record>
-
-	</data>
-</openerp>
-

=== removed directory 'stock_inventory_type/test'
=== removed file 'stock_inventory_type/test/adjustment_type.yml'
--- stock_inventory_type/test/adjustment_type.yml	2011-03-09 16:36:19 +0000
+++ stock_inventory_type/test/adjustment_type.yml	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-- 
-  In order to test the stock_inventory_type module, I will create product,
-  create a physical inventory, fill inventory lines from location
--
-  I create a product category
--
-  !record {model: product.category, id: product_category1}:
-    name: Categ1
--
-  I create the first product (P1)
--
-  !record {model: product.product, id: product_p1}:
-    valuation: manual_periodic
-    supply_method: produce
-    mes_type: fixed
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    type: product
-    procure_method: make_to_stock
-    cost_method: standard
-    categ_id: stock_inventory_type.product_category1
-    name: P1
-    standard_price: 10.0
--
-  I create the second product (P2)
--
-  !record {model: product.product, id: product_p2}:
-    valuation: manual_periodic
-    supply_method: produce
-    mes_type: fixed
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    type: product
-    procure_method: make_to_stock
-    cost_method: standard
-    categ_id: stock_inventory_type.product_category1
-    name: P2
-    standard_price: 20.0
--
-    I create the third product (P3)
--
-  !record {model: product.product, id: product_p3}:
-    valuation: manual_periodic
-    supply_method: produce
-    mes_type: fixed
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    type: product
-    procure_method: make_to_stock
-    cost_method: standard
-    categ_id: stock_inventory_type.product_category1
-    name: P3
-    standard_price: 30.0
--
-    I create a physical inventory
--
-  !record {model: stock.inventory, id: stock_inventory1}:
-    company_id: base.main_company
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    inventory_line_id:
-      - company_id: base.main_company
-        location_id: stock.stock_location_stock
-        product_id: stock_inventory_type.product_p1
-        product_qty: 70.0
-        product_uom: product.product_uom_unit
-        type_id: stock_inventory_type.adjustment_type_loss
-        comment: Loss items
-      - company_id: base.main_company
-        location_id: stock.stock_location_stock
-        product_id: stock_inventory_type.product_p2
-        product_qty: 50.0
-        product_uom: product.product_uom_unit
-        type_id: stock_inventory_type.adjustment_type_expired
-        comment: Expired product at 12/12/2012
-      - company_id: base.main_company
-        location_id: stock.stock_location_stock
-        product_id: stock_inventory_type.product_p3
-        product_qty: 10.0
-        product_uom: product.product_uom_unit
-        type_id: stock_inventory_type.adjustment_type_scrap
-    name: Test of UNI-SUP-1.15
-    state: draft
--
-    I confirm the Inventory
--
-  !python {model: stock.inventory}: |
-    self.action_confirm(cr, uid, [ref('stock_inventory1')])
-    self.action_done(cr, uid, [ref('stock_inventory1')])
--
-    I check the 'Loss' stock moves
--
-  !python {model: stock.move}: |
-    move_ids = self.search(cr, uid, [('type_id', '=', ref('stock_inventory_type.adjustment_type_loss'))])
-    assert move_ids, "No lines with 'Loss' type"
-    move = self.browse(cr, uid, move_ids[0])
-    assert move.product_id.id == ref('stock_inventory_type.product_p1'), "Move product (P1) is not correct"
-    assert move.product_qty == 70.0, "Move quatity (70.0) is not correct"
-    assert move.comment == 'Loss items', "Move comment (Loss items) is not correct"
--
-    I check the 'Expired' stock moves
--
-  !python {model: stock.move}: |
-    move_ids = self.search(cr, uid, [('type_id', '=', ref('stock_inventory_type.adjustment_type_expired'))])
-    assert move_ids, "No lines with 'Expired' type"
-    move = self.browse(cr, uid, move_ids[0])
-    assert move.product_id.id == ref('stock_inventory_type.product_p2'), "Move product (P2) is not correct"
-    assert move.product_qty == 50.0, "Move quatity (50.0) is not correct"
-    assert move.comment == 'Expired product at 12/12/2012', "Move comment (Expired product at 12/12/2012) is not correct"
--
-    I check the 'Scrapped' stock moves
--
-  !python {model: stock.move}: |
-    move_ids = self.search(cr, uid, [('type_id', '=', ref('stock_inventory_type.adjustment_type_scrap'))])
-    assert move_ids, "No lines with 'Scrap' type"
-    move = self.browse(cr, uid, move_ids[0])
-    assert move.product_id.id == ref('stock_inventory_type.product_p3'), "Move product (P3) is not correct"
-    assert move.product_qty == 10.0, "Move quatity (10.0) is not correct"