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

modifs 

bzr revid: fp@tinyerp.com-20090115170224-3uo5or9t44dfp3rv
This commit is contained in:
Fabien Pinckaers 2009-01-15 18:02:24 +01:00
parent 490fa2e574 e2361a174d
commit e840ca7df0
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account/account.py
View File

@ -2069,8 +2069,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
vals_journal['code'] = _('SAJ')
if obj_multi.chart_template_id.property_account_receivable:
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_receivable.id]
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_receivable.id]
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
obj_journal.create(cr,uid,vals_journal)
@ -2080,8 +2080,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
vals_journal['code']=_('EXJ')
if obj_multi.chart_template_id.property_account_payable:
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_payable.id]
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_payable.id]
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
obj_journal.create(cr,uid,vals_journal)

8
addons/membership/membership.py
View File

@ -30,7 +30,6 @@ STATE = [
('old', 'Old Member'),
('waiting', 'Waiting Member'),
('invoiced', 'Invoiced Member'),
('associated', 'Associated Member'),
('free', 'Free Member'),
('paid', 'Paid Member'),
]
@ -41,7 +40,6 @@ STATE_PRIOR = {
'old' : 2,
'waiting' : 3,
'invoiced' : 4,
'associated' : 5,
'free' : 6,
'paid' : 7
}
@ -60,7 +58,6 @@ ELSE CASE WHEN MAX(members.state) = 1 THEN 'canceled'
ELSE CASE WHEN MAX(members.state) = 2 THEN 'old'
ELSE CASE WHEN MAX(members.state) = 3 THEN 'waiting'
ELSE CASE WHEN MAX(members.state) = 4 THEN 'invoiced'
ELSE CASE WHEN MAX(members.state) = 5 THEN 'associated'
ELSE CASE WHEN MAX(members.state) = 6 THEN 'free'
ELSE CASE WHEN MAX(members.state) = 7 THEN 'paid'
END END END END END END END END
@ -311,7 +308,7 @@ class Partner(osv.osv):
res = {}
member_line_obj = self.pool.get('membership.membership_line')
for partner in self.browse(cr, uid, ids):
if partner.membership_state == 'associated':
if partner.associate_member:
partner_id = partner.associate_member.id
else:
partner_id = partner.id
@ -350,8 +347,7 @@ class Partner(osv.osv):
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.membership_state == 'associated':
if data_state[0][0] == 'associated':
if partner.associate_member:
partner_id = partner.associate_member.id
else:
partner_id = partner.id

2
addons/report_mrp/report_mrp.py
View File

@ -27,6 +27,7 @@ class report_workcenter_load(osv.osv):
_name="report.workcenter.load"
_description="Workcenter Load"
_auto = False
_log_access = False
_columns = {
'name': fields.char('Week', size=64, required=True),
'workcenter_id': fields.many2one('mrp.workcenter', 'Workcenter', required=True),
@ -59,6 +60,7 @@ class report_mrp_inout(osv.osv):
_name="report.mrp.inout"
_description="Stock value variation"
_auto = False
_log_access = False
_rec_name = 'date'
_columns = {
'date': fields.char('Week', size=64, required=True),