[IMP] Membership: code cleaning and implement store = {.....} on state field
bzr revid: psi@tinyerp.co.in-20101006113017-bugl9ock8irplrvh
This commit is contained in:
psi (Open ERP)
parent
5853f1d155
commit
2a4c1e50cb
|
|
@ -49,6 +49,14 @@ STATE_PRIOR = {
|
|||
class membership_line(osv.osv):
|
||||
'''Member line'''
|
||||
|
||||
def _get_membership_lines(self, cr, uid, ids, context=None):
|
||||
list_membership_line = []
|
||||
member_line_obj = self.pool.get('membership.membership_line')
|
||||
for invoice in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
|
||||
if invoice.invoice_line:
|
||||
list_membership_line += member_line_obj.search(cr, uid, [('account_invoice_line', 'in', [ l.id for l in invoice.invoice_line])], context=context)
|
||||
return list_membership_line
|
||||
|
||||
def _check_membership_date(self, cr, uid, ids, context=None):
|
||||
"""Check if membership product is not in the past
|
||||
@param self: The object pointer
|
||||
|
|
@ -84,7 +92,7 @@ class membership_line(osv.osv):
|
|||
@param return: Dictionary of state Value
|
||||
"""
|
||||
res = {}
|
||||
for line in self.browse(cr, uid, ids):
|
||||
for line in self.browse(cr, uid, ids, context=context):
|
||||
cr.execute('''
|
||||
SELECT i.state, i.id FROM
|
||||
account_invoice i
|
||||
|
|
@ -111,7 +119,7 @@ class membership_line(osv.osv):
|
|||
state = 'invoiced'
|
||||
elif istate == 'paid':
|
||||
state = 'paid'
|
||||
inv = self.pool.get('account.invoice').browse(cr, uid, fetched[1])
|
||||
inv = self.pool.get('account.invoice').browse(cr, uid, fetched[1], context=context)
|
||||
for payment in inv.payment_ids:
|
||||
if payment.invoice and payment.invoice.type == 'out_refund':
|
||||
state = 'canceled'
|
||||
|
|
@ -133,7 +141,12 @@ class membership_line(osv.osv):
|
|||
'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
|
||||
'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
|
||||
'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
|
||||
'state': fields.function(_state, method=True, string='Membership State', type='selection', selection=STATE, store=True),
|
||||
'state': fields.function(
|
||||
_state, method=True,
|
||||
string='Membership State', type='selection',
|
||||
selection=STATE, store = {
|
||||
'account.invoice':(_get_membership_lines, ['state'], 10),
|
||||
}),
|
||||
'company_id': fields.related('account_invoice_line', 'invoice_id', 'company_id', type="many2one", relation="res.company", string="Company", readonly=True, store=True)
|
||||
}
|
||||
_rec_name = 'partner'
|
||||
|
|
@ -152,7 +165,7 @@ class Partner(osv.osv):
|
|||
def _get_partner_id(self, cr, uid, ids, context=None):
|
||||
member_line_obj = self.pool.get('membership.membership_line')
|
||||
res_obj = self.pool.get('res.partner')
|
||||
data_inv = member_line_obj.browse(cr, uid, ids, context)
|
||||
data_inv = member_line_obj.browse(cr, uid, ids, context=context)
|
||||
list_partner = []
|
||||
for data in data_inv:
|
||||
list_partner.append(data.partner.id)
|
||||
|
|
@ -165,7 +178,7 @@ class Partner(osv.osv):
|
|||
def _get_invoice_partner(self, cr, uid, ids, context=None):
|
||||
inv_obj = self.pool.get('account.invoice')
|
||||
res_obj = self.pool.get('res.partner')
|
||||
data_inv = inv_obj.browse(cr, uid, ids, context)
|
||||
data_inv = inv_obj.browse(cr, uid, ids, context=context)
|
||||
list_partner = []
|
||||
for data in data_inv:
|
||||
list_partner.append(data.partner_id.id)
|
||||
|
|
@ -190,7 +203,7 @@ class Partner(osv.osv):
|
|||
res[id] = 'none'
|
||||
today = time.strftime('%Y-%m-%d')
|
||||
for id in ids:
|
||||
partner_data = self.browse(cr, uid, id)
|
||||
partner_data = self.browse(cr, uid, id, context=context)
|
||||
if partner_data.membership_cancel and today > partner_data.membership_cancel:
|
||||
res[id] = 'canceled'
|
||||
continue
|
||||
|
|
@ -237,7 +250,7 @@ class Partner(osv.osv):
|
|||
if partner_data.free_member and s!=0:
|
||||
res[id] = 'free'
|
||||
if partner_data.associate_member:
|
||||
res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context)
|
||||
res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context=context)
|
||||
res[id] = res_state[partner_data.associate_member.id]
|
||||
return res
|
||||
|
||||
|
|
@ -249,7 +262,7 @@ class Partner(osv.osv):
|
|||
res = {}
|
||||
member_line_obj = self.pool.get('membership.membership_line')
|
||||
|
||||
for partner in self.browse(cr, uid, ids):
|
||||
for partner in self.browse(cr, uid, ids, context=context):
|
||||
|
||||
if partner.associate_member:
|
||||
partner_id = partner.associate_member.id
|
||||
|
|
@ -264,22 +277,22 @@ class Partner(osv.osv):
|
|||
|
||||
if name == 'membership_start':
|
||||
line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
|
||||
limit=1, order='date_from')
|
||||
limit=1, order='date_from', context=context)
|
||||
if line_id:
|
||||
res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
|
||||
['date_from'])['date_from']
|
||||
['date_from'], context=context)['date_from']
|
||||
|
||||
if name == 'membership_stop':
|
||||
line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
|
||||
limit=1, order='date_to desc')
|
||||
limit=1, order='date_to desc', context=context)
|
||||
if line_id1:
|
||||
res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
|
||||
['date_to'])['date_to']
|
||||
['date_to'], context=context)['date_to']
|
||||
if name == 'membership_cancel':
|
||||
if partner.membership_state == 'canceled':
|
||||
line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel')
|
||||
line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)], limit=1, order='date_cancel', context=context)
|
||||
if line_id2:
|
||||
res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0],['date_cancel'])['date_cancel']
|
||||
res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0], ['date_cancel'], context=context)['date_cancel']
|
||||
|
||||
return res
|
||||
|
||||
|
|
@ -366,7 +379,7 @@ class Partner(osv.osv):
|
|||
context = {}
|
||||
default = default.copy()
|
||||
default['member_lines'] = []
|
||||
return super(Partner, self).copy(cr, uid, id, default, context)
|
||||
return super(Partner, self).copy(cr, uid, id, default, context=context)
|
||||
|
||||
def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
|
||||
""" Create Customer Invoice of Membership for partners.
|
||||
|
|
@ -411,8 +424,7 @@ class Partner(osv.osv):
|
|||
'address_invoice_id': addr.get('invoice', False),
|
||||
'account_id': account_id,
|
||||
'fiscal_position': fpos_id or False
|
||||
}
|
||||
)
|
||||
}, context=context)
|
||||
line_value['invoice_id'] = invoice_id
|
||||
invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
|
||||
invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}, context=context)
|
||||
|
|
@ -438,8 +450,8 @@ class Product(osv.osv):
|
|||
model_obj = self.pool.get('ir.model.data')
|
||||
|
||||
if ('product' in context) and (context['product']=='membership_product'):
|
||||
model_data_ids_form = model_obj.search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])])
|
||||
resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id','name'])
|
||||
model_data_ids_form = model_obj.search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])], context=context)
|
||||
resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id','name'], context=context)
|
||||
dict_model={}
|
||||
for i in resource_id_form:
|
||||
dict_model[i['name']]=i['res_id']
|
||||
|
|
@ -468,18 +480,16 @@ class Invoice(osv.osv):
|
|||
|
||||
_inherit = 'account.invoice'
|
||||
|
||||
def action_cancel(self, cr, uid, ids, context=None):
|
||||
def action_cancel(self, cr, uid, ids, *args):
|
||||
'''Create a 'date_cancel' on the membership_line object'''
|
||||
if context is None:
|
||||
context = {}
|
||||
member_line_obj = self.pool.get('membership.membership_line')
|
||||
today = time.strftime('%Y-%m-%d')
|
||||
for invoice in self.browse(cr, uid, ids):
|
||||
mlines = member_line_obj.search(cr, uid,
|
||||
[('account_invoice_line','in',
|
||||
[ l.id for l in invoice.invoice_line])], context)
|
||||
member_line_obj.write(cr, uid, mlines, {'date_cancel':today}, context)
|
||||
return super(Invoice, self).action_cancel(cr, uid, ids, context)
|
||||
[ l.id for l in invoice.invoice_line])])
|
||||
member_line_obj.write(cr, uid, mlines, {'date_cancel':today})
|
||||
return super(Invoice, self).action_cancel(cr, uid, ids)
|
||||
Invoice()
|
||||
|
||||
class account_invoice_line(osv.osv):
|
||||
|
|
@ -492,9 +502,9 @@ class account_invoice_line(osv.osv):
|
|||
context={}
|
||||
res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
|
||||
member_line_obj = self.pool.get('membership.membership_line')
|
||||
for line in self.browse(cr, uid, ids):
|
||||
for line in self.browse(cr, uid, ids, context=context):
|
||||
if line.invoice_id.type == 'out_invoice':
|
||||
ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
|
||||
ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)], context=context)
|
||||
if line.product_id and line.product_id.membership and not ml_ids:
|
||||
# Product line has changed to a membership product
|
||||
date_from = line.product_id.membership_date_from
|
||||
|
|
@ -509,7 +519,7 @@ class account_invoice_line(osv.osv):
|
|||
'date_from': date_from,
|
||||
'date_to': date_to,
|
||||
'account_invoice_line': line.id,
|
||||
})
|
||||
}, context=context)
|
||||
if line.product_id and not line.product_id.membership and ml_ids:
|
||||
# Product line has changed to a non membership product
|
||||
member_line_obj.unlink(cr, uid, ml_ids, context=context)
|
||||
|
|
@ -522,19 +532,19 @@ class account_invoice_line(osv.osv):
|
|||
context={}
|
||||
member_line_obj = self.pool.get('membership.membership_line')
|
||||
for id in ids:
|
||||
ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',id)])
|
||||
ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',id)], context=context)
|
||||
member_line_obj.unlink(cr, uid, ml_ids, context=context)
|
||||
return super(account_invoice_line, self).unlink(cr, uid, ids, context=context)
|
||||
|
||||
def create(self, cr, uid, vals, context={}):
|
||||
def create(self, cr, uid, vals, context=None):
|
||||
"""Overrides orm create method
|
||||
"""
|
||||
result = super(account_invoice_line, self).create(cr, uid, vals, context)
|
||||
line = self.browse(cr, uid, result)
|
||||
result = super(account_invoice_line, self).create(cr, uid, vals, context=context)
|
||||
line = self.browse(cr, uid, result, context=context)
|
||||
member_line_obj = self.pool.get('membership.membership_line')
|
||||
if line.invoice_id.type == 'out_invoice':
|
||||
|
||||
ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
|
||||
ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)], context=context)
|
||||
if line.product_id and line.product_id.membership and not ml_ids:
|
||||
# Product line is a membership product
|
||||
date_from = line.product_id.membership_date_from
|
||||
|
|
@ -549,7 +559,7 @@ class account_invoice_line(osv.osv):
|
|||
'date_from': date_from,
|
||||
'date_to': date_to,
|
||||
'account_invoice_line': line.id,
|
||||
})
|
||||
}, context=context)
|
||||
return result
|
||||
|
||||
account_invoice_line()
|
||||
|
|
|
|||
Loading…
Reference in New Issue