Merge lp:~elbati/sale-wkfl/adding_sale_delivery_term_7 into lp:~sale-core-editors/sale-wkfl/7.0

[Lorenzo Battistini]

sale_multi_picking
------------------
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.

sale_delivery_term
------------------
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).

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

When porting a module to V7, please:

* update __openerp__.py to use 'data' instead of 'init_xml' and 'update_xml', and 'demo' instead of 'demo_xml'
* update you python code to inherit from orm.Model (resp orm.TransientModel) rather than osv.osv (resp. osv.osv_memory)
* update you python code tonot instantiate the model class

Try to keep line length reasonable. Ideally, 80 chars is great, but not always the most convenient. Several lines here are way too long.

l. 32 and 439: use an explicit relative import (from . import sale)
l. 248: use %d in the format string, and remove the str() calls (btw, %s will call str() implicitely)

l. 539-548: this can be rewritten in a much clearer way as follows:

lines_by_group = {}
for line in order.order_line:
    group_id = line.picking_group_id.id if line.picking_group_id else 0
    lines_by_group.setdefault(group_id, []).append(line)

line 549: you could factor out the call to super()._create_pickings_and_procurements, by just setting picking_id to None in the if branch.

review: Needs Fixing (code review, no test)

[lp:~elbati/sale-wkfl/adding_sale_delivery_term_7]

11. By Lorenzo Battistini on 2013-02-16

[FIX] __openerp__.py

[Lorenzo Battistini (elbati)]

On 02/14/2013 10:32 AM, Alexandre Fayolle - camptocamp wrote:
> Review: Needs Fixing code review, no test
>
> When porting a module to V7, please:
>
> * update __openerp__.py to use 'data' instead of 'init_xml' and 'update_xml', and 'demo' instead of 'demo_xml'
> * update you python code to inherit from orm.Model (resp orm.TransientModel) rather than osv.osv (resp. osv.osv_memory)
> * update you python code tonot instantiate the model class

Hello Alexandre, thanks for suggestions.
I can't find any standard addon that uses orm.Model, rather osv.Model.
Did you mean osv.Model?

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

On sam. 16 févr. 2013 19:13:19 CET, Lorenzo Battistini - Agile BG -
Domsense wrote:
> On 02/14/2013 10:32 AM, Alexandre Fayolle - camptocamp wrote:
>> Review: Needs Fixing code review, no test
>>
>> When porting a module to V7, please:
>>
>> * update __openerp__.py to use 'data' instead of 'init_xml' and 'update_xml', and 'demo' instead of 'demo_xml'
>> * update you python code to inherit from orm.Model (resp orm.TransientModel) rather than osv.osv (resp. osv.osv_memory)
>> * update you python code tonot instantiate the model class
>
> Hello Alexandre, thanks for suggestions.
> I can't find any standard addon that uses orm.Model, rather osv.Model.
> Did you mean osv.Model?
>

I mean orm.Model, because the Model class is defined in osv/orm.py and
only import from there in osv/osv.py. See
https://code.launchpad.net/~camptocamp/openobject-server/trunk-proposed-cleanups/+merge/102833/comments/269356
for the long version.

Now if you really prefer osv.Model, I won't argue.

--
Alexandre Fayolle
Chef de Projet
Tel : + 33 (0)4 79 26 57 94

Camptocamp France SAS
Savoie Technolac, BP 352
73377 Le Bourget du Lac Cedex
http://www.camptocamp.com

[lp:~elbati/sale-wkfl/adding_sale_delivery_term_7]

12. By Lorenzo Battistini on 2013-02-18

[FIX] classes

13. By Lorenzo Battistini on 2013-02-18

[FIX] orm.Model and lines length

14. By Lorenzo Battistini on 2013-02-18

[IMP] from . import

15. By Lorenzo Battistini on 2013-02-18

[FIX] %d

16. By Lorenzo Battistini on 2013-02-18

[IMP] lines_by_group

17. By Lorenzo Battistini on 2013-02-18

[imp] ._create_pickings_and_procurements

[Lorenzo Battistini (elbati)]

Made the changes.
Thanks

[lp:~elbati/sale-wkfl/adding_sale_delivery_term_7]

18. By Lorenzo Battistini on 2013-02-20

[IMP] enumerate

19. By Lorenzo Battistini on 2013-02-20

[FIX] string delimiter

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

[lp:~elbati/sale-wkfl/adding_sale_delivery_term_7]

20. By Lorenzo Battistini on 2013-03-15

[ADD] first yaml test and relative fixes

21. By Lorenzo Battistini on 2013-03-15

[add] testing generate_detailed_lines of master line

22. By Lorenzo Battistini on 2013-03-15

[add] 'I confirm the Quotation' test

=== 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	2013-03-15 09:34:21 +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	2013-03-15 09:34:21 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#
+#    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 . 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	2013-03-15 09:34:21 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#
+#    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',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['sale_multi_picking'],
+    "data" : [
+        'sale_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    'test': [
+        'test/sale_order_demo.yml',
+        ],
+    "demo" : ['sale_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	2013-03-15 09:34:21 +0000
@@ -0,0 +1,234 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#
+#    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 openerp.osv import fields, orm
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
+
+class sale_delivery_term(orm.Model):
+    _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
+
+class sale_delivery_term_line(orm.Model):
+
+    _name = 'sale.delivery.term.line'
+    _rec_name = 'term_id'
+    _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"),
+        }
+
+class sale_order_line_master(orm.Model):
+    
+    def _clean_on_change_dict(self, res_dict):
+        if res_dict['value'].has_key('delay'):
+            del res_dict['value']['delay']
+        if res_dict['value'].has_key('th_weight'):
+            del res_dict['value']['th_weight']
+        if res_dict['value'].has_key('type'):
+            del res_dict['value']['type']
+        if res_dict['value'].has_key('tax_id'):
+            del res_dict['value']['tax_id']
+        return res_dict
+    
+    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):
+        res = 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)
+        return self._clean_on_change_dict(res)
+        
+    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):
+        res = 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)
+        return self._clean_on_change_dict(res)
+    
+    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 _prepare_order_line(self, cr, uid, term_line, master_line, group_index=0, context=None):
+        order_line_pool = self.pool.get('sale.order.line')
+        group_pool = self.pool.get('sale.order.line.group')
+        group_ids = group_pool.search(cr, uid, [])
+        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, [], 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])],
+            })
+        return order_line_vals
+        
+        
+    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 orm.except_orm(_('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 orm.except_orm(_('Error'),
+                    _("Delivery term lines are %d. Order line groups are %d. Please create more groups")
+                    % (len(master_line.delivery_term_id.line_ids), len(group_ids)))
+            if not master_line.delivery_term_id.is_total_percentage_correct():
+                raise orm.except_orm(_('Error'),
+                    _("Total percentage of delivery term %s is not equal to 1") % master_line.delivery_term_id.name)
+            for group_index, term_line in enumerate(master_line.delivery_term_id.line_ids):
+                order_line_vals = self._prepare_order_line(
+                    cr, uid, term_line, master_line, group_index=group_index, context=context)
+                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)
+        
+
+class sale_order_line(orm.Model):
+    _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)
+
+
+class sale_order(orm.Model):
+    _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)
+        
+    def generate_detailed_lines(self, cr, uid, ids, context=None):
+        for order in self.browse(cr, uid, ids, context):
+            for master_line in order.master_order_line:
+                master_line.generate_detailed_lines()
+        return True
+        

=== added file 'sale_delivery_term/sale_demo.xml'
--- sale_delivery_term/sale_demo.xml	1970-01-01 00:00:00 +0000
+++ sale_delivery_term/sale_demo.xml	2013-03-15 09:34:21 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="sale_delivery_term_1" model="sale.delivery.term">
+            <field name="name">15 - 30</field>
+            <field name="line_ids" eval="[(0, 0,  {'quantity_perc': 0.5, 'delay': 15}),(0, 0,  {'quantity_perc': 0.5, 'delay': 30})]"/>
+        </record>
+        
+    </data>
+</openerp>

=== 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	2013-03-15 09:34:21 +0000
@@ -0,0 +1,83 @@
+<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="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="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="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" />
+                </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="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>
+                    <button name="generate_detailed_lines" string="Generate detailed lines" icon="gtk-go-forward" type="object" colspan="2"/>
+                </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	2013-03-15 09:34:21 +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/test'
=== added file 'sale_delivery_term/test/sale_order_demo.yml'
--- sale_delivery_term/test/sale_order_demo.yml	1970-01-01 00:00:00 +0000
+++ sale_delivery_term/test/sale_order_demo.yml	2013-03-15 09:34:21 +0000
@@ -0,0 +1,50 @@
+-
+  In order to test process of the Sale Order, I create sale order
+-
+  !record {model: sale.order, id: sale_order_test1}:
+    partner_id: base.res_partner_2
+    note: Invoice after delivery
+    payment_term: account.account_payment_term
+    master_order_line: 
+      - product_id: product.product_product_7
+        product_uom_qty: 8
+        delivery_term_id: sale_delivery_term_1
+-
+  I verify that the onchange was correctly triggered
+-
+  !assert {model: sale.order, id: sale_order_test1, string: The onchange function of product was not correctly triggered}:
+    - master_order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
+    - master_order_line[0].price_unit == 1350.0
+    - master_order_line[0].product_uom_qty == 8
+    - master_order_line[0].product_uom.id == ref('product.product_uom_unit')
+
+-
+  I create another sale order
+-
+  !record {model: sale.order, id: sale_order_test2}:
+    partner_id: base.res_partner_2
+    master_order_line: 
+      - product_id: product.product_product_7
+        product_uom_qty: 16
+        product_uom: product.product_uom_dozen
+        delivery_term_id: sale_delivery_term_1
+-
+  I verify that the onchange was correctly triggered
+-
+  !assert {model: sale.order, id: sale_order_test2, string: The onchange function of product was not correctly triggered}:
+    - master_order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
+    - master_order_line[0].price_unit == 1350.0 * 12
+    - master_order_line[0].product_uom.id == ref('product.product_uom_dozen')
+    - master_order_line[0].product_uom_qty == 16
+
+-
+  I create the detailed order lines
+-
+   !python {model: sale.order}: |
+     for line in self.browse(cr, uid, ref('sale_order_test2')).master_order_line:
+       line.generate_detailed_lines()
+
+-
+  I confirm the Quotation
+-
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_test2}

=== 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	2013-03-15 09:34:21 +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	2013-03-15 09:34:21 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#
+#    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 . 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	2013-03-15 09:34:21 +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>)
+#
+#    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',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['sale_stock'],
+    "data" : [
+        'sale_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    "demo" : [
+        'sale_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	2013-03-15 09:34:21 +0000
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2012 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2012 Domsense srl (<http://www.domsense.com>)
+#
+#    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 openerp.osv import fields, orm
+
+class sale_order_line_group(orm.Model):
+    _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),
+    }
+
+
+class sale_order_line(orm.Model):
+    _inherit = 'sale.order.line'
+    _columns = {
+        'picking_group_id': fields.many2one('sale.order.line.group', 'Group',
+            help="This is used by 'multi-picking' to group order lines in one picking"),
+        }
+
+
+class sale_order(orm.Model):
+    _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:
+                group_id = line.picking_group_id.id if line.picking_group_id else 0
+                lines_by_group.setdefault(group_id, []).append(line)
+            for group in lines_by_group:
+                if not group:
+                    picking_id = None
+                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
+        

=== added file 'sale_multi_picking/sale_demo.xml'
--- sale_multi_picking/sale_demo.xml	1970-01-01 00:00:00 +0000
+++ sale_multi_picking/sale_demo.xml	2013-03-15 09:34:21 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="sale_order_line_group_1" model="sale.order.line.group">
+            <field name="name">1</field>
+        </record>
+        <record id="sale_order_line_group_2" model="sale.order.line.group">
+            <field name="name">2</field>
+        </record>
+        
+    </data>
+</openerp>

=== 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	2013-03-15 09:34:21 +0000
@@ -0,0 +1,23 @@
+<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="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	2013-03-15 09:34:21 +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