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

improve 

bzr revid: fp@tinyerp.com-20081029170842-t3d6cgifza0xziwd
This commit is contained in:
Fabien Pinckaers 2008-10-29 18:08:42 +01:00
parent bc1d66c8e0
commit 08ccd0eb3c
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/sale/sale.py
View File

@ -936,16 +936,20 @@ class sale_config_picking_policy(osv.osv_memory):
'name':fields.char('Name', size=64),
'picking_policy': fields.selection([
('direct','Direct Delivery'),
('one','All at once')
('one','All at Once')
], 'Packing Default Policy', required=True ),
'order_policy': fields.selection([
('manual','Invoice based on Sales Orders'),
('picking','Invoice based on Deliveries'),
('manual','Invoice Based on Sales Orders'),
('picking','Invoice Based on Deliveries'),
], 'Shipping Default Policy', required=True),
'step': fields.selection([
('one','Delivery Order Only'),
('two','Packing List & Delivery Order')
], 'Steps To Deliver a Sale Order', required=True)
], 'Steps To Deliver a Sale Order', required=True,
help="By default, Open ERP is able to manage complex routing and paths "\
"of products in your warehouse and partner locations. This will configure "\
"the most common and simple methods to deliver products to the customer "\
"in one or two operations by the worker.")
}
_defaults={
'picking_policy': lambda *a: 'direct',
@ -959,10 +963,17 @@ class sale_config_picking_policy(osv.osv_memory):
ir_values_obj = self.pool.get('ir.values')
ir_values_obj.set(cr,uid,'default',False,'order_policy',['sale.order'],o.order_policy)
#id = self.pool.get('ir.model.data')._get_id
if o.step=='one':
md = self.pool.get('ir.model.data')
group_id = md._get_id(cr, uid, 'base', 'group_no_one')
group_id = md.browse(cr, uid, group_id, context).res_id
menu_id = md._get_id(cr, uid, 'stock', 'menu_action_picking_tree_delivery')
menu_id = md.browse(cr, uid, menu_id, context).res_id
self.pool.get('ir.ui.menu').write(cr, uid, [menu_id], {'groups_id':[(6,0,[group_id])]})
# base.group_no_one
location_id = md._get_id(cr, uid, 'stock', 'stock_location_output')
location_id = md.browse(cr, uid, location_id, context).res_id
self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing':'transparent'})
return {
'view_type': 'form',

2
addons/sale/sale_view.xml
View File

@ -464,6 +464,8 @@
<field name="picking_policy"/>
<newline/>
<field name="order_policy"/>
<newline/>
<field name="step"/>
<group col="4" colspan="4">
<button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
<button icon="gtk-ok" name="set_default" string="Set Default" type="object"/>