from tools import config
import time
+import decimal_precision as dp
+
+
STATE = [
('none', 'Non Member'),
- ('canceled', 'Canceled Member'),
+ ('canceled', 'Cancelled Member'),
('old', 'Old Member'),
('waiting', 'Waiting Member'),
('invoiced', 'Invoiced Member'),
)
JOIN account_invoice ai ON (
ai.id = ail.invoice_id)
- WHERE ml.id =ANY(%s)''', (ids,))
+ WHERE ml.id IN %s''',(tuple(ids),))
res = cr.fetchall()
for r in res:
if r[0] and r[0] < 0:
res = {}
for line in self.browse(cr, uid, ids):
cr.execute('''
- SELECT i.state FROM
- account_invoice i WHERE
+ SELECT i.state, i.id FROM
+ account_invoice i
+ WHERE
i.id = (
SELECT l.invoice_id FROM
account_invoice_line l WHERE
state = 'invoiced'
elif istate == 'paid':
state = 'paid'
+ inv = self.pool.get('account.invoice').browse(cr, uid, fetched[1])
+ for payment in inv.payment_ids:
+ if payment.invoice and payment.invoice.type == 'out_refund':
+ state = 'canceled'
elif istate == 'cancel':
state = 'canceled'
res[line.id] = state
_inherit = 'res.partner'
def _get_partner_id(self, cr, uid, ids, context=None):
+
data_inv = self.pool.get('membership.membership_line').browse(cr, uid, ids, context)
list_partner = []
for data in data_inv:
list_partner.append(data.partner.id)
ids2 = list_partner
while ids2:
- ids2 = self.pool.get('res.partner').search(cr, uid, [('associate_member', 'in', ids2)], context=context)
+ ids2 = self.pool.get('res.partner').search(cr, uid, [('associate_member','in',ids2)], context=context)
list_partner += ids2
return list_partner
list_partner.append(data.partner_id.id)
ids2 = list_partner
while ids2:
- ids2 = self.pool.get('res.partner').search(cr, uid, [('associate_member', 'in', ids2)], context=context)
+ ids2 = self.pool.get('res.partner').search(cr, uid, [('associate_member','in',ids2)], context=context)
list_partner += ids2
return list_partner
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)
if partner_data.membership_cancel and today > partner_data.membership_cancel:
res[id] = 'canceled'
continue
s = 4
if partner_data.member_lines:
for mline in partner_data.member_lines:
- if mline.date_from <= today and mline.date_to >= today:
+ if mline.date_to >= today:
if mline.account_invoice_line and mline.account_invoice_line.invoice_id:
mstate = mline.account_invoice_line.invoice_id.state
if mstate == 'paid':
s = 0
+ inv = mline.account_invoice_line.invoice_id
+ for payment in inv.payment_ids:
+ if payment.invoice.type == 'out_refund':
+ s = 2
break
- elif mstate == 'open' and s != 0:
+ elif mstate == 'open' and s!=0:
s = 1
- elif mstate == 'cancel' and s != 0 and s != 1:
+ elif mstate == 'cancel' and s!=0 and s!=1:
s = 2
- elif (mstate == 'draft' or mstate == 'proforma') and s != 0 and s != 1:
+ elif (mstate == 'draft' or mstate == 'proforma') and s!=0 and s!=1:
s = 3
- if s == 4:
+ if s==4:
for mline in partner_data.member_lines:
- if mline.date_from < today and mline.date_to < today and mline.date_from <= mline.date_to and (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid':
+ if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid':
s = 5
else:
s = 6
- if s == 0:
+ if s==0:
res[id] = 'paid'
- elif s == 1:
+ elif s==1:
res[id] = 'invoiced'
- elif s == 2:
+ elif s==2:
res[id] = 'canceled'
- elif s == 3:
+ elif s==3:
res[id] = 'waiting'
- elif s == 5:
+ elif s==5:
res[id] = 'old'
- elif s == 6:
+ elif s==6:
res[id] = 'none'
- if partner_data.free_member and s != 0:
+ 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[id] = res_state[partner_data.associate_member.id]
return res
-
- def _membership_start(self, cr, uid, ids, name, args, context=None):
- '''Return the start date of membership'''
- res = {}
- member_line_obj = self.pool.get('membership.membership_line')
- for partner in self.browse(cr, uid, ids):
- if partner.associate_member:
- partner_id = partner.associate_member.id
- else:
- partner_id = partner.id
- line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
- limit=1, order='date_from')
- if line_id:
- res[partner.id] = member_line_obj.read(cr, uid, line_id[0],
- ['date_from'])['date_from']
- else:
- res[partner.id] = False
- return res
-
- def _membership_stop(self, cr, uid, ids, name, args, context=None):
- '''Return the stop date of membership'''
+
+ def _membership_date(self, cr, uid, ids, name, args, context=None):
+
+ '''Return date of membership'''
+
+ name = name[0]
res = {}
member_line_obj = self.pool.get('membership.membership_line')
+
for partner in self.browse(cr, uid, ids):
- cr.execute('select membership_state from res_partner where id=%s', (partner.id,))
- data_state = cr.fetchall()
+
if partner.associate_member:
- partner_id = partner.associate_member.id
- else:
- partner_id = partner.id
- line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
- limit=1, order='date_to desc')
- if line_id:
- res[partner.id] = member_line_obj.read(cr, uid, line_id[0],
- ['date_to'])['date_to']
+ partner_id = partner.associate_member.id
else:
- res[partner.id] = False
- return res
+ partner_id = partner.id
+
+ res[partner.id]={
+ 'membership_start': False,
+ 'membership_stop': False,
+ 'membership_cancel': False
+ }
+
+ if name == 'membership_start':
+ line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
+ limit=1, order='date_from')
+ if line_id:
+ res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
+ ['date_from'])['date_from']
+
+ if name == 'membership_stop':
+ line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
+ limit=1, order='date_to desc')
+ if line_id1:
+ res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
+ ['date_to'])['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')
+ if line_id2:
+ res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0],['date_cancel'])['date_cancel']
- def _membership_cancel(self, cr, uid, ids, name, args, context=None):
- '''Return the cancel date of membership'''
- res = {}
- member_line_obj = self.pool.get('membership.membership_line')
- for partner_id in ids:
- line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
- limit=1, order='date_cancel')
- if line_id:
- res[partner_id] = member_line_obj.read(cr, uid, line_id[0],
- ['date_cancel'])['date_cancel']
- else:
- res[partner_id] = False
return res
def _get_partners(self, cr, uid, ids, context={}):
ids2 = ids
while ids2:
- ids2 = self.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
- ids += ids2
+ ids2 = self.search(cr, uid, [('associate_member','in',ids2)], context=context)
+ ids+=ids2
return ids
+ def __get_membership_state(self, *args, **kwargs):
+ return self._membership_state(*args, **kwargs)
+
_columns = {
'associate_member': fields.many2one('res.partner', 'Associate member'),
'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
+ 'member': fields.boolean('Member'),
'free_member': fields.boolean('Free member'),
'membership_amount': fields.float(
- 'Membership amount', digites=(16, 2),
+ 'Membership amount', digits=(16, 2),
help='The price negociated by the partner'),
'membership_state': fields.function(
- _membership_state, method=True,
- string='Current membership state', type='selection',
- selection=STATE , store={
- 'account.invoice':(_get_invoice_partner, ['state'], 10),
- 'membership.membership_line':(_get_partner_id, ['state'], 10),
- 'res.partner':(_get_partners, ['free_member', 'membership_state'], 10)
+ __get_membership_state, method = True,
+ string = 'Current membership state', type = 'selection',
+ selection = STATE ,store = {
+ 'account.invoice':(_get_invoice_partner,['state'], 10),
+ 'membership.membership_line':(_get_partner_id,['state'], 10),
+ 'res.partner':(_get_partners, ['free_member', 'membership_state','associate_member'], 10)
}
),
'membership_start': fields.function(
- _membership_start, method=True,
- string='Start membership date', type='date',
- store={
- 'account.invoice':(_get_invoice_partner, ['state'], 10),
- 'membership.membership_line':(_get_partner_id, ['state'], 10),
- 'res.partner':(lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
+ _membership_date, method=True, multi='membeship_start',
+ string = 'Start membership date', type = 'date',
+ store = {
+ 'account.invoice':(_get_invoice_partner,['state'], 10),
+ 'membership.membership_line':(_get_partner_id,['state'], 10, ),
+ 'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
}
),
'membership_stop': fields.function(
- _membership_stop, method=True,
- string='Stop membership date', type='date',
- store={
- 'account.invoice':(_get_invoice_partner, ['state'], 10),
- 'membership.membership_line':(_get_partner_id, ['state'], 10),
- 'res.partner':(lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
+ _membership_date, method = True,
+ string = 'Stop membership date', type = 'date', multi='membership_stop',
+ store = {
+ 'account.invoice':(_get_invoice_partner,['state'], 10),
+ 'membership.membership_line':(_get_partner_id,['state'], 10),
+ 'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
}
),
'membership_cancel': fields.function(
- _membership_cancel, method=True,
- string='Cancel membership date', type='date',
- store={
- 'account.invoice':(_get_invoice_partner, ['state'], 10),
- 'membership.membership_line':(_get_partner_id, ['state'], 10),
- 'res.partner':(lambda self, cr, uid, ids, c={}:ids, ['free_member'], 10)
+ _membership_date, method = True,
+ string = 'Cancel membership date', type='date', multi='membership_cancel',
+ store = {
+ 'account.invoice':(_get_invoice_partner,['state'], 11),
+ 'membership.membership_line':(_get_partner_id,['state'], 10),
+ 'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
}
),
}
_defaults = {
- 'free_member': lambda * a: False,
- 'membership_cancel' : lambda * d : False,
+ 'free_member': lambda *a: False,
+ 'membership_cancel' : lambda *d : False,
}
def _check_recursion(self, cr, uid, ids):
level = 100
while len(ids):
- cr.execute('select distinct associate_member from res_partner where id =ANY(%s)', (ids,))
+ cr.execute('select distinct associate_member from res_partner where id IN %s',(tuple(ids),))
ids = filter(None, map(lambda x:x[0], cr.fetchall()))
if not level:
return False
(_check_recursion, 'Error ! You can not create recursive associated members.', ['associate_member'])
]
+ def copy(self, cr, uid, id, default=None, context=None):
+ if default is None:
+ default = {}
+ if context is None:
+ context = {}
+ default = default.copy()
+ default['member_lines'] = []
+ return super(Partner, self).copy(cr, uid, id, default, context)
+
Partner()
class product_template(osv.osv):
_inherit = 'product.template'
_columns = {
- 'member_price':fields.float('Member Price', digits=(16, int(config['price_accuracy']))),
+ 'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')),
}
product_template()
class Product(osv.osv):
def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
- if ('product' in context) and (context['product'] == 'membership_product'):
- model_data_ids_form = self.pool.get('ir.model.data').search(cr, user, [('model', '=', 'ir.ui.view'), ('name', 'in', ['membership_products_form', 'membership_products_tree'])])
- resource_id_form = self.pool.get('ir.model.data').read(cr, user, model_data_ids_form, fields=['res_id', 'name'])
- dict_model = {}
+ if ('product' in context) and (context['product']=='membership_product'):
+ model_data_ids_form = self.pool.get('ir.model.data').search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])])
+ resource_id_form = self.pool.get('ir.model.data').read(cr, user, model_data_ids_form, fields=['res_id','name'])
+ dict_model={}
for i in resource_id_form:
- dict_model[i['name']] = i['res_id']
- if view_type == 'form':
+ dict_model[i['name']]=i['res_id']
+ if view_type=='form':
view_id = dict_model['membership_products_form']
else:
view_id = dict_model['membership_products_tree']
- return super(Product, self).fields_view_get(cr, user, view_id, view_type, context, toolbar, submenu)
+ return super(Product,self).fields_view_get(cr, user, view_id, view_type, context, toolbar, submenu)
'''Product'''
_inherit = 'product.product'
- _description = 'product.product'
-
_columns = {
'membership': fields.boolean('Membership', help='Specify if this product is a membership product'),
'membership_date_from': fields.date('Date from'),
}
_defaults = {
- 'membership': lambda * args: False
+ 'membership': lambda *args: False
}
Product()
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',
+ [('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)
Invoice()
-
-class ReportPartnerMemberYear(osv.osv):
- '''Membership by Years'''
-
- _name = 'report.partner_member.year'
- _description = __doc__
- _auto = False
- _rec_name = 'year'
- _columns = {
- 'year': fields.char('Year', size='4', readonly=True, select=1),
- 'canceled_number': fields.integer('Canceled', readonly=True),
- 'waiting_number': fields.integer('Waiting', readonly=True),
- 'invoiced_number': fields.integer('Invoiced', readonly=True),
- 'paid_number': fields.integer('Paid', readonly=True),
- 'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
- 'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
- 'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
- 'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
- 'currency': fields.many2one('res.currency', 'Currency', readonly=True,
- select=2),
- }
-
- def init(self, cr):
- '''Create the view'''
- cr.execute("""
- CREATE OR REPLACE VIEW report_partner_member_year AS (
- SELECT
- MIN(id) AS id,
- COUNT(ncanceled) as canceled_number,
- COUNT(npaid) as paid_number,
- COUNT(ninvoiced) as invoiced_number,
- COUNT(nwaiting) as waiting_number,
- SUM(acanceled) as canceled_amount,
- SUM(apaid) as paid_amount,
- SUM(ainvoiced) as invoiced_amount,
- SUM(awaiting) as waiting_amount,
- year,
- currency
- FROM (SELECT
- CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
- CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
- CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
- CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
- THEN ml.id END AS nwaiting,
- CASE WHEN ai.state = 'cancel'
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS acanceled,
- CASE WHEN ai.state = 'paid'
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS apaid,
- CASE WHEN ai.state = 'open'
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS ainvoiced,
- CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS awaiting,
- TO_CHAR(ml.date_from, 'YYYY') AS year,
- ai.currency_id AS currency,
- MIN(ml.id) AS id
- FROM membership_membership_line ml
- JOIN (account_invoice_line ail
- LEFT JOIN account_invoice ai
- ON (ail.invoice_id = ai.id))
- ON (ml.account_invoice_line = ail.id)
- JOIN res_partner p
- ON (ml.partner = p.id)
- GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
- ai.currency_id, ml.id) AS foo
- GROUP BY year, currency)
- """)
-
-ReportPartnerMemberYear()
-
-
-class ReportPartnerMemberYearNew(osv.osv):
- '''New Membership by Years'''
-
- _name = 'report.partner_member.year_new'
- _description = __doc__
- _auto = False
- _rec_name = 'year'
-
- _columns = {
- 'year': fields.char('Year', size='4', readonly=True, select=1),
- 'canceled_number': fields.integer('Canceled', readonly=True),
- 'waiting_number': fields.integer('Waiting', readonly=True),
- 'invoiced_number': fields.integer('Invoiced', readonly=True),
- 'paid_number': fields.integer('Paid', readonly=True),
- 'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
- 'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
- 'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
- 'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
- 'currency': fields.many2one('res.currency', 'Currency', readonly=True,
- select=2),
- }
-
- def init(self, cr):
- '''Create the view'''
- cr.execute("""
- CREATE OR REPLACE VIEW report_partner_member_year AS (
- SELECT
- MIN(id) AS id,
- COUNT(ncanceled) as canceled_number,
- COUNT(npaid) as paid_number,
- COUNT(ninvoiced) as invoiced_number,
- COUNT(nwaiting) as waiting_number,
- SUM(acanceled) as canceled_amount,
- SUM(apaid) as paid_amount,
- SUM(ainvoiced) as invoiced_amount,
- SUM(awaiting) as waiting_amount,
- year,
- currency
- FROM (SELECT
- CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
- CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
- CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
- CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
- THEN ml.id END AS nwaiting,
- CASE WHEN ai.state = 'cancel'
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS acanceled,
- CASE WHEN ai.state = 'paid'
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS apaid,
- CASE WHEN ai.state = 'open'
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS ainvoiced,
- CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS awaiting,
- TO_CHAR(ml.date_from, 'YYYY') AS year,
- ai.currency_id AS currency,
- MIN(ml.id) AS id
- FROM membership_membership_line ml
- JOIN (account_invoice_line ail
- LEFT JOIN account_invoice ai
- ON (ail.invoice_id = ai.id))
- ON (ml.account_invoice_line = ail.id)
- JOIN res_partner p
- ON (ml.partner = p.id)
- GROUP BY TO_CHAR(ml.date_from, 'YYYY'), ai.state,
- ai.currency_id, ml.id) AS foo
- GROUP BY year, currency)
- """)
-
-ReportPartnerMemberYear()
-
-
-class ReportPartnerMemberYearNew(osv.osv):
- '''New Membership by Years'''
-
- _name = 'report.partner_member.year_new'
- _description = __doc__
- _auto = False
- _rec_name = 'year'
- _columns = {
- 'year': fields.char('Year', size='4', readonly=True, select=1),
- 'canceled_number': fields.integer('Canceled', readonly=True),
- 'waiting_number': fields.integer('Waiting', readonly=True),
- 'invoiced_number': fields.integer('Invoiced', readonly=True),
- 'paid_number': fields.integer('Paid', readonly=True),
- 'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
- 'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
- 'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
- 'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
- 'currency': fields.many2one('res.currency', 'Currency', readonly=True,
- select=2),
- }
-
- def init(self, cursor):
- '''Create the view'''
- cursor.execute("""
- CREATE OR REPLACE VIEW report_partner_member_year_new AS (
- SELECT
- MIN(id) AS id,
- COUNT(ncanceled) AS canceled_number,
- COUNT(npaid) AS paid_number,
- COUNT(ninvoiced) AS invoiced_number,
- COUNT(nwaiting) AS waiting_number,
- SUM(acanceled) AS canceled_amount,
- SUM(apaid) AS paid_amount,
- SUM(ainvoiced) AS invoiced_amount,
- SUM(awaiting) AS waiting_amount,
- year,
- currency
- FROM (SELECT
- CASE WHEN ai.state = 'cancel' THEN ml2.id END AS ncanceled,
- CASE WHEN ai.state = 'paid' THEN ml2.id END AS npaid,
- CASE WHEN ai.state = 'open' THEN ml2.id END AS ninvoiced,
- CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
- THEN ml2.id END AS nwaiting,
- CASE WHEN ai.state = 'cancel'
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS acanceled,
- CASE WHEN ai.state = 'paid'
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS apaid,
- CASE WHEN ai.state = 'open'
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS ainvoiced,
- CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
- THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
- ELSE 0 END AS awaiting,
- TO_CHAR(ml2.date_from, 'YYYY') AS year,
- ai.currency_id AS currency,
- MIN(ml2.id) AS id
- FROM (SELECT
- partner AS id,
- MIN(date_from) AS date_from
- FROM membership_membership_line
- GROUP BY partner
- ) AS ml1
- JOIN membership_membership_line ml2
- JOIN (account_invoice_line ail
- LEFT JOIN account_invoice ai
- ON (ail.invoice_id = ai.id))
- ON (ml2.account_invoice_line = ail.id)
- ON (ml1.id = ml2.partner AND ml1.date_from = ml2.date_from)
- JOIN res_partner p
- ON (ml2.partner = p.id)
- GROUP BY TO_CHAR(ml2.date_from, 'YYYY'), ai.state,
- ai.currency_id, ml2.id) AS foo
- GROUP BY year, currency
- )
- """)
-
-ReportPartnerMemberYearNew()
-
class account_invoice_line(osv.osv):
- _inherit = 'account.invoice.line'
+ _inherit='account.invoice.line'
+
def write(self, cr, uid, ids, vals, context=None):
if not context:
- context = {}
+ 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):
- ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id)])
- 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
- date_to = line.product_id.membership_date_to
- if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
- date_from = line.invoice_id.date_invoice
- line_id = member_line_obj.create(cr, uid, {
- 'partner': line.invoice_id.partner_id.id,
- 'date_from': date_from,
- 'date_to': date_to,
- 'account_invoice_line': line.id,
- })
- 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)
+ if line.invoice_id.type == 'out_invoice':
+ ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+ 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
+ date_to = line.product_id.membership_date_to
+ if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
+ date_from = line.invoice_id.date_invoice
+ line_id = member_line_obj.create(cr, uid, {
+ 'partner': line.invoice_id.partner_id.id,
+ 'date_from': date_from,
+ 'date_to': date_to,
+ 'account_invoice_line': line.id,
+ })
+ 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)
return res
def unlink(self, cr, uid, ids, context=None):
if not context:
- context = {}
+ 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)])
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={}):
result = super(account_invoice_line, self).create(cr, uid, vals, context)
line = self.browse(cr, uid, result)
- member_line_obj = self.pool.get('membership.membership_line')
- ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id)])
- 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
- date_to = line.product_id.membership_date_to
- if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
- date_from = line.invoice_id.date_invoice
- line_id = member_line_obj.create(cr, uid, {
- 'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
- 'date_from': date_from,
- 'date_to': date_to,
- 'account_invoice_line': line.id,
- })
+ if line.invoice_id.type == 'out_invoice':
+ member_line_obj = self.pool.get('membership.membership_line')
+ ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+ 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
+ date_to = line.product_id.membership_date_to
+ if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
+ date_from = line.invoice_id.date_invoice
+ line_id = member_line_obj.create(cr, uid, {
+ 'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
+ 'date_from': date_from,
+ 'date_to': date_to,
+ 'account_invoice_line': line.id,
+ })
return result
account_invoice_line()
projects / odoo / odoo.git / blobdiff