diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 83607a112a2..5cc89bbb985 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -982,12 +982,12 @@ - + - - - + + + @@ -996,9 +996,7 @@ - - - + diff --git a/addons/account/static/src/css/account.css b/addons/account/static/src/css/account.css index 963c4391595..07d3a83893e 100644 --- a/addons/account/static/src/css/account.css +++ b/addons/account/static/src/css/account.css @@ -20,7 +20,7 @@ } .openerp .oe_extended_form_view .oe_form_field:empty { - display: inline-block ; + display: inline-block !important; } .openerp .oe_extended_form_view button { diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index e563492e939..093a07d3859 100644 --- a/addons/account_followup/account_followup.py +++ b/addons/account_followup/account_followup.py @@ -80,6 +80,8 @@ class account_move_partner_info(osv.osv): _inherit = 'account.move.partner.info' _columns = { 'followup_date': fields.date('Latest Follow-up'), + 'max_followup_id':fields.many2one('account_followup.followup.line', + 'Max Follow Up Level' ) } def init(self, cr): @@ -89,7 +91,8 @@ class account_move_partner_info(osv.osv): SELECT p.id, p.id as partner_id, max(p.last_reconciliation_date) as last_reconciliation_date, max(l.date) as latest_date, - max(l.followup_date) as followup_date + max(l.followup_date) as followup_date, + max(l.followup_line_id) as max_followup_id FROM account_move_line as l INNER JOIN res_partner AS p ON (l.partner_id = p.id) group by p.id ) diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 2edfc64d29f..487836b98f0 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -135,6 +135,7 @@