[FIX] #3153 Digits in wizard should be those of moves,... / Recreate delivery order from sale / Delivery method on delivery order
[IMP] Provide better purchase order picking type [IMP] Possibly a better product uos handling in the sale order line [FIX] Recreate of delivery order when sales order in shipping exception [FIX] Delivery method should be passed to delivery order
This commit is contained in:
parent
15763ebf28
commit
86f785ae1b
|
@ -53,10 +53,6 @@ class sale_order(osv.Model):
|
||||||
result['value']['carrier_id'] = dtype
|
result['value']['carrier_id'] = dtype
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def _prepare_order_picking(self, cr, uid, order, context=None):
|
|
||||||
result = super(sale_order, self)._prepare_order_picking(cr, uid, order, context=context)
|
|
||||||
result.update(carrier_id=order.carrier_id.id)
|
|
||||||
return result
|
|
||||||
|
|
||||||
def _delivery_unset(self, cr, uid, ids, context=None):
|
def _delivery_unset(self, cr, uid, ids, context=None):
|
||||||
sale_obj = self.pool['sale.order.line']
|
sale_obj = self.pool['sale.order.line']
|
||||||
|
@ -92,4 +88,4 @@ class sale_order(osv.Model):
|
||||||
'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
|
'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
|
||||||
'tax_id': [(6, 0, taxes_ids)],
|
'tax_id': [(6, 0, taxes_ids)],
|
||||||
'is_delivery': True
|
'is_delivery': True
|
||||||
})
|
})
|
|
@ -170,6 +170,15 @@ class stock_move(osv.osv):
|
||||||
'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Weight",),
|
'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Weight",),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def action_confirm(self, cr, uid, ids, context=None):
|
||||||
|
res = super(stock_move, self).action_confirm(cr, uid, ids, context=context)
|
||||||
|
pick_obj = self.pool.get("stock.picking")
|
||||||
|
for move in self.browse(cr, uid, ids, context=context):
|
||||||
|
if move.picking_id and move.procurement_id and move.procurement_id.sale_line_id and not move.picking_id.carrier_id :
|
||||||
|
pick_obj.write(cr, uid, [move.picking_id.id], {'carrier_id': move.procurement_id.sale_line_id.order_id.carrier_id.id}, context=context)
|
||||||
|
return res
|
||||||
|
|
||||||
|
|
||||||
def _get_default_uom(self, cr, uid, context=None):
|
def _get_default_uom(self, cr, uid, context=None):
|
||||||
uom_categ_id = self.pool.get('ir.model.data').xmlid_to_res_id(cr, uid, 'product.product_uom_categ_kgm')
|
uom_categ_id = self.pool.get('ir.model.data').xmlid_to_res_id(cr, uid, 'product.product_uom_categ_kgm')
|
||||||
return self.pool.get('product.uom').search(cr, uid, [('category_id', '=', uom_categ_id),('factor','=',1)])[0]
|
return self.pool.get('product.uom').search(cr, uid, [('category_id', '=', uom_categ_id),('factor','=',1)])[0]
|
||||||
|
|
|
@ -149,8 +149,20 @@ class purchase_order(osv.osv):
|
||||||
return res and res[0] or False
|
return res and res[0] or False
|
||||||
|
|
||||||
def _get_picking_in(self, cr, uid, context=None):
|
def _get_picking_in(self, cr, uid, context=None):
|
||||||
|
|
||||||
obj_data = self.pool.get('ir.model.data')
|
obj_data = self.pool.get('ir.model.data')
|
||||||
return obj_data.get_object_reference(cr, uid, 'stock','picking_type_in') and obj_data.get_object_reference(cr, uid, 'stock','picking_type_in')[1] or False
|
type_obj = self.pool.get('stock.picking.type')
|
||||||
|
user_obj = self.pool.get('res.users')
|
||||||
|
company_id = user_obj.browse(cr, uid, uid, context=context).company_id.id
|
||||||
|
pick_type = obj_data.get_object_reference(cr, uid, 'stock', 'picking_type_in') and obj_data.get_object_reference(cr, uid, 'stock', 'picking_type_in')[1] or False
|
||||||
|
if pick_type:
|
||||||
|
type = type_obj.browse(cr, uid, pick_type, context=context)
|
||||||
|
if type and type.warehouse_id and type.warehouse_id.company_id.id == company_id:
|
||||||
|
return pick_type
|
||||||
|
types = type_obj.search(cr, uid, [('code', '=', 'incoming')], context=context)
|
||||||
|
if not types:
|
||||||
|
raise osv.except_osv(_('Error!'), _("Make sure you have at least an incoming picking type defined"))
|
||||||
|
return types[0]
|
||||||
|
|
||||||
def _get_picking_ids(self, cr, uid, ids, field_names, args, context=None):
|
def _get_picking_ids(self, cr, uid, ids, field_names, args, context=None):
|
||||||
res = {}
|
res = {}
|
||||||
|
|
|
@ -712,10 +712,11 @@ class sale_order(osv.osv):
|
||||||
line.refresh()
|
line.refresh()
|
||||||
#run again procurement that are in exception in order to trigger another move
|
#run again procurement that are in exception in order to trigger another move
|
||||||
proc_ids += [x.id for x in line.procurement_ids if x.state in ('exception', 'cancel')]
|
proc_ids += [x.id for x in line.procurement_ids if x.state in ('exception', 'cancel')]
|
||||||
|
procurement_obj.reset_to_confirmed(cr, uid, proc_ids, context=context)
|
||||||
elif sale_line_obj.need_procurement(cr, uid, [line.id], context=context):
|
elif sale_line_obj.need_procurement(cr, uid, [line.id], context=context):
|
||||||
if (line.state == 'done') or not line.product_id:
|
if (line.state == 'done') or not line.product_id:
|
||||||
continue
|
continue
|
||||||
vals = self._prepare_order_line_procurement(cr, uid, order, line, group_id=group_id, context=context)
|
vals = self._prepare_order_line_procurement(cr, uid, order, line, group_id=order.procurement_group_id.id, context=context)
|
||||||
proc_id = procurement_obj.create(cr, uid, vals, context=context)
|
proc_id = procurement_obj.create(cr, uid, vals, context=context)
|
||||||
proc_ids.append(proc_id)
|
proc_ids.append(proc_id)
|
||||||
#Confirm procurement order such that rules will be applied on it
|
#Confirm procurement order such that rules will be applied on it
|
||||||
|
|
|
@ -59,7 +59,7 @@ Some statistics by journals are provided.
|
||||||
],
|
],
|
||||||
'demo': ['sale_journal_demo.xml'],
|
'demo': ['sale_journal_demo.xml'],
|
||||||
'test': [ ],
|
'test': [ ],
|
||||||
'installable': True,
|
'installable': False,
|
||||||
'auto_install': False,
|
'auto_install': False,
|
||||||
}
|
}
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -38,17 +38,11 @@
|
||||||
<xpath expr="//field[@name='order_line']/tree//field[@name='product_uom_qty']" position="replace">
|
<xpath expr="//field[@name='order_line']/tree//field[@name='product_uom_qty']" position="replace">
|
||||||
<field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
|
<field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
|
||||||
name="product_uom_qty"
|
name="product_uom_qty"
|
||||||
on_change="product_id_change_with_wh(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, parent.warehouse_id, context)"/>
|
on_change="product_id_change_with_wh(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,False,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, parent.warehouse_id, context)"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//field[@name='order_line']/form//field[@name='product_id']" position="replace">
|
<xpath expr="//field[@name='order_line']/form//field[@name='product_uos_qty']" position="replace">
|
||||||
<field name="product_id"
|
<field context="{'partner_id':parent.partner_id, 'quantity':product_uos_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
|
||||||
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
|
name="product_uos_qty" class="oe_inline"
|
||||||
groups="base.group_user"
|
|
||||||
on_change="product_id_change_with_wh(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, parent.warehouse_id, context)"/>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//field[@name='order_line']/form//field[@name='product_uom_qty']" position="replace">
|
|
||||||
<field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
|
|
||||||
name="product_uom_qty" class="oe_inline"
|
|
||||||
on_change="product_id_change_with_wh(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, parent.warehouse_id, context)"/>
|
on_change="product_id_change_with_wh(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, parent.warehouse_id, context)"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
|
|
||||||
|
|
|
@ -133,7 +133,7 @@ class stock_transfer_details_items(models.TransientModel):
|
||||||
packop_id = fields.Many2one('stock.pack.operation', 'Operation')
|
packop_id = fields.Many2one('stock.pack.operation', 'Operation')
|
||||||
product_id = fields.Many2one('product.product', 'Product')
|
product_id = fields.Many2one('product.product', 'Product')
|
||||||
product_uom_id = fields.Many2one('product.uom', 'Product Unit of Measure')
|
product_uom_id = fields.Many2one('product.uom', 'Product Unit of Measure')
|
||||||
quantity = fields.Float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), default = 1.0)
|
quantity = fields.Float('Quantity', digits=dp.get_precision('Product Unit of Measure'), default = 1.0)
|
||||||
package_id = fields.Many2one('stock.quant.package', 'Source package', domain="['|', ('location_id', 'child_of', sourceloc_id), ('location_id','=',False)]")
|
package_id = fields.Many2one('stock.quant.package', 'Source package', domain="['|', ('location_id', 'child_of', sourceloc_id), ('location_id','=',False)]")
|
||||||
lot_id = fields.Many2one('stock.production.lot', 'Lot/Serial Number')
|
lot_id = fields.Many2one('stock.production.lot', 'Lot/Serial Number')
|
||||||
sourceloc_id = fields.Many2one('stock.location', 'Source Location', required=True)
|
sourceloc_id = fields.Many2one('stock.location', 'Source Location', required=True)
|
||||||
|
|
Loading…
Reference in New Issue