From ed6d7457994f7e25d8196ac119783dae52264c60 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Thu, 16 Sep 2010 18:18:28 +0530 Subject: [PATCH 1/5] [FIX]: account: Fixed problem in write method of bank statement bzr revid: rpa@tinyerp.com-20100916124828-38l2o0resjrminsc --- addons/account/account_cash_statement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index daf2f9ba8f2..8cdb20aa225 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -267,7 +267,7 @@ class account_cash_statement(osv.osv): super(account_cash_statement, self).write(cr, uid, ids, vals) res = self._get_starting_balance(cr, uid, ids) for rs in res: - super(account_cash_statement, self).write(cr, uid, rs, res.get(rs)) + super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs)) return True def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}): From c4f4f475dd0eef7e9be88811fcf620d03650feeb Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Thu, 16 Sep 2010 14:55:05 +0200 Subject: [PATCH 2/5] [FIX] point_of_sale: fixed yaml test, company_id field on bank statement lines is already defined in the module account bzr revid: qdp-launchpad@tinyerp.com-20100916125505-uz5s80q5j1dc5rzy --- .../point_of_sale/account_bank_statement.py | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py index 8f5f33c9107..395319eeb64 100644 --- a/addons/point_of_sale/account_bank_statement.py +++ b/addons/point_of_sale/account_bank_statement.py @@ -69,31 +69,4 @@ class account_cash_statement(osv.osv): account_cash_statement() -class account_bank_statement_line(osv.osv): - - def _default_company(self, cr, uid, context={}): - """ To get default company for the object" - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of bank statement ids - @param context: A standard dictionary for contextual values - @return: company - """ - - user = self.pool.get('res.users').browse(cr, uid, uid, context=context) - if user.company_id: - return user.company_id.id - - return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0] - - _inherit = 'account.bank.statement.line' - _columns = { - 'company_id':fields.many2one('res.company', 'Company', required=True), - } - _defaults = { - 'company_id': _default_company, - } -account_bank_statement_line() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From fbfcb5c00c74f9d7a2f4d2fbf26b72fc976dceb4 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Thu, 16 Sep 2010 18:36:07 +0530 Subject: [PATCH 3/5] [FIX]: fetchmail: Fixed wrong field name lp bug: https://launchpad.net/bugs/631598 fixed bzr revid: rpa@tinyerp.com-20100916130607-s5xjk5f972z5gkza --- addons/fetchmail/fetchmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index e9dc2b95767..cd25a5f1883 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -179,7 +179,7 @@ class mailgate_message(osv.osv): _columns = { 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True), - 'type':fields.selection([ + 'server_type':fields.selection([ ('pop', 'POP Server'), ('imap', 'IMAP Server'), ], 'Server Type', select=True, readonly=True), From ecd9e1f71f7a783c7bdd486cb6e5c44e1ed21a47 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Thu, 16 Sep 2010 15:26:14 +0200 Subject: [PATCH 4/5] [IMP] account: set company_id field on statement line as readonly bzr revid: qdp-launchpad@tinyerp.com-20100916132614-rq53szvhorkl0p11 --- addons/account/account_bank_statement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 662fdda69d5..53c08525a6a 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -730,7 +730,7 @@ class account_bank_statement_line(osv.osv): 'reconcile_amount': fields.function(_reconcile_amount, string='Amount reconciled', method=True, type='float'), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."), - 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True), + 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } _defaults = { 'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'), From 9667a4fe5e804d7324b86d25e835c0fff27828b0 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Thu, 16 Sep 2010 15:27:05 +0200 Subject: [PATCH 5/5] [IMP] account: usabilty change in account.account search view bzr revid: qdp-launchpad@tinyerp.com-20100916132705-cjtgboof73twg0jp --- addons/account/account_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 5e4e7aa2ccb..9496be9916e 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -207,9 +207,9 @@ - + - +