Merge lp:~domsense/domsense-agilebg-addons/adding_product_variant_selection into lp:domsense-agilebg-addons/6.1

[Lorenzo Battistini]

[lp:~domsense/domsense-agilebg-addons/adding_product_variant_selection]

194. By Lorenzo Battistini on 2012-04-18

[FIx] when variants data not complete

195. By Lorenzo Battistini on 2012-04-19

[add] not working frame_contract

196. By Lorenzo Battistini on 2012-04-20

[DEL] frame_contract

197. By Lorenzo Battistini on 2012-04-23

[ADD] stock_picking_related - working draft

198. By Lorenzo Battistini on 2012-04-23

[fix] readonly fields

199. By Lorenzo Battistini on 2012-04-23

[imp] module description

200. By Lorenzo Battistini on 2012-04-24

[ADD] sale_multi_picking

201. By Lorenzo Battistini on 2012-04-25

[ADD] sale_delivery_term - first not working draft

202. By Lorenzo Battistini on 2012-04-26

[ADD] sale_delivery_term - working prototype

203. By Lorenzo Battistini on 2012-04-26

[ADD] sale_delivery_term_variant_selection

204. By Lorenzo Battistini on 2012-04-26

[ADD] order line groups registry

205. By Lorenzo Battistini on 2012-04-26

[ADD] purchase_multi_picking

206. By Lorenzo Battistini on 2012-04-26

[ADD] purchase_delivery_term

207. By Lorenzo Battistini on 2012-04-27

[FIX] purchase_delivery_term

208. By Lorenzo Battistini on 2012-04-27

[ADD] purchase_delivery_term_variant_selection

209. By Lorenzo Battistini on 2012-04-27

[ADD] delivery terms - percentage check

210. By Lorenzo Battistini on 2012-04-30

[ADD] picking tree view

211. By Lorenzo Battistini on 2012-04-30

[ADD] delivery_term_variant_selection - writing variant data to detailed order lines

212. By Lorenzo Battistini on 2012-05-03

[add] stock_picking_related - qty and total qty

213. By Lorenzo Battistini on 2012-05-09

[ADD] sale_purchase_orders_super_list first draft

214. By Lorenzo Battistini on 2012-05-09

[fix] state view

215. By Lorenzo Battistini on 2012-05-09

[IMP] superlist enhancements

216. By Lorenzo Battistini on 2012-05-09

[fix] triggering computation

217. By Lorenzo Battistini on 2012-05-09

[rem] comments

218. By Lorenzo Battistini on 2012-05-16

[IMP] delivery terms
allowing duplicating orders

219. By Lorenzo Battistini on 2012-05-31

[fix] typo

220. By Lorenzo Battistini on 2012-06-12

[FIX] stock_picking_related - using the correct view

221. By Lorenzo Battistini on 2012-06-14

[IMP] delivery terms - allowing more flexibility for derivated modules

=== added directory 'product_variant_selection'
=== added file 'product_variant_selection/AUTHORS.txt'
--- product_variant_selection/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ product_variant_selection/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'product_variant_selection/__init__.py'
--- product_variant_selection/__init__.py	1970-01-01 00:00:00 +0000
+++ product_variant_selection/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 invoice_line

=== added file 'product_variant_selection/__openerp__.py'
--- product_variant_selection/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_variant_selection/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Product Variants Selection for Invoices",
+    'version': '0.1',
+    'category': 'Sales Management',
+    'description': """
+This module helps to select the product when many variants are available in the system.
+It extends the invoice line form allowing the user to pre-select product template and its variants in order to load the desired product(s) only.
+""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['account', 'product_variant_multi'],
+    "init_xml" : [],
+    "update_xml" : [
+        'invoice_line_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'product_variant_selection/i18n'
=== added file 'product_variant_selection/invoice_line.py'
--- product_variant_selection/invoice_line.py	1970-01-01 00:00:00 +0000
+++ product_variant_selection/invoice_line.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields,osv
+
+class account_invoice_line(osv.osv):
+
+    _inherit = "account.invoice.line"
+    _columns = {
+        "product_tmpl_id": fields.many2one('product.template', "Product Template"),
+        'variant_line_ids': fields.one2many('product.select.variant.line', 'invoice_line_id', 'Variants'),
+        }
+    
+    def pre_selection_changed(self, cr, uid, ids, product_tmpl_id, variant_line_ids):
+        prod_ids = self.search_products(cr, uid, product_tmpl_id, variant_line_ids=variant_line_ids)
+        res = {'domain': {'product_id': [('id', 'in', prod_ids)]}}
+        if len(prod_ids) == 1:
+            res['value'] = {'product_id': prod_ids[0]}
+        return res
+        
+    def search_products(self, cr, uid, product_tmpl_id, variant_line_ids=[], context=None):
+        if context is None:
+            context = {}
+        prod_pool = self.pool.get('product.product')
+        option_ids = []
+        product_ids = []
+        # collect options
+        for variant in variant_line_ids:
+            if variant[2] and variant[2].get('option_id', False) and variant[2]['option_id'] not in option_ids:
+                option_ids.append(variant[2]['option_id'])
+        # search for all variants of that template
+        prod_ids = prod_pool.search(cr, uid, [('product_tmpl_id', '=', product_tmpl_id)],
+            context=context)
+        if option_ids:
+            for prod in prod_pool.browse(cr, uid, prod_ids, context=context):
+                options_found = 0
+                for option_id in option_ids:
+                    # find matching variants
+                    if option_id in [dim.option_id.id for dim in prod.dimension_value_ids]:
+                        options_found +=1
+                # if product contains every selected option
+                if options_found == len(option_ids):
+                    product_ids.append(prod.id)
+        else:
+            product_ids = prod_ids
+        return product_ids
+        
+account_invoice_line()
+
+class product_select_variant_line(osv.osv):
+
+    _name = "product.select.variant.line"
+    _columns = {
+        'dimension_id' : fields.many2one('product.variant.dimension.type', 'Dimension Type', required=True),
+        'option_id' : fields.many2one('product.variant.dimension.option', 'Option', required=True),
+        'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice line'),
+        }
+product_select_variant_line()

=== added file 'product_variant_selection/invoice_line_view.xml'
--- product_variant_selection/invoice_line_view.xml	1970-01-01 00:00:00 +0000
+++ product_variant_selection/invoice_line_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_invoice_line_form" model="ir.ui.view">
+            <field name="name">account.invoice.line.form</field>
+            <field name="model">account.invoice.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_invoice_line_form"></field>
+            <field name="arch" type="xml">
+                <field name="product_id" position="before">
+                    <field name="product_tmpl_id" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)"/>
+                    <newline/>
+                    <field name="variant_line_ids" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)" nolabel="1" colspan="4" attrs="{'readonly': [('product_tmpl_id', '=', False)]}">
+                        <tree string="Variants" editable="bottom">
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </tree>
+                        <form string="Variants" >
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </form>
+                    </field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'product_variant_selection/security'
=== added file 'product_variant_selection/security/ir.model.access.csv'
--- product_variant_selection/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ product_variant_selection/security/ir.model.access.csv	2012-06-14 14:09:20 +0000
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+product_select_variant_line,product_select_variant_line,model_product_select_variant_line,account.group_account_invoice,1,1,1,1
+product_select_variant_line_user,product_select_variant_line user,model_product_select_variant_line,base.group_user,1,0,0,0
+product_select_variant_line_accountant,product_select_variant_line accountant,model_product_select_variant_line,account.group_account_user,1,0,0,0

=== added directory 'purchase_delivery_term'
=== added file 'purchase_delivery_term/AUTHORS.txt'
--- purchase_delivery_term/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'purchase_delivery_term/__init__.py'
--- purchase_delivery_term/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 purchase

=== added file 'purchase_delivery_term/__openerp__.py'
--- purchase_delivery_term/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Purchase delivery terms",
+    'version': '0.1',
+    'category': 'Purchase Management',
+    'description': """
+Delivery term for purchase orders.
+You can configure delivery terms specifying the quantity percentage and the delay for every term line.
+You can then associate the term to the 'main' order line and generate the 'detailed' order lines which in turn will generate several pickings according to delivery term (thanks to 'purchase_multi_picking' module).
+""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['purchase_multi_picking'],
+    "init_xml" : [],
+    "update_xml" : [
+        'purchase_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'purchase_delivery_term/i18n'
=== added file 'purchase_delivery_term/purchase.py'
--- purchase_delivery_term/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term/purchase.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,189 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields, osv
+from tools.translate import _
+import decimal_precision as dp
+from datetime import datetime, timedelta
+from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+
+class purchase_delivery_term(osv.osv):
+    _name = 'purchase.delivery.term'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'line_ids': fields.one2many('purchase.delivery.term.line', 'term_id', 'Lines', required=True),
+        'company_id': fields.many2one('res.company','Company',required=True,select=1),
+        }
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.delivery.term', context=c),
+    }
+    
+    def is_total_percentage_correct(self, cr, uid, term_ids, context=None):
+        for term in self.browse(cr, uid, term_ids, context=context):
+            total = 0.0
+            for line in term.line_ids:
+                total += line.quantity_perc
+            if total != 1 :
+                return False
+        return True
+        
+purchase_delivery_term()
+
+class purchase_delivery_term_line(osv.osv):
+
+    _name = 'purchase.delivery.term.line'
+    _columns = {
+        'term_id': fields.many2one('purchase.delivery.term', 'Term'),
+        'quantity_perc': fields.float('Quantity percentage', required=True, help="For 20% set '0.2'"),
+        'delay': fields.float('Delivery Lead Time', required=True,
+            help="Number of days between the order confirmation and the shipping of the products from the supplier"),
+        }
+purchase_delivery_term_line()
+
+class purchase_order_line_master(osv.osv):
+    
+    def onchange_product_id(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id,
+            partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
+            name=False, price_unit=False, notes=False, context=None):
+        return self.pool.get('purchase.order.line').onchange_product_id(
+            cr, uid, ids, pricelist_id, product_id, qty, uom_id,
+            partner_id, date_order=date_order, fiscal_position_id=fiscal_position_id, date_planned=date_planned,
+            name=name, price_unit=price_unit, notes=notes, context=context)
+        
+    def onchange_product_uom(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id,
+            partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
+            name=False, price_unit=False, notes=False, context=None):
+        return self.pool.get('purchase.order.line').onchange_product_uom(cr, uid, ids, pricelist_id, product_id, qty, uom_id,
+            partner_id, date_order=date_order, fiscal_position_id=fiscal_position_id, date_planned=date_planned,
+            name=name, price_unit=price_unit, notes=notes, context=context)
+
+    def _amount_line(self, cr, uid, ids, prop, arg, context=None):
+        res = {}
+        cur_obj=self.pool.get('res.currency')
+        tax_obj = self.pool.get('account.tax')
+        for line in self.browse(cr, uid, ids, context=context):
+            taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty)
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
+        return res
+        
+    def _get_uom_id(self, cr, uid, context=None):
+        return self.pool.get('purchase.order.line')._get_uom_id(cr, uid, context=context)
+        
+    _name = 'purchase.order.line.master'
+    _columns = {
+        'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
+        'delivery_term_id': fields.many2one('purchase.delivery.term', 'Delivery term', required=True),
+        'name': fields.char('Description', size=256, required=True),
+        'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Purchase Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
+        'order_line_ids': fields.one2many('purchase.order.line', 'master_line_id', 'Detailed lines'),
+        'taxes_id': fields.many2many('account.tax', 'purchase_master_order_line_tax', 'ord_line_id', 'tax_id', 'Taxes'),
+        'date_planned': fields.date('Scheduled Date', required=True, select=True),
+        }
+    _defaults = {
+        'product_uom' : _get_uom_id,
+        'product_qty': lambda *a: 1.0,
+    }
+        
+    def generate_detailed_lines(self, cr, uid, ids, context=None):
+        group_pool = self.pool.get('purchase.order.line.group')
+        order_line_pool = self.pool.get('purchase.order.line')
+        group_ids = group_pool.search(cr, uid, [])
+        for master_line in self.browse(cr, uid, ids):
+            if master_line.order_line_ids:
+                raise osv.except_osv(_('Error'),
+                    _("Detailed lines generated yet (for master line '%s'). Remove them first") % master_line.name)
+            if len(master_line.delivery_term_id.line_ids) > len(group_ids):
+                raise osv.except_osv(_('Error'),
+                    _("Delivery term lines are %s. Order line groups are %s. Please create more groups")
+                    % (str(len(master_line.delivery_term_id.line_ids)), str(len(group_ids))))
+            if not master_line.delivery_term_id.is_total_percentage_correct():
+                raise osv.except_osv(_('Error'),
+                    _("Total percentage of delivery term %s is not equal to 1") % master_line.delivery_term_id.name)
+            group_index  = 0
+            for term_line in master_line.delivery_term_id.line_ids:
+                product_qty = master_line.product_qty * term_line.quantity_perc
+                order_line_vals = {}
+                on_change_res = order_line_pool.onchange_product_id(cr, uid, ids,
+                    master_line.order_id.pricelist_id.id, master_line.product_id.id, master_line.product_qty, master_line.product_uom.id,
+                    master_line.order_id.partner_id.id, date_order=master_line.order_id.date_order, fiscal_position_id=master_line.order_id.fiscal_position.id, date_planned=master_line.date_planned,
+                    name=master_line.name, price_unit=master_line.price_unit, notes=False, context=context)
+                order_line_vals.update(on_change_res['value'])
+                date_planned = datetime.strptime(master_line.date_planned, 
+                    DEFAULT_SERVER_DATE_FORMAT) + timedelta(term_line.delay)
+                order_line_vals.update({
+                    'order_id': master_line.order_id.id,
+                    'name': master_line.name,
+                    'price_unit': master_line.price_unit,
+                    'product_qty': product_qty,
+                    'product_uom': master_line.product_uom.id,
+                    'product_id': master_line.product_id and master_line.product_id.id or False,
+                    'master_line_id': master_line.id,
+                    'date_planned': date_planned,
+                    'picking_group_id': group_ids[group_index],
+                    'taxes_id': [(6,0, [tax.id for tax in master_line.taxes_id])],
+                    })
+                group_index += 1
+                order_line_pool.create(cr, uid, order_line_vals, context=context)
+        return True
+        
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'order_line_ids': [],
+            })
+        return super(purchase_order_line_master, self).copy_data(cr, uid, id, default, context=context)
+        
+purchase_order_line_master()
+
+class purchase_order_line(osv.osv):
+    _inherit = 'purchase.order.line'
+    _columns = {
+        'master_line_id': fields.many2one('purchase.order.line.master', 'Master Line'),
+        }
+        
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({'master_line_id': False})
+        return super(purchase_order_line, self).copy_data(cr, uid, id, default, context=context)
+purchase_order_line()
+
+class purchase_order(osv.osv):
+    _inherit = 'purchase.order'
+    _columns = {
+        'master_order_line': fields.one2many('purchase.order.line.master', 'order_id', 'Master Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
+        }
+        
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'order_line': [],
+        })
+        return super(purchase_order, self).copy(cr, uid, id, default, context=context)
+purchase_order()

=== added file 'purchase_delivery_term/purchase_view.xml'
--- purchase_delivery_term/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term/purchase_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,82 @@
+<openerp>
+    <data>
+        <record id="purchase_delivery_term_form" model="ir.ui.view">
+            <field name="name">purchase.delivery.term.form</field>
+            <field name="model">purchase.delivery.term</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Delivery term">
+                    <field name="name" select="1"/>
+                    <field name="line_ids" string="Term Lines" colspan="4" nolabel="1">
+                        <form>
+                            <field name="quantity_perc"></field>
+                            <field name="delay"></field>
+                        </form>
+                        <tree editable="bottom">
+                            <field name="quantity_perc"></field>
+                            <field name="delay"></field>
+                        </tree>
+                    </field>
+                </form>
+            </field>
+        </record>
+        <record id="action_delivery_term_form" model="ir.actions.act_window">
+            <field name="name">Delivery Terms</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.delivery.term</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem action="action_delivery_term_form" id="menu_action_delivery_term_form" parent="purchase.menu_configuration_misc" />
+        
+        <record id="purchase_order_line_master_form" model="ir.ui.view">
+            <field name="name">purchase_order_line_master_form</field>
+            <field name="model">purchase.order.line.master</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Master order line">
+                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,False,context)" required="1"/>
+                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,False,context)"/>
+                    <field name="product_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,False,context)"/>
+                    <field name="name" colspan="4"/>
+                    <field name="date_planned" widget="date"/>
+                    <field name="price_unit" />
+                    <field name="delivery_term_id" />
+                    <separator colspan="4" string="Taxes"/>
+                    <field colspan="4" nolabel="1" name="taxes_id"
+                    domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+                </form>
+            </field>
+        </record>
+        <record id="purchase_order_line_master_tree" model="ir.ui.view">
+            <field name="name">purchase_order_line_master_tree</field>
+            <field name="model">purchase.order.line.master</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Master order lines">
+                    <field name="date_planned" />
+                    <field name="name" />
+                    <field name="price_unit" />
+                    <field name="product_qty" />
+                    <field name="product_uom" />
+                    <field name="price_subtotal" />
+                    <field name="delivery_term_id" />
+                    <button name="generate_detailed_lines" string="Generate detailed lines" icon="gtk-go-forward" type="object"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="purchase_order_form" model="ir.ui.view">
+            <field name="name">purchase.order.form</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"></field>
+            <field name="arch" type="xml">
+                <field name="order_line" position="before">
+                    <field colspan="4" name="master_order_line" nolabel="1"></field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'purchase_delivery_term/security'
=== added file 'purchase_delivery_term/security/ir.model.access.csv'
--- purchase_delivery_term/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term/security/ir.model.access.csv	2012-06-14 14:09:20 +0000
@@ -0,0 +1,10 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_purchase_order_line_master,purchase.order.line_master user,model_purchase_order_line_master,purchase.group_purchase_user,1,1,1,1
+access_purchase_order_line_master_stock_worker,purchase.order.line_master stock,model_purchase_order_line_master,stock.group_stock_user,1,0,0,0
+access_purchase_order_line_master_manager,purchase.order.line_master manager,model_purchase_order_line_master,purchase.group_purchase_manager,1,1,1,1
+access_purchase_delivery_term,purchase_delivery_term user,model_purchase_delivery_term,purchase.group_purchase_user,1,0,0,0
+access_purchase_delivery_term_stock_worker,purchase_delivery_term stock,model_purchase_delivery_term,stock.group_stock_user,1,0,0,0
+access_purchase_delivery_term_manager,purchase_delivery_term manager,model_purchase_delivery_term,purchase.group_purchase_manager,1,1,1,1
+access_purchase_delivery_term_line,purchase_delivery_term_line user,model_purchase_delivery_term_line,purchase.group_purchase_user,1,0,0,0
+access_purchase_delivery_term_line_stock_worker,purchase_delivery_term_line stock,model_purchase_delivery_term_line,stock.group_stock_user,1,0,0,0
+access_purchase_delivery_term_line_manager,purchase_delivery_term_line manager,model_purchase_delivery_term_line,purchase.group_purchase_manager,1,1,1,1

=== added directory 'purchase_delivery_term_variant_selection'
=== added file 'purchase_delivery_term_variant_selection/AUTHORS.txt'
--- purchase_delivery_term_variant_selection/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term_variant_selection/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'purchase_delivery_term_variant_selection/__init__.py'
--- purchase_delivery_term_variant_selection/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term_variant_selection/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 purchase

=== added file 'purchase_delivery_term_variant_selection/__openerp__.py'
--- purchase_delivery_term_variant_selection/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term_variant_selection/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Purchase delivery term with variant selection",
+    'version': '0.1',
+    'category': 'Purchase Management',
+    'description': """
+Product Variants Selection for Purchase Orders with delivery terms - See 'product_variant_selection' and 'purchase_delivery_term' modules
+""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['purchase_product_variant_selection', 'purchase_delivery_term'],
+    "init_xml" : [],
+    "update_xml" : [
+        'purchase_view.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'purchase_delivery_term_variant_selection/i18n'
=== added file 'purchase_delivery_term_variant_selection/purchase.py'
--- purchase_delivery_term_variant_selection/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term_variant_selection/purchase.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields,osv
+
+class purchase_order_line_master(osv.osv):
+
+    _inherit = "purchase.order.line.master"
+    _columns = {
+        "product_tmpl_id": fields.many2one('product.template', "Product Template"),
+        'variant_line_ids': fields.one2many('product.select.variant.line', 'master_po_line_id', 'Variants'),
+        }
+    
+    def pre_selection_changed(self, cr, uid, ids, product_tmpl_id, variant_line_ids):
+        prod_ids = self.pool.get('account.invoice.line').search_products(
+            cr, uid, product_tmpl_id, variant_line_ids=variant_line_ids)
+        res = {'domain': {'product_id': [('id', 'in', prod_ids)]}}
+        if len(prod_ids) == 1:
+            res['value'] = {'product_id': prod_ids[0]}
+        return res
+        
+    def generate_detailed_lines(self, cr, uid, ids, context=None):
+        res = super(purchase_order_line_master, self).generate_detailed_lines(
+            cr, uid, ids, context=context)
+        var_line_pool = self.pool.get('product.select.variant.line')
+        for master_line in self.browse(cr, uid, ids, context=context):
+            for order_line in master_line.order_line_ids:
+                if master_line.product_tmpl_id:
+                    order_line.write({'product_tmpl_id': master_line.product_tmpl_id.id})
+                for variant_line in master_line.variant_line_ids:
+                    var_line_pool.create(cr, uid, {
+                        'dimension_id': variant_line.dimension_id.id,
+                        'option_id': variant_line.option_id.id,
+                        'po_line_id': order_line.id,
+                        }, context=context)
+        return res
+        
+purchase_order_line_master()
+
+class product_select_variant_line(osv.osv):
+
+    _inherit = "product.select.variant.line"
+    _columns = {
+        'master_po_line_id': fields.many2one('purchase.order.line.master', 'Master PO line'),
+        }
+product_select_variant_line()

=== added file 'purchase_delivery_term_variant_selection/purchase_view.xml'
--- purchase_delivery_term_variant_selection/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_delivery_term_variant_selection/purchase_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_purchase_order_line_master_form" model="ir.ui.view">
+            <field name="name">purchase.order.line.master.form</field>
+            <field name="model">purchase.order.line.master</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase_delivery_term.purchase_order_line_master_form"></field>
+            <field name="arch" type="xml">
+                <field name="product_id" position="before">
+                    <field name="product_tmpl_id" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)"/>
+                    <newline/>
+                    <field name="variant_line_ids" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)" nolabel="1" colspan="5" attrs="{'readonly': [('product_tmpl_id', '=', False)]}">
+                        <tree string="Variants" editable="bottom">
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </tree>
+                        <form string="Variants" >
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </form>
+                    </field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'purchase_delivery_term_variant_selection/security'
=== added directory 'purchase_multi_picking'
=== added file 'purchase_multi_picking/AUTHORS.txt'
--- purchase_multi_picking/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ purchase_multi_picking/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'purchase_multi_picking/__init__.py'
--- purchase_multi_picking/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_multi_picking/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 purchase

=== added file 'purchase_multi_picking/__openerp__.py'
--- purchase_multi_picking/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_multi_picking/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Multi Pickings from Purchase Orders",
+    'version': '0.1',
+    'category': 'Purchase Management',
+    'description': """
+This module allows to generate several pickings from the same purchase order.
+You just have to indicate which order lines have to be grouped in the same picking. When confirming the order, for each group a picking is generated.
+""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['purchase'],
+    "init_xml" : [],
+    "update_xml" : [
+        'purchase_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'purchase_multi_picking/i18n'
=== added file 'purchase_multi_picking/purchase.py'
--- purchase_multi_picking/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_multi_picking/purchase.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields, osv
+
+class purchase_order_line_group(osv.osv):
+    _name = 'purchase.order.line.group'
+    _columns = {
+        'name': fields.char('Group', size=64, required=True),
+        'company_id': fields.many2one('res.company','Company',required=True,select=1),
+        }
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order.line.group', context=c),
+    }
+purchase_order_line_group()
+
+class purchase_order_line(osv.osv):
+    _inherit = 'purchase.order.line'
+    _columns = {
+        'picking_group_id': fields.many2one('purchase.order.line.group', 'Group'),
+        }
+purchase_order_line()
+
+class purchase_order(osv.osv):
+    _inherit = 'purchase.order'
+
+    def action_picking_create(self, cr, uid, ids, context=None):
+        picking_pool = self.pool.get('stock.picking')
+        picking_ids = []
+        for order in self.browse(cr, uid, ids, context=context):
+            lines_by_group = {}
+            for line in order.order_line:
+                if line.picking_group_id:
+                    if not lines_by_group.get(line.picking_group_id.id, False):
+                        lines_by_group[line.picking_group_id.id] = []
+                    lines_by_group[line.picking_group_id.id].append(line)
+                else:
+                    if not lines_by_group.get(0, False):
+                        lines_by_group[0] = []
+                    lines_by_group[0].append(line)
+            for group in lines_by_group:
+                if not group:
+                    picking_ids.extend(super(purchase_order, self)._create_pickings(
+                        cr, uid, order, lines_by_group[group], None, context=context))
+                else:
+                    picking_vals = super(purchase_order, self)._prepare_order_picking(cr, uid, order, context=context)
+                    picking_id = picking_pool.create(cr, uid, picking_vals, context=context)
+                    picking_ids.extend(super(purchase_order, self)._create_pickings(
+                        cr, uid, order, lines_by_group[group], picking_id, context=context))
+        return picking_ids[0] if picking_ids else False # ?
+        
+purchase_order()

=== added file 'purchase_multi_picking/purchase_view.xml'
--- purchase_multi_picking/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_multi_picking/purchase_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,24 @@
+<openerp>
+    <data>
+        <record id="purchase_order_line_form" model="ir.ui.view">
+            <field name="name">purchase.order.line.form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_line_form"></field>
+            <field name="arch" type="xml">
+                <field name="account_analytic_id" position="after">
+                    <field name="picking_group_id"/>
+                </field>
+            </field>
+        </record>
+        <record id="action_purchase_order_line_group_form" model="ir.actions.act_window">
+            <field name="name">Purchase order line Groups</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order.line.group</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem action="action_purchase_order_line_group_form" id="menu_action_purchase_order_line_group_form" parent="purchase.menu_configuration_misc" />
+    </data>
+</openerp>

=== added directory 'purchase_multi_picking/security'
=== added file 'purchase_multi_picking/security/ir.model.access.csv'
--- purchase_multi_picking/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ purchase_multi_picking/security/ir.model.access.csv	2012-06-14 14:09:20 +0000
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_purchase_order_line_group,purchase.order.line_group user,model_purchase_order_line_group,purchase.group_purchase_user,1,1,1,1
+access_purchase_order_line_group_manager,purchase.order.line_group manager,model_purchase_order_line_group,purchase.group_purchase_manager,1,0,0,0
+access_purchase_order_line_group_stock_worker,purchase.order.line_group manager,model_purchase_order_line_group,stock.group_stock_user,1,0,0,0
+access_purchase_order_line_group_manager,purchase.order.line_group manager,model_purchase_order_line_group,purchase.group_purchase_manager,1,1,1,1

=== added directory 'purchase_product_variant_selection'
=== added file 'purchase_product_variant_selection/AUTHORS.txt'
--- purchase_product_variant_selection/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ purchase_product_variant_selection/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'purchase_product_variant_selection/__init__.py'
--- purchase_product_variant_selection/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_product_variant_selection/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 order_line

=== added file 'purchase_product_variant_selection/__openerp__.py'
--- purchase_product_variant_selection/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_product_variant_selection/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Product Variants Selection for Purchase Orders",
+    'version': '0.1',
+    'category': 'Sales Management',
+    'description': """
+Product Variants Selection for Purchase Orders - See 'product_variant_selection' module
+""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['product_variant_selection', 'purchase'],
+    "init_xml" : [],
+    "update_xml" : [
+        'purchase_order_line_view.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'purchase_product_variant_selection/i18n'
=== added file 'purchase_product_variant_selection/order_line.py'
--- purchase_product_variant_selection/order_line.py	1970-01-01 00:00:00 +0000
+++ purchase_product_variant_selection/order_line.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields,osv
+
+class purchase_order_line(osv.osv):
+
+    _inherit = "purchase.order.line"
+    _columns = {
+        "product_tmpl_id": fields.many2one('product.template', "Product Template"),
+        'variant_line_ids': fields.one2many('product.select.variant.line', 'po_line_id', 'Variants'),
+        }
+    
+    def pre_selection_changed(self, cr, uid, ids, product_tmpl_id, variant_line_ids):
+        prod_ids = self.pool.get('account.invoice.line').search_products(
+            cr, uid, product_tmpl_id, variant_line_ids=variant_line_ids)
+        res = {'domain': {'product_id': [('id', 'in', prod_ids)]}}
+        if len(prod_ids) == 1:
+            res['value'] = {'product_id': prod_ids[0]}
+        return res
+        
+purchase_order_line()
+
+class product_select_variant_line(osv.osv):
+
+    _inherit = "product.select.variant.line"
+    _columns = {
+        'po_line_id': fields.many2one('purchase.order.line', 'PO line'),
+        }
+product_select_variant_line()

=== added file 'purchase_product_variant_selection/purchase_order_line_view.xml'
--- purchase_product_variant_selection/purchase_order_line_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_product_variant_selection/purchase_order_line_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="purchase_order_line_form" model="ir.ui.view">
+            <field name="name">purchase.order.line.form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_line_form"></field>
+            <field name="arch" type="xml">
+                <field name="product_id" position="before">
+                    <field name="product_tmpl_id" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)"/>
+                    <newline/>
+                    <field name="variant_line_ids" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)" nolabel="1" colspan="4" attrs="{'readonly': [('product_tmpl_id', '=', False)]}">
+                        <tree string="Variants" editable="bottom">
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </tree>
+                        <form string="Variants" >
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </form>
+                    </field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'purchase_product_variant_selection/security'
=== added directory 'sale_delivery_term'
=== added file 'sale_delivery_term/AUTHORS.txt'
--- sale_delivery_term/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ sale_delivery_term/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'sale_delivery_term/__init__.py'
--- sale_delivery_term/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_delivery_term/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 sale

=== added file 'sale_delivery_term/__openerp__.py'
--- sale_delivery_term/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_delivery_term/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Sale delivery terms",
+    'version': '0.1',
+    'category': 'Sales Management',
+    'description': """
+Delivery term for sale orders.
+You can configure delivery terms specifying the quantity percentage and the delay for every term line.
+You can then associate the term to the 'main' order line and generate the 'detailed' order lines which in turn will generate several pickings according to delivery term (thanks to 'sale_multi_picking' module).
+""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['sale_multi_picking'],
+    "init_xml" : [],
+    "update_xml" : [
+        'sale_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'sale_delivery_term/i18n'
=== added file 'sale_delivery_term/sale.py'
--- sale_delivery_term/sale.py	1970-01-01 00:00:00 +0000
+++ sale_delivery_term/sale.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,203 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields, osv
+from tools.translate import _
+import decimal_precision as dp
+
+class sale_delivery_term(osv.osv):
+    _name = 'sale.delivery.term'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'line_ids': fields.one2many('sale.delivery.term.line', 'term_id', 'Lines', required=True),
+        'company_id': fields.many2one('res.company','Company',required=True,select=1),
+        }
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'sale.delivery.term', context=c),
+    }
+    
+    def is_total_percentage_correct(self, cr, uid, term_ids, context=None):
+        for term in self.browse(cr, uid, term_ids, context=context):
+            total = 0.0
+            for line in term.line_ids:
+                total += line.quantity_perc
+            if total != 1 :
+                return False
+        return True
+    
+sale_delivery_term()
+
+class sale_delivery_term_line(osv.osv):
+
+    _name = 'sale.delivery.term.line'
+    _columns = {
+        'term_id': fields.many2one('sale.delivery.term', 'Term'),
+        'quantity_perc': fields.float('Quantity percentage', required=True, help="For 20% set '0.2'"),
+        'delay': fields.float('Delivery Lead Time', required=True,
+            help="Number of days between the order confirmation and the shipping of the products to the customer"),
+        }
+sale_delivery_term_line()
+
+class sale_order_line_master(osv.osv):
+    
+    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False, context=None):
+        return self.pool.get('sale.order.line').product_id_change(cr, uid, ids, pricelist, product, qty=qty,
+            uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
+            lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag, context=context)
+        
+    def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, context=None):
+        return self.pool.get('sale.order.line').product_uom_change(cursor, user, ids, pricelist, product, qty=qty,
+            uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
+            lang=lang, update_tax=update_tax, date_order=date_order, context=context)
+    
+    def product_packaging_change(self, cr, uid, ids, pricelist, product, qty=0, uom=False,
+                                   partner_id=False, packaging=False, flag=False, context=None):
+        return self.pool.get('sale.order.line').product_packaging_change(cr, uid, ids, pricelist, product, qty=qty, uom=uom, partner_id=partner_id, packaging=packaging, flag=flag, context=context)
+
+    def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        res = {}
+        if context is None:
+            context = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+            taxes = tax_obj.compute_all(cr, uid, line.tax_ids, price, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)
+            cur = line.order_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
+        return res
+        
+    def _get_uom_id(self, cr, uid, *args):
+        return self.pool.get('sale.order.line')._get_uom_id(cr, uid, args)
+        
+    _name = 'sale.order.line.master'
+    _columns = {
+        'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade'),
+        'delivery_term_id': fields.many2one('sale.delivery.term', 'Delivery term', required=True),
+        'name': fields.char('Description', size=256, required=True),
+        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)]),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal',
+            digits_compute= dp.get_precision('Sale Price')),
+        'product_uom_qty': fields.float('Quantity (UoM)', digits_compute= dp.get_precision('Product UoS'), required=True),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True),
+        'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS')),
+        'product_uos': fields.many2one('product.uom', 'Product UoS'),
+        'product_packaging': fields.many2one('product.packaging', 'Packaging'),
+        'order_line_ids': fields.one2many('sale.order.line', 'master_line_id', 'Detailed lines'),
+        'discount': fields.float('Discount (%)', digits=(16, 2)),
+        'tax_ids': fields.many2many('account.tax', 'sale_master_order_line_tax', 'order_line_id', 'tax_id', 'Taxes'),
+        }
+    _defaults = {
+        'product_uom' : _get_uom_id,
+        'product_uom_qty': 1,
+        'product_uos_qty': 1,
+        'product_packaging': False,
+        'price_unit': 0.0,
+    }
+        
+    def generate_detailed_lines(self, cr, uid, ids, context=None):
+        group_pool = self.pool.get('sale.order.line.group')
+        order_line_pool = self.pool.get('sale.order.line')
+        group_ids = group_pool.search(cr, uid, [])
+        for master_line in self.browse(cr, uid, ids):
+            if master_line.order_line_ids:
+                raise osv.except_osv(_('Error'),
+                    _("Detailed lines generated yet (for master line '%s'). Remove them first") % master_line.name)
+            if len(master_line.delivery_term_id.line_ids) > len(group_ids):
+                raise osv.except_osv(_('Error'),
+                    _("Delivery term lines are %s. Order line groups are %s. Please create more groups")
+                    % (str(len(master_line.delivery_term_id.line_ids)), str(len(group_ids))))
+            if not master_line.delivery_term_id.is_total_percentage_correct():
+                raise osv.except_osv(_('Error'),
+                    _("Total percentage of delivery term %s is not equal to 1") % master_line.delivery_term_id.name)
+            group_index  = 0
+            for term_line in master_line.delivery_term_id.line_ids:
+                product_uom_qty = master_line.product_uom_qty * term_line.quantity_perc
+                product_uos_qty = master_line.product_uos_qty * term_line.quantity_perc
+                order_line_vals = {}
+                on_change_res = order_line_pool.product_id_change(cr, uid, ids, master_line.order_id.pricelist_id.id,
+                    master_line.product_id.id, qty=product_uom_qty,
+                    uom=master_line.product_uom.id, qty_uos=product_uos_qty, uos=master_line.product_uos.id, name=master_line.name, partner_id=master_line.order_id.partner_id.id,
+                    lang=False, update_tax=True, date_order=master_line.order_id.date_order, packaging=master_line.product_packaging.id, fiscal_position=master_line.order_id.fiscal_position.id,
+                    flag=False, context=context)
+                order_line_vals.update(on_change_res['value'])
+                order_line_vals.update({
+                    'order_id': master_line.order_id.id,
+                    'name': master_line.name,
+                    'price_unit': master_line.price_unit,
+                    'product_uom_qty': product_uom_qty,
+                    'product_uom': master_line.product_uom.id,
+                    'product_id': master_line.product_id and master_line.product_id.id or False,
+                    'product_uos_qty': product_uos_qty,
+                    'product_uos': master_line.product_uos and master_line.product_uos.id or False,
+                    'product_packaging': master_line.product_packaging.id,
+                    'master_line_id': master_line.id,
+                    'delay': term_line.delay,
+                    'picking_group_id': group_ids[group_index],
+                    'tax_id': [(6,0, [tax.id for tax in master_line.tax_ids])],
+                    })
+                group_index += 1
+                order_line_pool.create(cr, uid, order_line_vals, context=context)
+        return True
+        
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'order_line_ids': [],
+            })
+        return super(sale_order_line_master, self).copy_data(cr, uid, id, default, context=context)
+        
+sale_order_line_master()
+
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+    _columns = {
+        'master_line_id': fields.many2one('sale.order.line.master', 'Master Line'),
+        }
+        
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({'master_line_id': False})
+        return super(sale_order_line, self).copy_data(cr, uid, id, default, context=context)
+sale_order_line()
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+    _columns = {
+        'master_order_line': fields.one2many('sale.order.line.master', 'order_id', 'Master Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
+        }
+        
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'order_line': [],
+        })
+        return super(sale_order, self).copy(cr, uid, id, default, context=context)
+sale_order()

=== added file 'sale_delivery_term/sale_view.xml'
--- sale_delivery_term/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_delivery_term/sale_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,87 @@
+<openerp>
+    <data>
+        <record id="sale_delivery_term_form" model="ir.ui.view">
+            <field name="name">sale.delivery.term.form</field>
+            <field name="model">sale.delivery.term</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Delivery term">
+                    <field name="name" select="1"/>
+                    <field name="line_ids" string="Term Lines" colspan="4" nolabel="1">
+                        <form>
+                            <field name="quantity_perc"></field>
+                            <field name="delay"></field>
+                        </form>
+                        <tree editable="bottom">
+                            <field name="quantity_perc"></field>
+                            <field name="delay"></field>
+                        </tree>
+                    </field>
+                </form>
+            </field>
+        </record>
+        <record id="action_delivery_term_form" model="ir.actions.act_window">
+            <field name="name">Delivery Terms</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.delivery.term</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem action="action_delivery_term_form" id="menu_action_delivery_term_form" parent="base.menu_sale_config_sales" />
+        
+        <record id="sale_order_line_master_form" model="ir.ui.view">
+            <field name="name">sale_order_line_master_form</field>
+            <field name="model">sale.order.line.master</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Master order line">
+                    <field name="product_id" 
+                    on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                    <field name="name" />
+                    <field name="product_uom_qty" 
+                    on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
+                    <field name="product_uom" 
+                    on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
+                    <field name="price_unit" />
+                    <field name="discount"/>
+                    <field name="product_uos_qty" />
+                    <field name="product_uos" />
+                    <field name="product_packaging" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"/>
+                    <field name="delivery_term_id" />
+                    <separator colspan="4" string="Taxes"/>
+                    <field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                </form>
+            </field>
+        </record>
+        <record id="sale_order_line_master_tree" model="ir.ui.view">
+            <field name="name">sale_order_line_master_tree</field>
+            <field name="model">sale.order.line.master</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Master order lines">
+                    <field name="name" />
+                    <field name="price_unit" />
+                    <field name="product_uom_qty" />
+                    <field name="product_uom" />
+                    <field name="discount"/>
+                    <field name="price_subtotal" />
+                    <field name="delivery_term_id" />
+                    <button name="generate_detailed_lines" string="Generate detailed lines" icon="gtk-go-forward" type="object"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_order_form" model="ir.ui.view">
+            <field name="name">sale.order.form</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"></field>
+            <field name="arch" type="xml">
+                <field name="order_line" position="before">
+                    <field colspan="4" name="master_order_line" nolabel="1" ></field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'sale_delivery_term/security'
=== added file 'sale_delivery_term/security/ir.model.access.csv'
--- sale_delivery_term/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ sale_delivery_term/security/ir.model.access.csv	2012-06-14 14:09:20 +0000
@@ -0,0 +1,10 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_order_line_master,sale_order_line_master,model_sale_order_line_master,base.group_sale_salesman,1,1,1,1
+access_sale_order_line_master_accountant,sale_order_line_master accountant,model_sale_order_line_master,account.group_account_user,1,1,0,0
+access_sale_order_line_master_stock_worker,sale_order_line_master stock worker,model_sale_order_line_master,stock.group_stock_user,1,1,0,0
+access_sale_delivery_term_sale_user,sale_delivery_term.sale.user,model_sale_delivery_term,base.group_sale_salesman,1,0,0,0
+access_sale_delivery_term_sale_manager,sale_delivery_term.sale.manager,model_sale_delivery_term,base.group_sale_manager,1,1,1,1
+access_sale_delivery_term,sale_delivery_term,model_sale_delivery_term,base.group_user,1,0,0,0
+access_sale_delivery_term_line_sale_user,sale_delivery_term_line.sale.user,model_sale_delivery_term_line,base.group_sale_salesman,1,0,0,0
+access_sale_delivery_term_line_sale_manager,sale_delivery_term_line.sale.manager,model_sale_delivery_term_line,base.group_sale_manager,1,1,1,1
+access_sale_delivery_term_line_sale_manager,sale_delivery_term_line.sale.manager,model_sale_delivery_term_line,base.group_user,1,0,0,0

=== added directory 'sale_delivery_term_variant_selection'
=== added file 'sale_delivery_term_variant_selection/AUTHORS.txt'
--- sale_delivery_term_variant_selection/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ sale_delivery_term_variant_selection/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'sale_delivery_term_variant_selection/__init__.py'
--- sale_delivery_term_variant_selection/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_delivery_term_variant_selection/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 sale

=== added file 'sale_delivery_term_variant_selection/__openerp__.py'
--- sale_delivery_term_variant_selection/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_delivery_term_variant_selection/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Sale delivery term with variant selection",
+    'version': '0.1',
+    'category': 'Sales Management',
+    'description': """
+Product Variants Selection for Sale Orders with delivery terms - See 'product_variant_selection' and 'sale_delivery_term' modules
+""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['sale_product_variant_selection', 'sale_delivery_term'],
+    "init_xml" : [],
+    "update_xml" : [
+        'sale_view.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'sale_delivery_term_variant_selection/i18n'
=== added file 'sale_delivery_term_variant_selection/sale.py'
--- sale_delivery_term_variant_selection/sale.py	1970-01-01 00:00:00 +0000
+++ sale_delivery_term_variant_selection/sale.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields,osv
+
+class sale_order_line_master(osv.osv):
+
+    _inherit = "sale.order.line.master"
+    _columns = {
+        "product_tmpl_id": fields.many2one('product.template', "Product Template"),
+        'variant_line_ids': fields.one2many('product.select.variant.line', 'master_so_line_id', 'Variants'),
+        }
+    
+    def pre_selection_changed(self, cr, uid, ids, product_tmpl_id, variant_line_ids):
+        prod_ids = self.pool.get('account.invoice.line').search_products(
+            cr, uid, product_tmpl_id, variant_line_ids=variant_line_ids)
+        res = {'domain': {'product_id': [('id', 'in', prod_ids)]}}
+        if len(prod_ids) == 1:
+            res['value'] = {'product_id': prod_ids[0]}
+        return res
+        
+    def generate_detailed_lines(self, cr, uid, ids, context=None):
+        res = super(sale_order_line_master, self).generate_detailed_lines(
+            cr, uid, ids, context=context)
+        var_line_pool = self.pool.get('product.select.variant.line')
+        for master_line in self.browse(cr, uid, ids, context=context):
+            for order_line in master_line.order_line_ids:
+                if master_line.product_tmpl_id:
+                    order_line.write({'product_tmpl_id': master_line.product_tmpl_id.id})
+                for variant_line in master_line.variant_line_ids:
+                    var_line_pool.create(cr, uid, {
+                        'dimension_id': variant_line.dimension_id.id,
+                        'option_id': variant_line.option_id.id,
+                        'so_line_id': order_line.id,
+                        }, context=context)
+        return res
+        
+sale_order_line_master()
+
+class product_select_variant_line(osv.osv):
+
+    _inherit = "product.select.variant.line"
+    _columns = {
+        'master_so_line_id': fields.many2one('sale.order.line.master', 'Master SO line'),
+        }
+product_select_variant_line()

=== added file 'sale_delivery_term_variant_selection/sale_view.xml'
--- sale_delivery_term_variant_selection/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_delivery_term_variant_selection/sale_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_sale_order_line_master_form" model="ir.ui.view">
+            <field name="name">sale.order.line.master.form</field>
+            <field name="model">sale.order.line.master</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale_delivery_term.sale_order_line_master_form"></field>
+            <field name="arch" type="xml">
+                <field name="product_id" position="before">
+                    <field name="product_tmpl_id" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)"/>
+                    <newline/>
+                    <field name="variant_line_ids" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)" nolabel="1" colspan="5" attrs="{'readonly': [('product_tmpl_id', '=', False)]}">
+                        <tree string="Variants" editable="bottom">
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </tree>
+                        <form string="Variants" >
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </form>
+                    </field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'sale_delivery_term_variant_selection/security'
=== added directory 'sale_multi_picking'
=== added file 'sale_multi_picking/AUTHORS.txt'
--- sale_multi_picking/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ sale_multi_picking/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'sale_multi_picking/__init__.py'
--- sale_multi_picking/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_multi_picking/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 sale

=== added file 'sale_multi_picking/__openerp__.py'
--- sale_multi_picking/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_multi_picking/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Multi Pickings from Sale Orders",
+    'version': '0.1',
+    'category': 'Sales Management',
+    'description': """
+This module allows to generate several pickings from the same sale order.
+You just have to indicate which order lines have to be grouped in the same picking. When confirming the order, for each group a picking is generated.
+""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['sale'],
+    "init_xml" : [],
+    "update_xml" : [
+        'sale_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'sale_multi_picking/i18n'
=== added file 'sale_multi_picking/sale.py'
--- sale_multi_picking/sale.py	1970-01-01 00:00:00 +0000
+++ sale_multi_picking/sale.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields, osv
+
+class sale_order_line_group(osv.osv):
+    _name = 'sale.order.line.group'
+    _columns = {
+        'name': fields.char('Group', size=64, required=True),
+        'company_id': fields.many2one('res.company','Company',required=True,select=1),
+        }
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'sale.order.line.group', context=c),
+    }
+sale_order_line_group()
+
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+    _columns = {
+        'picking_group_id': fields.many2one('sale.order.line.group', 'Group'),
+        }
+sale_order_line()
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+
+    def action_ship_create(self, cr, uid, ids, context=None):
+        picking_pool = self.pool.get('stock.picking')
+        for order in self.browse(cr, uid, ids, context=context):
+            lines_by_group = {}
+            for line in order.order_line:
+                if line.picking_group_id:
+                    if not lines_by_group.get(line.picking_group_id.id, False):
+                        lines_by_group[line.picking_group_id.id] = []
+                    lines_by_group[line.picking_group_id.id].append(line)
+                else:
+                    if not lines_by_group.get(0, False):
+                        lines_by_group[0] = []
+                    lines_by_group[0].append(line)
+            for group in lines_by_group:
+                if not group:
+                    super(sale_order, self)._create_pickings_and_procurements(
+                        cr, uid, order, lines_by_group[group], None, context=context)
+                else:
+                    picking_vals = super(sale_order, self)._prepare_order_picking(cr, uid, order, context=context)
+                    picking_id = picking_pool.create(cr, uid, picking_vals, context=context)
+                    super(sale_order, self)._create_pickings_and_procurements(
+                        cr, uid, order, lines_by_group[group], picking_id, context=context)
+        return True
+        
+sale_order()

=== added file 'sale_multi_picking/sale_view.xml'
--- sale_multi_picking/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_multi_picking/sale_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,24 @@
+<openerp>
+    <data>
+        <record id="view_order_form" model="ir.ui.view">
+            <field name="name">sale.order.form</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"></field>
+            <field name="arch" type="xml">
+                <field name="address_allotment_id" position="after">
+                    <field name="picking_group_id"/>
+                </field>
+            </field>
+        </record>
+        <record id="action_sale_order_line_group_form" model="ir.actions.act_window">
+            <field name="name">Sale order line Groups</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order.line.group</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem action="action_sale_order_line_group_form" id="menu_action_sale_order_line_group_form" parent="base.menu_sale_config_sales" />
+    </data>
+</openerp>

=== added directory 'sale_multi_picking/security'
=== added file 'sale_multi_picking/security/ir.model.access.csv'
--- sale_multi_picking/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ sale_multi_picking/security/ir.model.access.csv	2012-06-14 14:09:20 +0000
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_order_line_group,sale.order.line.group,model_sale_order_line_group,base.group_sale_salesman,1,1,1,1
+access_sale_order_line_group_accountant,sale.order.line.group accountant,model_sale_order_line_group,account.group_account_user,1,1,0,0
+access_sale_order_line_group_stock_worker,sale.order.line.group stock worker,model_sale_order_line_group,stock.group_stock_user,1,1,0,0

=== added directory 'sale_product_variant_selection'
=== added file 'sale_product_variant_selection/AUTHORS.txt'
--- sale_product_variant_selection/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ sale_product_variant_selection/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'sale_product_variant_selection/__init__.py'
--- sale_product_variant_selection/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_product_variant_selection/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 order_line

=== added file 'sale_product_variant_selection/__openerp__.py'
--- sale_product_variant_selection/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_product_variant_selection/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Product Variants Selection for Sale Orders",
+    'version': '0.1',
+    'category': 'Sales Management',
+    'description': """
+Product Variants Selection for Sale Orders - See 'product_variant_selection' module
+""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['product_variant_selection', 'sale'],
+    "init_xml" : [],
+    "update_xml" : [
+        'sale_order_line_view.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'sale_product_variant_selection/i18n'
=== added file 'sale_product_variant_selection/order_line.py'
--- sale_product_variant_selection/order_line.py	1970-01-01 00:00:00 +0000
+++ sale_product_variant_selection/order_line.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields,osv
+
+class sale_order_line(osv.osv):
+
+    _inherit = "sale.order.line"
+    _columns = {
+        "product_tmpl_id": fields.many2one('product.template', "Product Template"),
+        'variant_line_ids': fields.one2many('product.select.variant.line', 'so_line_id', 'Variants'),
+        }
+    
+    def pre_selection_changed(self, cr, uid, ids, product_tmpl_id, variant_line_ids):
+        prod_ids = self.pool.get('account.invoice.line').search_products(
+            cr, uid, product_tmpl_id, variant_line_ids=variant_line_ids)
+        res = {'domain': {'product_id': [('id', 'in', prod_ids)]}}
+        if len(prod_ids) == 1:
+            res['value'] = {'product_id': prod_ids[0]}
+        return res
+        
+sale_order_line()
+
+class product_select_variant_line(osv.osv):
+
+    _inherit = "product.select.variant.line"
+    _columns = {
+        'so_line_id': fields.many2one('sale.order.line', 'SO line'),
+        }
+product_select_variant_line()

=== added file 'sale_product_variant_selection/sale_order_line_view.xml'
--- sale_product_variant_selection/sale_order_line_view.xml	1970-01-01 00:00:00 +0000
+++ sale_product_variant_selection/sale_order_line_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_order_form" model="ir.ui.view">
+            <field name="name">sale.order.form</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"></field>
+            <field name="arch" type="xml">
+                <field name="product_id" position="before">
+                    <field name="product_tmpl_id" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)"/>
+                    <newline/>
+                    <field name="variant_line_ids" on_change="pre_selection_changed(product_tmpl_id, variant_line_ids)" nolabel="1" colspan="5" attrs="{'readonly': [('product_tmpl_id', '=', False)]}">
+                        <tree string="Variants" editable="bottom">
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </tree>
+                        <form string="Variants" >
+                            <field name="dimension_id"></field>
+                            <field name="option_id" domain="[('dimension_id', '=', dimension_id)]"></field>
+                        </form>
+                    </field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'sale_product_variant_selection/security'
=== added directory 'sale_purchase_orders_super_list'
=== added file 'sale_purchase_orders_super_list/AUTHORS.txt'
--- sale_purchase_orders_super_list/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ sale_purchase_orders_super_list/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'sale_purchase_orders_super_list/__init__.py'
--- sale_purchase_orders_super_list/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_purchase_orders_super_list/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 orders

=== added file 'sale_purchase_orders_super_list/__openerp__.py'
--- sale_purchase_orders_super_list/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_purchase_orders_super_list/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Super order list",
+    'version': '0.1',
+    'category': 'Sales Management',
+    'description': """A unified list view for sale and purchase orders""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['sale', 'purchase'],
+    "init_xml" : [],
+    "update_xml" : [
+        'orders_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'sale_purchase_orders_super_list/i18n'
=== added file 'sale_purchase_orders_super_list/orders.py'
--- sale_purchase_orders_super_list/orders.py	1970-01-01 00:00:00 +0000
+++ sale_purchase_orders_super_list/orders.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields, osv
+
+class super_order(osv.osv):
+    
+    def _get_fields_values(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        sale_pool = self.pool.get('sale.order')
+        purchase_pool = self.pool.get('purchase.order')
+        for super_order in self.browse(cr, uid, ids, context=context):
+            res[super_order.id] = {}
+            res[super_order.id]['company_id'] = eval(
+                'super_order.'+super_order.type+'_order_id.company_id.id')
+            res[super_order.id]['name'] = eval(
+                'super_order.'+super_order.type+'_order_id.name')
+            res[super_order.id]['date'] = eval(
+                'super_order.'+super_order.type+'_order_id.date_order')
+            res[super_order.id]['partner_id'] = eval(
+                'super_order.'+super_order.type+'_order_id.partner_id.id')
+            res[super_order.id]['invoiced_rate'] = eval(
+                'super_order.'+super_order.type+'_order_id.invoiced_rate')
+            res[super_order.id]['amount_untaxed'] = eval(
+                'super_order.'+super_order.type+'_order_id.amount_untaxed')
+            res[super_order.id]['amount_total'] = eval(
+                'super_order.'+super_order.type+'_order_id.amount_total')
+            state = eval(
+                'super_order.'+super_order.type+'_order_id.state')
+            res[super_order.id]['state'] = dict(eval(super_order.type+'_pool').fields_get(cr, uid, allfields=['state'], context=context)['state']['selection'])[state]
+            res[super_order.id]['state_key'] = state
+            if super_order.type  == 'sale':
+                res[super_order.id]['delivered_rate'] = super_order.sale_order_id.picked_rate
+            elif super_order.type  == 'purchase':
+                res[super_order.id]['delivered_rate'] = super_order.purchase_order_id.shipped_rate
+        return res
+
+    def _get_super_order_by_sale(self, cr, uid, ids, context=None):
+        result = []
+        order_pool = self.pool.get('sale.order')
+        super_order_pool= self.pool.get('super.order')
+        for order in order_pool.browse(cr, uid, ids, context=context):
+            super_order_ids = super_order_pool.search(cr, uid, [
+                ('sale_order_id', '=', order.id),
+                ], context=context)
+            for super_order_id in super_order_ids:
+                if super_order_id not in result:
+                    result.append(super_order_id)
+        return result
+
+    def _get_super_order_by_purchase(self, cr, uid, ids, context=None):
+        result = []
+        order_pool= self.pool.get('purchase.order')
+        super_order_pool= self.pool.get('super.order')
+        for order in order_pool.browse(cr, uid, ids, context=context):
+            super_order_ids = super_order_pool.search(cr, uid, [
+                ('purchase_order_id', '=', order.id),
+                ], context=context)
+            for super_order_id in super_order_ids:
+                if super_order_id not in result:
+                    result.append(super_order_id)
+        return result
+        
+    _name = 'super.order'
+    _rec_name = 'type'
+    _columns = {
+        'type': fields.selection([
+            ('sale', 'Sale'),
+            ('purchase', 'Purchase'),
+            ], 'Type', required=True, readonly=True),
+        'sale_order_id': fields.many2one('sale.order', 'Sale Order', readonly=True, ondelete='cascade'),
+        'purchase_order_id': fields.many2one('purchase.order', 'Purchase Order', readonly=True, ondelete='cascade'),
+        'company_id': fields.function(_get_fields_values, string="Company", type="many2one", relation="res.company", multi="super", 
+            store = {
+                'super.order': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'sale.order': (_get_super_order_by_sale, ['company_id'], 10),
+                'purchase.order': (_get_super_order_by_purchase, ['company_id'], 10),
+            }),
+        'name': fields.function(_get_fields_values, string="Reference", type="char", size=64, multi="super", 
+            store = {
+                'super.order': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'sale.order': (_get_super_order_by_sale, ['name'], 10),
+                'purchase.order': (_get_super_order_by_purchase, ['name'], 10),
+            }),
+        'date': fields.function(_get_fields_values, string="Date", type="date", multi="super", 
+            store = {
+                'super.order': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'sale.order': (_get_super_order_by_sale, ['date_order'], 10),
+                'purchase.order': (_get_super_order_by_purchase, ['date_order'], 10),
+            }),
+        'partner_id': fields.function(_get_fields_values, string="Partner", type="many2one", relation="res.partner", multi="super", 
+            store = {
+                'super.order': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'sale.order': (_get_super_order_by_sale, ['partner_id'], 10),
+                'purchase.order': (_get_super_order_by_purchase, ['partner_id'], 10),
+            }),
+        'delivered_rate': fields.function(_get_fields_values, string="Delivered", type="float", multi="super"),
+        'invoiced_rate': fields.function(_get_fields_values, string="Invoiced", type="float", multi="super"),
+        'amount_untaxed': fields.function(_get_fields_values, string="Untaxed Amount", type="float", multi="super", 
+            store = {
+                'super.order': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'sale.order': (_get_super_order_by_sale, ['amount_untaxed'], 10),
+                'purchase.order': (_get_super_order_by_purchase, ['amount_untaxed'], 10),
+            }),
+        'amount_total': fields.function(_get_fields_values, string="Total", type="float", multi="super", 
+            store = {
+                'super.order': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'sale.order': (_get_super_order_by_sale, ['amount_total'], 10),
+                'purchase.order': (_get_super_order_by_purchase, ['amount_total'], 10),
+            }),
+        'state': fields.function(_get_fields_values, string="State", type="char", size=64, multi="super"),
+        'state_key': fields.function(_get_fields_values, string="State", type="char", size=64, multi="super", 
+            store = {
+                'super.order': (lambda self, cr, uid, ids, c={}: ids, None, 10),
+                'sale.order': (_get_super_order_by_sale, ['state'], 10),
+                'purchase.order': (_get_super_order_by_purchase, ['state'], 10),
+            }),
+        }
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+    def create(self, cr, uid, vals, context=None):
+        res = super(sale_order, self).create(cr, uid, vals, context=context)
+        self.pool.get('super.order').create(cr, uid, {
+            'type': 'sale',
+            'sale_order_id': res,
+            }, context=context)
+        return res
+
+class purchase_order(osv.osv):
+    _inherit = 'purchase.order'
+    def create(self, cr, uid, vals, context=None):
+        res = super(purchase_order, self).create(cr, uid, vals, context=context)
+        self.pool.get('super.order').create(cr, uid, {
+            'type': 'purchase',
+            'purchase_order_id': res,
+            }, context=context)
+        return res

=== added file 'sale_purchase_orders_super_list/orders_view.xml'
--- sale_purchase_orders_super_list/orders_view.xml	1970-01-01 00:00:00 +0000
+++ sale_purchase_orders_super_list/orders_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,81 @@
+<openerp>
+    <data>
+        <record id="super_order_tree" model="ir.ui.view">
+            <field name="name">super_order_tree</field>
+            <field name="model">super.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Orders">
+                    <field name="type"/>
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="delivered_rate" widget="progressbar"/>
+                    <field name="invoiced_rate" widget="progressbar"/>
+                    <field name="amount_untaxed" sum="Total Tax Excluded"/>
+                    <field name="amount_total" sum="Total Tax Included"/>
+                    <field name="state"/>
+                    <field name="state_key" invisible="1"/>
+                    <field name="company_id" groups="base.group_multi_company" />
+                </tree>
+            </field>
+        </record>
+        <record id="super_order_form" model="ir.ui.view">
+            <field name="name">super_order_form</field>
+            <field name="model">super.order</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Order">
+                    <field name="type"/>
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="partner_id"/>
+                    <field name="amount_untaxed" />
+                    <field name="amount_total" />
+                    <field name="sale_order_id"/>
+                    <field name="purchase_order_id"/>
+                    <field name="company_id" groups="base.group_multi_company" />
+                    <field name="state"/>
+                </form>
+            </field>
+        </record>
+        <record id="super_order_filter" model="ir.ui.view">
+            <field name="name">super_order.select</field>
+            <field name="model">super.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Contracts">
+                    <filter icon="terp-partner" string="Sales" domain="[('type','=','sale')]" help="Sale Orders" name="sale"/>
+                    <filter icon="terp-purchase" string="Purchases" domain="[('type','=','purchase')]" name="purchase"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"
+                        filter_domain="[('name','ilike',self)]"/>
+                    <field name="partner_id"/>
+                    <field name="date"/>
+                    <newline/>
+                    <group expand="1" string="Group By..." groups="base.group_extended">
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state_key'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
+        <record id="action_super_order_tree" model="ir.actions.act_window">
+            <field name="name">Contracts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">super.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            name="Contracts"
+            action="action_super_order_tree"
+            id="menu_action_super_order_tree"
+            icon="STOCK_INDENT"/>
+    </data>
+</openerp>

=== added directory 'sale_purchase_orders_super_list/security'
=== added file 'sale_purchase_orders_super_list/security/ir.model.access.csv'
--- sale_purchase_orders_super_list/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ sale_purchase_orders_super_list/security/ir.model.access.csv	2012-06-14 14:09:20 +0000
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_super_order,sale.super_order,model_super_order,base.group_sale_salesman,1,1,1,0
+access_sale_super_order_stock_worker,sale.order super_order worker,model_super_order,stock.group_stock_user,1,1,0,0
+access_sale_super_order_manager,sale.super_order.manager,model_super_order,base.group_sale_manager,1,1,1,1
+access_sale_super_order_accountant,sale.super_order.accountant,model_super_order,account.group_account_user,1,1,0,0

=== added directory 'stock_picking_related'
=== added file 'stock_picking_related/AUTHORS.txt'
--- stock_picking_related/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ stock_picking_related/AUTHORS.txt	2012-06-14 14:09:20 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>

=== added file 'stock_picking_related/__init__.py'
--- stock_picking_related/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_picking_related/__init__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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

=== added file 'stock_picking_related/__openerp__.py'
--- stock_picking_related/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_picking_related/__openerp__.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': "Hierarchic View for pickings",
+    'version': '0.1',
+    'category': 'Warehouse Management',
+    'description': """This module helps to understand the relations between pickings.
+    When a picking is partially delivered, it tracks every generated "child" picking. Equally, the generated picking refers to its "parent" picking.""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['stock'],
+    "init_xml" : [],
+    "update_xml" : [
+        'stock_view.xml',
+        ],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}

=== added directory 'stock_picking_related/i18n'
=== added directory 'stock_picking_related/security'
=== added file 'stock_picking_related/stock.py'
--- stock_picking_related/stock.py	1970-01-01 00:00:00 +0000
+++ stock_picking_related/stock.py	2012-06-14 14:09:20 +0000
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 fields, osv
+from tools.translate import _
+
+class stock_picking(osv.osv):
+    def _compute_qty(self, cr, uid, ids, field_names, arg=None, context=None):
+        res = {}
+        for picking in self.browse(cr, uid, ids, context=context):
+            total = 0.0
+            for move in picking.move_lines:
+                total += move.product_qty
+            res[picking.id] = total
+        return res
+        
+    def _compute_total_qty(self, cr, uid, ids, field_names, arg=None, context=None):
+        res = {}
+        for picking in self.browse(cr, uid, ids, context=context):
+            total = picking.qty
+            for child in picking.child_ids:
+                total += child.qty
+            res[picking.id] = total
+        return res
+        
+    def _compute_uom(self, cr, uid, ids, field_names, arg=None, context=None):
+        res = {}
+        for picking in self.browse(cr, uid, ids, context=context):
+            uom = ''
+            for move in picking.move_lines:
+                if uom and move.product_uom.name != uom:
+                    uom = _('Various')
+                else:
+                    uom = _(move.product_uom.name)
+            res[picking.id] = uom
+        return res
+    
+    _inherit = "stock.picking"
+    _columns = {
+        'parent_id': fields.many2one('stock.picking', 'Parent Picking', readonly=True),
+        'child_ids': fields.one2many('stock.picking', 'parent_id', 'Children Pickings', readonly=True),
+        'qty': fields.function(_compute_qty, string="Quantity"),
+        'total_qty': fields.function(_compute_total_qty, string="Total Quantity"),
+        'uom': fields.function(_compute_uom, string="UoM", type='char',
+            size=64),
+        }
+        
+    def do_partial(self, cr, uid, ids, partial_datas, context=None):
+        res = super(stock_picking, self).do_partial(cr, uid, ids, partial_datas, context=context)
+        for pick_id in res:
+            if res[pick_id].get('delivered_picking', False):
+                if res[pick_id]['delivered_picking'] != pick_id:
+                    self.write(cr, uid, res[pick_id]['delivered_picking'], {'parent_id': pick_id})
+                
+        return res
+        
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default['parent_id'] = False
+        default['child_ids'] = False
+        return super(stock_picking, self).copy(cr, uid, id, default, context)
+        
+stock_picking()

=== added file 'stock_picking_related/stock_view.xml'
--- stock_picking_related/stock_view.xml	1970-01-01 00:00:00 +0000
+++ stock_picking_related/stock_view.xml	2012-06-14 14:09:20 +0000
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_picking_out_form" model="ir.ui.view">
+            <field name="name">stock.picking.out.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"></field>
+            <field name="arch" type="xml">
+                <page string="Notes" position="after">
+                    <page string="Related">
+                        <field colspan="4" name="parent_id" />
+                        <field colspan="4" name="child_ids" nolabel="1" string="Children"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+        <record id="view_picking_in_form" model="ir.ui.view">
+            <field name="name">stock.picking.in.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_in_form"></field>
+            <field name="arch" type="xml">
+                <page string="Notes" position="after">
+                    <page string="Related">
+                        <field colspan="4" name="parent_id" />
+                        <field colspan="4" name="child_ids" nolabel="1" string="Children"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+        <record id="view_picking_form" model="ir.ui.view">
+            <field name="name">stock.picking.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_form"></field>
+            <field name="arch" type="xml">
+                <page string="Notes" position="after">
+                    <page string="Related">
+                        <field colspan="4" name="parent_id" />
+                        <field colspan="4" name="child_ids" nolabel="1" string="Children"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+        
+        <!-- tree -->
+        
+        <record id="view_picking_tree" model="ir.ui.view">
+            <field name="name">view_picking_tree</field>
+            <field name="model">stock.picking</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
+                    <field name="name"/>
+                    <field name="partner_id" />
+                    <field name="origin"/>
+                    <field name="date"/>
+                    <field name="min_date"/>
+                    <field name="invoice_state"/>
+                    <field name="total_qty" />
+                    <field name="qty" />
+                    <field name="uom" />
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record id="action_view_out_picking_tree" model="ir.actions.act_window">
+            <field name="name">Out Delivery Tree</field>
+            <field name="res_model">stock.picking</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_picking_tree"/>
+            <field name="domain">[('type','=','out'), ('parent_id','=',False)]</field>
+        </record>
+        <record id="action_view_in_picking_tree" model="ir.actions.act_window">
+            <field name="name">In Delivery Tree</field>
+            <field name="res_model">stock.picking</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_picking_tree"/>
+            <field name="domain">[('type','=','in'), ('parent_id','=',False)]</field>
+        </record>
+        <menuitem action="action_view_out_picking_tree" id="menu_action_view_out_picking_tree" parent="stock.menu_stock_warehouse_mgmt" />
+        <menuitem action="action_view_in_picking_tree" id="menu_action_view_in_picking_tree" parent="stock.menu_stock_warehouse_mgmt" />
+
+        <record id="action_picking_move_open" model="ir.actions.act_window">
+            <field name="name">Moves</field>
+            <field name="res_model">stock.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
+            <field name="domain">[('picking_id','=',active_id)]</field>
+        </record>
+        <record id="ir_open_picking_move" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">stock.picking</field>
+            <field name="name">Picking moves</field>
+            <field eval="'ir.actions.act_window,%d'%action_picking_move_open" name="value"/>
+        </record>
+    </data>
+</openerp>