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

Reference in bank statements, Date Required 

bzr revid: fp@tinyerp.com-360572c87421d53811a55e14912542c8ae00c9e3
This commit is contained in:
Fabien Pinckaers 2007-08-09 12:02:37 +00:00
parent 2fca887441
commit 2b477bfeea
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/account_bank_statement.py
View File

@ -132,6 +132,7 @@ class account_bank_statement(osv.osv):
torec.append(self.pool.get('account.move.line').create(cr, uid, {
'name': move.name,
'date': move.date,
'ref': move.ref,
'move_id': move_id,
'partner_id': ((move.partner_id) and move.partner_id.id) or False,
'account_id': (move.account_id) and move.account_id.id,
@ -146,6 +147,7 @@ class account_bank_statement(osv.osv):
self.pool.get('account.move.line').create(cr, uid, {
'name': newline.name or move.name,
'date': move.date,
'ref': move.ref,
'move_id': move_id,
'partner_id': ((move.partner_id) and move.partner_id.id) or False,
'account_id': (newline.account_id) and newline.account_id.id,
@ -166,6 +168,7 @@ class account_bank_statement(osv.osv):
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
'move_id': move_id,
'ref': move.ref,
})
self.pool.get('account.move.line').create(cr, uid, default, context=context)
if move.reconcile_id and move.reconcile_id.line_ids:
@ -281,13 +284,12 @@ class account_bank_statement_line(osv.osv):
_description = "Bank Statement Line"
_columns = {
'name': fields.char('Name', size=64, required=True),
'date': fields.date('Date'),
'date': fields.date('Date', required=True),
'amount': fields.float('Amount'),
'type': fields.selection([('supplier','Supplier'),('customer','Customer'),('general','General')], 'Type', required=True),
'partner_id': fields.many2one('res.partner', 'Partner'),
'account_id': fields.many2one('account.account','Account', required=True),
'statement_id': fields.many2one('account.bank.statement', 'Statement', select=True, required=True),
'reconcile_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile', states={'confirm':[('readonly',True)]}),
'move_ids': fields.many2many('account.move', 'account_bank_statement_line_move_rel', 'move_id','statement_id', 'Moves'),
'ref': fields.char('Ref.', size=32),

7
addons/account/account_view.xml
View File

@ -323,6 +323,7 @@
<field name="line_ids" colspan="4" nolabel="1">
<tree string="Statement lines" editable="bottom">
<field name="date"/>
<field name="ref"/>
<field name="name"/>
<field name="type"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id,type)"/>
@ -338,8 +339,8 @@
<field name="account_id" domain="[('journal_id','=',parent.journal_id), ('type', '&lt;&gt;', 'view')]"/>
<field name="amount"/>
<field name="reconcile_id" context="{'partner_id':partner_id,'amount':amount,'account_id':account_id}"/>
<field name="ref"/>
<separator string="Notes" colspan="4"/>
<field name="ref"/>
<separator string="Notes" colspan="4"/>
<field name="note" nolabel="1" colspan="4"/>
</form>
</field>
@ -1467,11 +1468,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="Receivables &amp; Payables"