diff --git a/addons/account/account.py b/addons/account/account.py index a6edbb9c194..e4122e36eb2 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -266,6 +266,10 @@ class account_account(osv.osv): part = self.pool.get('res.partner').browse(cr, user, part_id, context) args += [('id','in', (part.property_account_payable[0],part.property_account_receivable[0]))] name = False + if name and str(name).startswith('type:'): + type = name.split(':')[1] + args += [('type','=', type)] + name = False except: pass if name: @@ -275,7 +279,7 @@ class account_account(osv.osv): if not ids: ids = self.search(cr, user, [('name',operator,name)]+ args) else: - ids = self.search(cr, user, args) + ids = self.search(cr, user, args, context=context) return self.name_get(cr, user, ids, context=context) def name_get(self, cr, uid, ids, context={}): diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index f842f2c7f9b..e6c92280461 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1067,6 +1067,7 @@ res_model="account.move.line" src_model="account.account" id="act_account_acount_move_line_open"/> + + + + - - - diff --git a/addons/account_followup/followup.py b/addons/account_followup/followup.py index 3234bd15ed7..836c292694b 100644 --- a/addons/account_followup/followup.py +++ b/addons/account_followup/followup.py @@ -60,8 +60,8 @@ class account_move_line(osv.osv): _name = 'account.move.line' _inherit = 'account.move.line' _columns = { - 'followup_line_id': fields.many2one('account_followup.followup.line', 'Latest follow-up done'), - 'followup_date': fields.date('Latest follow-up date'), + 'followup_line_id': fields.many2one('account_followup.followup.line', 'Follow-up Level'), + 'followup_date': fields.date('Latest Follow-up'), } account_move_line() diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml index 662a7a087d7..ea1987706db 100644 --- a/addons/account_followup/followup_view.xml +++ b/addons/account_followup/followup_view.xml @@ -61,5 +61,61 @@ type="wizard" id="account_followup_wizard_menu"/> + + + account.move.line.partner.tree + account.move.line + tree + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +