odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]sale_stock: add field function (one2many) picking_ids on sale_order object 

bzr revid: csn@openerp.com-20130711134044-8k9t0o5b93k6h736
This commit is contained in:
Cedric Snauwaert 2013-07-11 15:40:44 +02:00
parent 3563c8ca85
commit 30fb888bc1
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
addons/sale_stock/sale_stock.py
View File

@ -56,6 +56,35 @@ class sale_order(osv.osv):
raise osv.except_osv(_('Error!'), _('There is no warehouse defined for current company.'))
return warehouse_ids[0]
def _get_picking_ids(self, cr, uid, ids, name, args, context=None):
res = {}
if not ids: return res
for id in ids:
res.setdefault(id, [])
'''SQL request that does exactly the same as the code below'''
cr.execute('''SELECT sol.order_id, sm.picking_id from sale_order_line as sol \
LEFT JOIN procurement_order as po on (po.id = sol.procurement_id) \
LEFT JOIN stock_move as sm on (sm.id = po.move_id) \
LEFT JOIN stock_picking as sp on (sp.id = sm.picking_id) \
WHERE sol.order_id in %s and sp.type = 'out'\
GROUP BY sol.order_id, sm.picking_id ORDER BY sol.order_id''',(tuple(ids),))
result = cr.fetchall()
for r in result:
res[r[0]].append(r[1])
return res
'''for element in self.browse(cr, uid, ids, context=context):
procu_ids = []
for line in element.order_line:
if line.procurement_id:
procu_ids.append(line.procurement_id.id)
picking_ids = []
for procurement in self.pool.get('procurement.order').browse(cr, uid, list(set(procu_ids)), context=context):
if procurement.move_id and procurement.move_id.picking_id and procurement.move_id.picking_id.type == 'out':
picking_ids.append(procurement.move_id.picking_id.id)
res[element.id] = list(set(picking_ids))
return res'''
_columns = {
'state': fields.selection([
('draft', 'Draft Quotation'),
@ -83,6 +112,7 @@ class sale_order(osv.osv):
help="""On demand: A draft invoice can be created from the sales order when needed. \nOn delivery order: A draft invoice can be created from the delivery order when the products have been delivered. \nBefore delivery: A draft invoice is created from the sales order and must be paid before the products can be delivered."""),
'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
'picking_ids': fields.function(_get_picking_ids, method=True, type='one2many', relation='stock.picking', string='Picking associated to this sale'),
}
_defaults = {
'warehouse_id': _get_default_warehouse,

4
addons/sale_stock/sale_stock_view.xml
View File

@ -12,11 +12,11 @@
<button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
<button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
</xpath>
<!--<xpath expr="//button[@name='action_view_invoice']" position="after">
<xpath expr="//button[@name='action_view_invoice']" position="after">
<field name="picking_ids" invisible="1"/>
<button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}" groups="base.group_user"/>
</xpath>-->
</xpath>
<xpath expr="//button[@name='action_cancel']" position="after">
<button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
</xpath>