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

[IMP] changes for sale configuration view 

bzr revid: tpa@tinyerp.com-20120223094626-7vt2ufe2qjeoudc2
This commit is contained in:
Turkesh Patel (Open ERP) 2012-02-23 15:16:26 +05:30
parent 82c41467ad
commit 187b0d3532
4 changed files with 116 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
addons/delivery/delivery.py
View File

@ -250,23 +250,23 @@ class delivery_grid_line(osv.osv):
delivery_grid_line() delivery_grid_line()
class define_delivery_steps(osv.osv_memory): #class define_delivery_steps(osv.osv_memory):
_name = 'delivery.define.delivery.steps.wizard' # _name = 'delivery.define.delivery.steps.wizard'
#
_columns = { # _columns = {
'picking_policy' : fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], 'Picking Policy'), # 'picking_policy' : fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')], 'Picking Policy'),
} # }
_defaults = { # _defaults = {
'picking_policy': lambda s,c,u,ctx: s.pool.get('sale.order').default_get(c,u,['picking_policy'],context=ctx)['picking_policy'] # 'picking_policy': lambda s,c,u,ctx: s.pool.get('sale.order').default_get(c,u,['picking_policy'],context=ctx)['picking_policy']
} # }
#
def apply_cb(self, cr, uid, ids, context=None): # def apply_cb(self, cr, uid, ids, context=None):
ir_values_obj = self.pool.get('ir.values') # ir_values_obj = self.pool.get('ir.values')
wizard = self.browse(cr, uid, ids, context=context)[0] # wizard = self.browse(cr, uid, ids, context=context)[0]
ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], wizard.picking_policy) # ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], wizard.picking_policy)
return {'type' : 'ir.actions.act_window_close'} # return {'type' : 'ir.actions.act_window_close'}
#
define_delivery_steps() #define_delivery_steps()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/delivery/delivery_view.xml
View File

@ -337,7 +337,7 @@
<field name="sequence">10</field> <field name="sequence">10</field>
</record> </record>
<record model="ir.ui.view" id="define_delivery_steps_form"> <!--record model="ir.ui.view" id="define_delivery_steps_form">
<field name="name">delivery.define_delivery_steps</field> <field name="name">delivery.define_delivery_steps</field>
<field name="model">delivery.define.delivery.steps.wizard</field> <field name="model">delivery.define.delivery.steps.wizard</field>
<field name="type">form</field> <field name="type">form</field>
@ -366,6 +366,6 @@
<field name="action_id" ref="action_define_delivery_steps" /> <field name="action_id" ref="action_define_delivery_steps" />
<field name="category_id" ref="base.category_sales_management_config"/> <field name="category_id" ref="base.category_sales_management_config"/>
<field name="type">once</field> <field name="type">once</field>
</record> </record-->
</data> </data>
</openerp> </openerp>

161
addons/sale/sale.py
View File

@ -1331,94 +1331,93 @@ class sale_order_line(osv.osv):
sale_order_line() sale_order_line()
class sale_config_picking_policy(osv.osv_memory): class sale_config_picking_policy(osv.osv_memory):
_name = 'sale.config.picking_policy' _inherit = 'sale.config.picking_policy'
_inherit = 'res.config'
_columns = { _columns = {
'name': fields.char('Name', size=64), # 'name': fields.char('Name', size=64),
'sale_orders': fields.boolean('Based on Sales Orders',), # 'sale_orders': fields.boolean('Based on Sales Orders',),
'deli_orders': fields.boolean('Based on Delivery Orders'), # 'deli_orders': fields.boolean('Based on Delivery Orders'),
'task_work': fields.boolean('Based on Tasks\' Work'), # 'task_work': fields.boolean('Based on Tasks\' Work'),
'timesheet': fields.boolean('Based on Timesheet'), # 'timesheet': fields.boolean('Based on Timesheet'),
'order_policy': fields.selection([ # 'order_policy': fields.selection([
('manual', 'Invoice Based on Sales Orders'), # ('manual', 'Invoice Based on Sales Orders'),
('picking', 'Invoice Based on Deliveries'), # ('picking', 'Invoice Based on Deliveries'),
], 'Main Method Based On', required=True, help="You can generate invoices based on sales orders or based on shippings."), # ], 'Main Method Based On', required=True, help="You can generate invoices based on sales orders or based on shippings."),
'charge_delivery': fields.boolean('Do you charge the delivery?'), # 'charge_delivery': fields.boolean('Do you charge the delivery?'),
'time_unit': fields.many2one('product.uom','Main Working Time Unit') 'time_unit': fields.many2one('product.uom','Main Working Time Unit')
} }
_defaults = { _defaults = {
'order_policy': 'manual', # 'order_policy': 'manual',
'time_unit': lambda self, cr, uid, c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c) and self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c)[0] or False, 'time_unit': lambda self, cr, uid, c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c) and self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c)[0] or False,
} }
#
def onchange_order(self, cr, uid, ids, sale, deli, context=None): # def onchange_order(self, cr, uid, ids, sale, deli, context=None):
res = {} # res = {}
if sale: # if sale:
res.update({'order_policy': 'manual'}) # res.update({'order_policy': 'manual'})
elif deli: # elif deli:
res.update({'order_policy': 'picking'}) # res.update({'order_policy': 'picking'})
return {'value':res} # return {'value':res}
#
def execute(self, cr, uid, ids, context=None): # def execute(self, cr, uid, ids, context=None):
ir_values_obj = self.pool.get('ir.values') # ir_values_obj = self.pool.get('ir.values')
data_obj = self.pool.get('ir.model.data') # data_obj = self.pool.get('ir.model.data')
menu_obj = self.pool.get('ir.ui.menu') # menu_obj = self.pool.get('ir.ui.menu')
module_obj = self.pool.get('ir.module.module') # module_obj = self.pool.get('ir.module.module')
module_upgrade_obj = self.pool.get('base.module.upgrade') # module_upgrade_obj = self.pool.get('base.module.upgrade')
module_name = [] # module_name = []
#
group_id = data_obj.get_object(cr, uid, 'base', 'group_sale_salesman').id # group_id = data_obj.get_object(cr, uid, 'base', 'group_sale_salesman').id
#
wizard = self.browse(cr, uid, ids)[0] # wizard = self.browse(cr, uid, ids)[0]
#
if wizard.sale_orders: # if wizard.sale_orders:
menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_invoicing_sales_order_lines').id # menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_invoicing_sales_order_lines').id
menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]}) # menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
#
if wizard.deli_orders: # if wizard.deli_orders:
menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_action_picking_list_to_invoice').id # menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_action_picking_list_to_invoice').id
menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]}) # menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
#
if wizard.task_work: # if wizard.task_work:
module_name.append('project_timesheet') # module_name.append('project_timesheet')
module_name.append('project_mrp') # module_name.append('project_mrp')
module_name.append('account_analytic_analysis') # module_name.append('account_analytic_analysis')
#
if wizard.timesheet: # if wizard.timesheet:
module_name.append('account_analytic_analysis') # module_name.append('account_analytic_analysis')
#
if wizard.charge_delivery: # if wizard.charge_delivery:
module_name.append('delivery') # module_name.append('delivery')
#
if len(module_name): # if len(module_name):
module_ids = [] # module_ids = []
need_install = False # need_install = False
module_ids = [] # module_ids = []
for module in module_name: # for module in module_name:
data_id = module_obj.name_search(cr, uid , module, [], '=') # data_id = module_obj.name_search(cr, uid , module, [], '=')
module_ids.append(data_id[0][0]) # module_ids.append(data_id[0][0])
#
for module in module_obj.browse(cr, uid, module_ids): # for module in module_obj.browse(cr, uid, module_ids):
if module.state == 'uninstalled': # if module.state == 'uninstalled':
module_obj.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context) # module_obj.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
need_install = True # need_install = True
cr.commit() # cr.commit()
if need_install: # if need_install:
pooler.restart_pool(cr.dbname, update_module=True)[1] # pooler.restart_pool(cr.dbname, update_module=True)[1]
#
if wizard.time_unit: # if wizard.time_unit:
prod_id = data_obj.get_object(cr, uid, 'product', 'product_consultant').id # prod_id = data_obj.get_object(cr, uid, 'product', 'product_consultant').id
product_obj = self.pool.get('product.product') # product_obj = self.pool.get('product.product')
product_obj.write(cr, uid, prod_id, {'uom_id':wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id}) # product_obj.write(cr, uid, prod_id, {'uom_id':wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
#
ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy) # ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)
if wizard.task_work and wizard.time_unit: # if wizard.task_work and wizard.time_unit:
company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id # company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
self.pool.get('res.company').write(cr, uid, [company_id], { # self.pool.get('res.company').write(cr, uid, [company_id], {
'project_time_mode_id': wizard.time_unit.id # 'project_time_mode_id': wizard.time_unit.id
}, context=context) # }, context=context)
#
sale_config_picking_policy() sale_config_picking_policy()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

29
addons/sale/sale_view.xml
View File

@ -503,14 +503,14 @@
<!-- configartion view --> <!-- configartion view -->
<record id="view_config_picking_policy" model="ir.ui.view"> <record id="view_config_picking_policy_11" model="ir.ui.view">
<field name="name">Setup Your Invoicing Method</field> <field name="name">Setup Your Invoicing Method</field>
<field name="model">sale.config.picking_policy</field> <field name="model">sale.config.picking_policy</field>
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="base.res_config_view_base"/> <field name="inherit_id" ref="base.view_config_picking_policy_1"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <!--data>
<form position="attributes"> < form position="attributes">
<attribute name="string">Setup your Invoicing Method</attribute> <attribute name="string">Setup your Invoicing Method</attribute>
</form> </form>
@ -519,12 +519,13 @@
</xpath> </xpath>
<xpath expr="//label[@string='description']" position="attributes"> <xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">This tool will help you to install the right module and configure the system according to the method you use to invoice your customers.</attribute> <attribute name="string">This tool will help you to install the right module and configure the system according to the method you use to invoice your customers.</attribute>
</xpath> </xpath-->
<xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes"> <field name="picking_policy" position="before">
<attribute name="string"/> <newline/>
<attribute name="rowspan">12</attribute> <field name="time_unit" />
</xpath> <newline/>
<group string="res_config_contents" position="replace"> </field>
<!--group string="res_config_contents" position="replace">
<group colspan="4" col="4"> <group colspan="4" col="4">
<field name="sale_orders" on_change="onchange_order(sale_orders,deli_orders)"/> <field name="sale_orders" on_change="onchange_order(sale_orders,deli_orders)"/>
<newline/> <newline/>
@ -542,11 +543,11 @@
<field name="time_unit" widget="selection" domain="[('category_id','=',%(product.uom_categ_wtime)s)]" attrs="{'invisible':[('task_work','=',False),('timesheet','=',False)]}"/> <field name="time_unit" widget="selection" domain="[('category_id','=',%(product.uom_categ_wtime)s)]" attrs="{'invisible':[('task_work','=',False),('timesheet','=',False)]}"/>
</group> </group>
</group> </group>
</data> </data-->
</field> </field>
</record> </record>
<record id="action_config_picking_policy" model="ir.actions.act_window"> <!--record id="action_config_picking_policy" model="ir.actions.act_window">
<field name="name">Setup your Invoicing Method</field> <field name="name">Setup your Invoicing Method</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">sale.config.picking_policy</field> <field name="res_model">sale.config.picking_policy</field>
@ -556,12 +557,12 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<!-- register configuration wizard --> <register configuration wizard >
<record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo"> <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
<field name="action_id" ref="action_config_picking_policy"/> <field name="action_id" ref="action_config_picking_policy"/>
<field name="category_id" ref="base.category_sales_management_config"/> <field name="category_id" ref="base.category_sales_management_config"/>
<field name="type">once</field> <field name="type">once</field>
</record> </record-->
</data> </data>
</openerp> </openerp>