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

cleaning 

bzr revid: mra@tinyerp.com-20090219104130-heh9681xo7f13g4t
This commit is contained in:
mra (Open ERP) 2009-02-19 16:11:30 +05:30
parent 91a11f1d0f
commit 8f764a75d8
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/membership/membership.py
View File

@ -44,8 +44,6 @@ STATE_PRIOR = {
'paid' : 7
}
#~ REQUETE = '''SELECT partner, state FROM (
#~ SELECT members.partner AS partner,
#~ CASE WHEN MAX(members.state) = 0 THEN 'none'
@ -136,7 +134,6 @@ STATE_PRIOR = {
#~ %s
#~ '''
class membership_line(osv.osv):
'''Member line'''
@ -289,15 +286,8 @@ class Partner(osv.osv):
if partner_data.free_member and s!=0:
res[id] = 'free'
if partner_data.associate_member:
# associate_partners_list = []
# query = "SELECT DISTINCT associate_member FROM res_partner where id=%s"%(str(partner_data.id))
# cr.execute(query)
# for p in cr.fetchall():
# if p[0] and p[0] != partner_data.id:
# associate_partners_list.append(p[0])
# if associate_partners_list != []:
res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context)
res[id] = res_state[partner_data.associate_member.id] #partner_data.associate_member.membership_state
res[id] = res_state[partner_data.associate_member.id]
return res
def _membership_start(self, cr, uid, ids, name, args, context=None):
@ -710,8 +700,6 @@ class ReportPartnerMemberYearNew(osv.osv):
""")
ReportPartnerMemberYearNew()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
class account_invoice_line(osv.osv):
_inherit='account.invoice.line'
@ -766,4 +754,7 @@ class account_invoice_line(osv.osv):
'account_invoice_line': line.id,
})
return result
account_invoice_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

13
addons/membership/wizard/invoice_membership.py
View File

@ -27,7 +27,6 @@ import time
def _invoice_membership(self, cr, uid, data, context):
partner_ids = data['ids']
product_id = data['form']['product']
pool = pooler.get_pool(cr.dbname)
cr.execute('''
@ -49,7 +48,6 @@ def _invoice_membership(self, cr, uid, data, context):
continue
partner_address_ids[pid] = {'id': id, 'type': type}
invoice_list= []
invoice_obj = pool.get('account.invoice')
partner_obj = pool.get('res.partner')
@ -65,20 +63,16 @@ def _invoice_membership(self, cr, uid, data, context):
line_value = {
'product_id' : product_id,
}
quantity = 1
line_dict = invoice_line_obj.product_id_change(cr, uid, {}, product_id, product['uom_id'][0], quantity, '', 'out_invoice', partner_id, fpos_id, context=context)
line_value.update(line_dict['value'])
if line_value['invoice_line_tax_id']:
tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
line_value['invoice_line_tax_id'] = tax_tab
# invoice_line_id = invoice_line_obj.create(cr, uid, line_value)
invoice_id = invoice_obj.create(cr, uid, {
'partner_id' : partner_id,
'address_invoice_id': partner_address_ids[partner_id]['id'],
'account_id': account_id,
# 'invoice_line':[(6,0,[invoice_line_id])],
'fiscal_position': fpos_id or False
}
)
@ -91,7 +85,6 @@ def _invoice_membership(self, cr, uid, data, context):
tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()[0]
invoice_tax_obj.create(cr, uid, tax_value)
value = {
'domain': [
('id', 'in', invoice_list),
@ -114,8 +107,6 @@ wizard_arch= """<?xml version="1.0"?>
/>
</form>"""
class wizard_invoice_membership(wizard.interface):
states = {
@ -135,7 +126,6 @@ class wizard_invoice_membership(wizard.interface):
},
'state' : [('end', 'Cancel'),('ok', 'Confirm') ]}
},
'ok' : {
'actions' : [],
'result' : {'type' : 'action',
@ -148,5 +138,4 @@ class wizard_invoice_membership(wizard.interface):
wizard_invoice_membership("wizard_invoice_membership")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: