[REF, IMP]: sale_crm: Code improvement, Removed unused code
bzr revid: rpa@tinyerp.com-20100923135047-b55igfq4dg66xjzw
This commit is contained in:
rpa (Open ERP)
parent
85e30424c7
commit
e6657edd35
|
|
@ -23,47 +23,10 @@ from osv import osv,fields
|
|||
|
||||
class sale_order(osv.osv):
|
||||
_inherit = 'sale.order'
|
||||
|
||||
_columns = {
|
||||
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
|
||||
}
|
||||
def action_cancel(self, cr, uid, ids, context=None):
|
||||
res = super(sale_order, self).action_cancel(cr, uid, ids, context=context)
|
||||
case_pool = self.pool.get('crm.lead')
|
||||
data_pool = self.pool.get('ir.model.data')
|
||||
data = data_pool._get_id(cr, uid, 'crm', 'stage_lead6')
|
||||
res_data = data_pool.read(cr, uid, data, ['res_id'])
|
||||
lost_stage_id = False
|
||||
if res_data and res_data.get('res_id'):
|
||||
lost_stage_id = res_data.get('res_id', False)
|
||||
if not lost_stage_id:
|
||||
return res
|
||||
# After sale cancel, lead also lost
|
||||
for sale_id in ids:
|
||||
lead_ids = case_pool.search(cr, uid, [('ref','=','sale.order,%s'%(sale_id))])
|
||||
case_pool.write(cr, uid, lead_ids, {'stage_id': lost_stage_id})
|
||||
return res
|
||||
def action_ship_create(self, cr, uid, ids, *args):
|
||||
res = super(sale_order, self).action_ship_create(cr, uid, ids, *args)
|
||||
case_pool = self.pool.get('crm.lead')
|
||||
data_pool = self.pool.get('ir.model.data')
|
||||
data = data_pool._get_id(cr, uid, 'crm', 'stage_lead5')
|
||||
res_data = data_pool.read(cr, uid, data, ['res_id'])
|
||||
win_stage_id = False
|
||||
if res_data and res_data.get('res_id'):
|
||||
win_stage_id = res_data.get('res_id', False)
|
||||
if not win_stage_id:
|
||||
return res
|
||||
# After sale confimed, lead also win
|
||||
for sale_id in ids:
|
||||
lead_ids = case_pool.search(cr, uid, [('ref','=','sale.order,%s'%(sale_id))])
|
||||
case_pool.write(cr, uid, lead_ids, {'stage_id': win_stage_id})
|
||||
return res
|
||||
def _get_section(self, cr, uid, context=None):
|
||||
return context.get('context_section_id', False)
|
||||
|
||||
_defaults = {
|
||||
'section_id': _get_section
|
||||
}
|
||||
|
||||
sale_order()
|
||||
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
import time
|
||||
|
||||
from osv import fields, osv
|
||||
from tools.translate import _
|
||||
import decimal_precision as dp
|
||||
import time
|
||||
|
||||
|
||||
class crm_make_sale(osv.osv_memory):
|
||||
""" Make sale order for crm """
|
||||
|
|
@ -42,10 +42,12 @@ class crm_make_sale(osv.osv_memory):
|
|||
"""
|
||||
if not context:
|
||||
context = {}
|
||||
|
||||
lead_obj = self.pool.get('crm.lead')
|
||||
active_id = context and context.get('active_id', False) or False
|
||||
if not active_id:
|
||||
return False
|
||||
|
||||
lead = lead_obj.read(cr, uid, active_id, ['partner_id'])
|
||||
return lead['partner_id']
|
||||
|
||||
|
|
@ -53,14 +55,11 @@ class crm_make_sale(osv.osv_memory):
|
|||
if context is None:
|
||||
context = {}
|
||||
if context.get('active_ids', False) and context['active_ids']:
|
||||
oppr = self.pool.get('crm.lead').browse(cr, uid, context['active_ids'])
|
||||
for line in oppr:
|
||||
for line in self.pool.get('crm.lead').browse(cr, uid, context['active_ids']):
|
||||
if not line.section_id:
|
||||
raise osv.except_osv(_('Warning !'), _(' Sales Team is not specified.'))
|
||||
return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)
|
||||
|
||||
|
||||
|
||||
def makeOrder(self, cr, uid, ids, context=None):
|
||||
"""
|
||||
This function create Quotation on given case.
|
||||
|
|
@ -80,75 +79,65 @@ class crm_make_sale(osv.osv_memory):
|
|||
partner_obj = self.pool.get('res.partner')
|
||||
sale_line_obj = self.pool.get('sale.order.line')
|
||||
|
||||
result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
|
||||
|
||||
data = context and context.get('active_ids', []) or []
|
||||
|
||||
for make in self.browse(cr, uid, ids):
|
||||
default_partner_addr = partner_obj.address_get(cr, uid, [make.partner_id.id],
|
||||
['invoice', 'delivery', 'contact'])
|
||||
default_pricelist = partner_obj.browse(cr, uid, make.partner_id.id,
|
||||
context).property_product_pricelist.id
|
||||
fpos_data = partner_obj.browse(cr, uid, make.partner_id.id, context).property_account_position
|
||||
for make in self.browse(cr, uid, ids, context=context):
|
||||
partner = make.partner_id
|
||||
partner_addr = partner_obj.address_get(cr, uid, [partner.id],
|
||||
['default', 'invoice', 'delivery', 'contact'])
|
||||
pricelist = partner.property_product_pricelist.id
|
||||
fpos = partner.property_account_position and partner.property_account_position.id or False
|
||||
new_ids = []
|
||||
|
||||
for case in case_obj.browse(cr, uid, data):
|
||||
if case.partner_id and case.partner_id.id:
|
||||
partner_id = case.partner_id.id
|
||||
fpos = case.partner_id.property_account_position and case.partner_id.property_account_position.id or False
|
||||
partner_addr = partner_obj.address_get(cr, uid, [case.partner_id.id],
|
||||
for case in case_obj.browse(cr, uid, data, context=context):
|
||||
if not partner and case.partner_id:
|
||||
partner = case.partner_id
|
||||
fpos = partner.property_account_position and partner.property_account_position.id or False
|
||||
partner_addr = partner_obj.address_get(cr, uid, [partner.id],
|
||||
['default', 'invoice', 'delivery', 'contact'])
|
||||
pricelist = partner_obj.browse(cr, uid, case.partner_id.id,
|
||||
context).property_product_pricelist.id
|
||||
else:
|
||||
partner_id = make.partner_id.id
|
||||
fpos = fpos_data and fpos_data.id or False
|
||||
partner_addr = default_partner_addr
|
||||
pricelist = default_pricelist
|
||||
pricelist = partner.property_product_pricelist.id
|
||||
|
||||
if False in partner_addr.values():
|
||||
raise osv.except_osv(_('Data Insufficient!'),_('Customer has no addresses defined!'))
|
||||
raise osv.except_osv(_('Data Insufficient!'), _('Customer has no addresses defined!'))
|
||||
|
||||
vals = {
|
||||
'origin': 'Opportunity: %s' % str(case.id),
|
||||
'section_id': case.section_id and case.section_id.id or False,
|
||||
'shop_id': make.shop_id.id,
|
||||
'partner_id': partner_id,
|
||||
'pricelist_id': pricelist,
|
||||
'partner_invoice_id': partner_addr['invoice'],
|
||||
'partner_order_id': partner_addr['contact'],
|
||||
'partner_shipping_id': partner_addr['delivery'],
|
||||
'date_order': time.strftime('%Y-%m-%d'),
|
||||
'fiscal_position': fpos,
|
||||
'origin': _('Opportunity: %s') % str(case.id),
|
||||
'section_id': case.section_id and case.section_id.id or False,
|
||||
'shop_id': make.shop_id.id,
|
||||
'partner_id': partner.id,
|
||||
'pricelist_id': pricelist,
|
||||
'partner_invoice_id': partner_addr['invoice'],
|
||||
'partner_order_id': partner_addr['contact'],
|
||||
'partner_shipping_id': partner_addr['delivery'],
|
||||
'date_order': time.strftime('%Y-%m-%d'),
|
||||
'fiscal_position': fpos,
|
||||
}
|
||||
|
||||
if partner_id:
|
||||
partner = partner_obj.browse(cr, uid, partner_id, context=context)
|
||||
if partner.id:
|
||||
vals['user_id'] = partner.user_id and partner.user_id.id or uid
|
||||
|
||||
if make.analytic_account.id:
|
||||
vals['project_id'] = make.analytic_account.id
|
||||
new_id = sale_obj.create(cr, uid, vals)
|
||||
for line in make.sale_order_line:
|
||||
value = {}
|
||||
value['order_id'] = new_id
|
||||
value['name'] = line.name
|
||||
value['delay'] = line.delay
|
||||
value['product_id'] =line.product_id and line.product_id.id or False
|
||||
value['price_unit'] = line.price_unit
|
||||
value['tax_id'] = line.tax_id and [(6,0,map(lambda x: x.id,line.tax_id))] or False
|
||||
value['type'] = line.type
|
||||
value['product_uom_qty']=line.product_uom_qty
|
||||
value['product_uom']=line.product_uom.id
|
||||
value['product_uos_qty']=line.product_uos_qty
|
||||
value['product_uos']=line.product_uos and line.product_uos.id or False
|
||||
value['product_packaging'] = line.product_packaging and line.product_packaging.id or False
|
||||
value['discount']=line.discount
|
||||
value['notes']=line.notes
|
||||
sale_line_obj.create(cr, uid, value)
|
||||
stage_data = mod_obj._get_id(cr, uid, 'crm', 'stage_lead3')
|
||||
stage_data = mod_obj.read(cr, uid, stage_data, ['res_id'])
|
||||
case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id, 'stage_id': stage_data['res_id']})
|
||||
value = {
|
||||
'order_id': new_id,
|
||||
'name': line.name,
|
||||
'delay': line.delay,
|
||||
'product_id': line.product_id and line.product_id.id or False,
|
||||
'price_unit': line.price_unit,
|
||||
'tax_id': line.tax_id and [(6, 0, map(lambda x: x.id, line.tax_id))] or False,
|
||||
'type': line.type,
|
||||
'product_uom_qty': line.product_uom_qty,
|
||||
'product_uom': line.product_uom.id,
|
||||
'product_uos_qty': line.product_uos_qty,
|
||||
'product_uos': line.product_uos and line.product_uos.id or False,
|
||||
'product_packaging': line.product_packaging and line.product_packaging.id or False,
|
||||
'discount': line.discount,
|
||||
'notes': line.notes
|
||||
}
|
||||
sale_line_obj.create(cr, uid, value, context=context)
|
||||
case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
|
||||
new_ids.append(new_id)
|
||||
message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Sales Quotation.")
|
||||
self.log(cr, uid, case.id, message)
|
||||
|
|
@ -160,22 +149,22 @@ class crm_make_sale(osv.osv_memory):
|
|||
return {}
|
||||
if len(new_ids)<=1:
|
||||
value = {
|
||||
'domain': str([('id', 'in', new_ids)]),
|
||||
'view_type': 'form',
|
||||
'view_mode': 'form',
|
||||
'res_model': 'sale.order',
|
||||
'view_id': False,
|
||||
'type': 'ir.actions.act_window',
|
||||
'domain': str([('id', 'in', new_ids)]),
|
||||
'view_type': 'form',
|
||||
'view_mode': 'form',
|
||||
'res_model': 'sale.order',
|
||||
'view_id': False,
|
||||
'type': 'ir.actions.act_window',
|
||||
'res_id': new_ids and new_ids[0]
|
||||
}
|
||||
else:
|
||||
value = {
|
||||
'domain': str([('id', 'in', new_ids)]),
|
||||
'view_type': 'form',
|
||||
'view_mode': 'tree,form',
|
||||
'res_model': 'sale.order',
|
||||
'view_id': False,
|
||||
'type': 'ir.actions.act_window',
|
||||
'domain': str([('id', 'in', new_ids)]),
|
||||
'view_type': 'form',
|
||||
'view_mode': 'tree,form',
|
||||
'res_model': 'sale.order',
|
||||
'view_id': False,
|
||||
'type': 'ir.actions.act_window',
|
||||
'res_id': new_ids
|
||||
}
|
||||
return value
|
||||
|
|
@ -188,23 +177,23 @@ class crm_make_sale(osv.osv_memory):
|
|||
return shop and shop[0] or False
|
||||
|
||||
_columns = {
|
||||
'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
|
||||
'partner_id': fields.many2one('res.partner', 'Customer', required=True),
|
||||
'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'),
|
||||
'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),
|
||||
'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'),
|
||||
'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
|
||||
'partner_id': fields.many2one('res.partner', 'Customer', required=True),
|
||||
'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'),
|
||||
'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),
|
||||
'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'),
|
||||
}
|
||||
_defaults = {
|
||||
'shop_id': _get_shop_id,
|
||||
'partner_id': _selectPartner,
|
||||
'shop_id': _get_shop_id,
|
||||
'partner_id': _selectPartner,
|
||||
}
|
||||
|
||||
crm_make_sale()
|
||||
|
||||
class sale_order_make_line(osv.osv_memory):
|
||||
|
||||
def product_id_change(self, cr, uid, ids, product, qty=0,
|
||||
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
|
||||
def product_id_change(self, cr, uid, ids, product, qty=0,
|
||||
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
|
||||
lang=False, update_tax=True, packaging=False, flag=False):
|
||||
if not partner_id:
|
||||
raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
|
||||
|
|
@ -217,28 +206,28 @@ class sale_order_make_line(osv.osv_memory):
|
|||
_name = 'sale.order.make.line'
|
||||
_description = 'Opportunity Sale Order Line'
|
||||
_columns = {
|
||||
'opportunity_order_id': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
|
||||
'name': fields.char('Description', size=256, required=True, select=True, ),
|
||||
'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer"),
|
||||
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
|
||||
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
|
||||
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'),
|
||||
'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True),
|
||||
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, ),
|
||||
'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, ),
|
||||
'product_uos_qty': fields.float('Quantity (UoS)'),
|
||||
'product_uos': fields.many2one('product.uom', 'Product UoS'),
|
||||
'product_packaging': fields.many2one('product.packaging', 'Packaging'),
|
||||
'discount': fields.float('Discount (%)', digits=(16, 2)),
|
||||
'notes': fields.text('Notes'),
|
||||
'opportunity_order_id': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True,),
|
||||
'name': fields.char('Description', size=256, required=True, select=True,),
|
||||
'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer"),
|
||||
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
|
||||
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
|
||||
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'),
|
||||
'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True),
|
||||
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True,),
|
||||
'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True,),
|
||||
'product_uos_qty': fields.float('Quantity (UoS)'),
|
||||
'product_uos': fields.many2one('product.uom', 'Product UoS'),
|
||||
'product_packaging': fields.many2one('product.packaging', 'Packaging'),
|
||||
'discount': fields.float('Discount (%)', digits=(16, 2)),
|
||||
'notes': fields.text('Notes'),
|
||||
}
|
||||
_order = 'sequence, id'
|
||||
_defaults = {
|
||||
'discount': 0.0,
|
||||
'delay': 0.0,
|
||||
'product_uom_qty': 1,
|
||||
'product_uos_qty': 1,
|
||||
'type': 'make_to_stock',
|
||||
'discount': 0.0,
|
||||
'delay': 0.0,
|
||||
'product_uom_qty': 1,
|
||||
'product_uos_qty': 1,
|
||||
'type': 'make_to_stock',
|
||||
'product_packaging': False
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue