diff --git a/addons/account/account.py b/addons/account/account.py index 23635b298ac..449a58f136d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -470,7 +470,7 @@ class account_journal(osv.osv): 'user_id': lambda self,cr,uid,context: uid, } def create(self, cr, uid, vals, context={}): - journal_id = super(osv.osv, self).create(cr, uid, vals, context) + journal_id = super(account_journal, self).create(cr, uid, vals, context) # journal_name = self.browse(cr, uid, [journal_id])[0].code # periods = self.pool.get('account.period') # ids = periods.search(cr, uid, [('date_stop','>=',time.strftime('%Y-%m-%d'))]) @@ -481,6 +481,7 @@ class account_journal(osv.osv): # 'period_id': period.id # }) return journal_id + def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): if not args: args=[] diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 044296625bb..0d82951eb7d 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -390,6 +390,7 @@ class crm_case(osv.osv): 'email_from': _get_default_email, 'state': lambda *a: 'open', 'priority': lambda *a: AVAILABLE_PRIORITIES[2][0], + 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), } _order = 'priority, date_deadline desc, date desc,id desc' diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 507a6722961..a0d45169278 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -362,7 +362,7 @@ class Partner(osv.osv): 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) + 'res.partner':(_get_partners, ['free_member', 'membership_state'], 10) } ), 'membership_start': fields.function( @@ -756,5 +756,4 @@ class account_invoice_line(osv.osv): return result account_invoice_line() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py index 9767c27f9f4..30d8bc6e6bf 100644 --- a/addons/membership/wizard/invoice_membership.py +++ b/addons/membership/wizard/invoice_membership.py @@ -28,7 +28,6 @@ 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(''' SELECT partner_id, id, type FROM res_partner_address @@ -43,7 +42,6 @@ def _invoice_membership(self, cr, uid, data, context): pid = fetchal[x][0] id = fetchal[x][1] type = fetchal[x][2] - if partner_address_ids.has_key(pid) and partner_address_ids[pid]['type'] == 'invoice': continue partner_address_ids[pid] = {'id': id, 'type': type} @@ -95,7 +93,6 @@ def _invoice_membership(self, cr, uid, data, context): 'res_model': 'account.invoice', 'type': 'ir.actions.act_window', } - return value wizard_arch= """ @@ -110,7 +107,6 @@ wizard_arch= """ class wizard_invoice_membership(wizard.interface): states = { - 'init' : { 'actions' : [], 'result' : {