Improvement of the followup module

bzr revid: fp@tinyerp.com-63c189eb28f2b50d95485322784c78f903cbc81a
This commit is contained in:
Fabien Pinckaers 2007-06-26 06:51:07 +00:00
parent 866bea218c
commit 0b8db2c013
4 changed files with 71 additions and 10 deletions

View File

@ -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={}):

View File

@ -1067,6 +1067,7 @@
res_model="account.move.line"
src_model="account.account"
id="act_account_acount_move_line_open"/>
<act_window name="Unreconciled entries"
domain="[('account_id', '=', active_id),('reconcile_id','=',False)]"
res_model="account.move.line"
@ -1549,6 +1550,13 @@
src_model="account.journal"
id="act_account_journal_2_account_move_line"/>
<act_window name="Statement entries"
domain="[('statement_id', '=', active_id)]"
res_model="account.move.line"
src_model="account.bank.statement"
id="act_account_bank_statement_account_move_unreconciled"/>
<act_window name="Unreconciled account entries"
domain="[('partner_id', '=', active_id),('account_id','=','partner:'+str(active_id)),('reconcile_id','=',False)]"
res_model="account.move.line"
@ -1561,13 +1569,6 @@
src_model="res.partner"
id="act_account_partner_account_move"/>
<act_window name="Statement entries"
domain="[('statement_id', '=', active_id)]"
res_model="account.move.line"
src_model="account.bank.statement"
id="act_account_bank_statement_account_move_unreconciled"/>
</data>
</terp>

View File

@ -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()

View File

@ -61,5 +61,61 @@
type="wizard"
id="account_followup_wizard_menu"/>
<record model="ir.ui.view" id="account_move_line_partner_tree">
<field name="name">account.move.line.partner.tree</field>
<field name="model">account.move.line</field>
<field name="type">tree</field>
<field name="priority" eval="32"/>
<field name="arch" type="xml">
<tree string="Partner entries">
<field name="date"/>
<field name="move_id"/>
<field name="ref"/>
<field name="name"/>
<field name="partner_id"/>
<field name="account_id"/>
<field name="followup_line_id"/>
<field name="followup_date"/>
<field name="debit" sum="Total debit"/>
<field name="credit" sum="Total credit"/>
<field name="state"/>
</tree>
</field>
</record>
<act_window name="Unreconciled account entries"
domain="[('partner_id', '=', active_id),('account_id','=','partner:'+str(active_id)),('reconcile_id','=',False)]"
res_model="account.move.line"
src_model="res.partner"
view_id="account_move_line_partner_tree"
id="account.act_account_partner_account_move_unreconciled"/>
<act_window name="All account entries"
domain="[('reconcile_id', '=', False),('account_id','=','type:receivable')]"
res_model="account.move.line"
src_model="res.partner"
view_id="account_move_line_partner_tree"
id="act_account_partner_account_move_all"/>
<menuitem
action="act_account_partner_account_move_all"
name="Financial Management/Periodical Processing/Print Follow-Ups/Receivable Follow-Ups"
id="menu_account_move_open_unreconcile"/>
<act_window name="All account entries"
domain="[('reconcile_id', '=', False),('account_id','=','type:payable')]"
res_model="account.move.line"
src_model="res.partner"
view_id="account_move_line_partner_tree"
id="act_account_partner_account_move_payable_all"/>
<menuitem
action="act_account_partner_account_move_payable_all"
name="Financial Management/Periodical Processing/Print Follow-Ups/Payable Follow-Ups"
id="menu_account_move_open_unreconcile_payable"/>
</data>
</terp>