[IMP] improved the view of Payment Orders
bzr revid: bde@tinyerp.com-20120626100749-bhgyjcbn8qfp1ckx
This commit is contained in:
parent
5eaa8f465a
commit
e67936f82e
|
@ -87,9 +87,9 @@ class payment_order(osv.osv):
|
||||||
return res
|
return res
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
|
'date_scheduled': fields.date('Scheduled Date', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
|
||||||
'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}),
|
'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}),
|
||||||
'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
|
'mode': fields.many2one('payment.mode', 'Payment Mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'),
|
||||||
'state': fields.selection([
|
'state': fields.selection([
|
||||||
('draft', 'Draft'),
|
('draft', 'Draft'),
|
||||||
('cancel', 'Cancelled'),
|
('cancel', 'Cancelled'),
|
||||||
|
@ -103,9 +103,9 @@ class payment_order(osv.osv):
|
||||||
('now', 'Directly'),
|
('now', 'Directly'),
|
||||||
('due', 'Due date'),
|
('due', 'Due date'),
|
||||||
('fixed', 'Fixed date')
|
('fixed', 'Fixed date')
|
||||||
], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
|
], "Preferred Date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
|
||||||
'date_created': fields.date('Creation date', readonly=True),
|
'date_created': fields.date('Creation Date', readonly=True),
|
||||||
'date_done': fields.date('Execution date', readonly=True),
|
'date_done': fields.date('Execution Date', readonly=True),
|
||||||
'company_id': fields.related('mode', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
|
'company_id': fields.related('mode', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -113,16 +113,20 @@
|
||||||
<field name="state" widget="statusbar" statusbar_visible="draft,open"/>
|
<field name="state" widget="statusbar" statusbar_visible="draft,open"/>
|
||||||
</header>
|
</header>
|
||||||
<sheet string="Payment order" layout="auto">
|
<sheet string="Payment order" layout="auto">
|
||||||
<group col="4">
|
<group>
|
||||||
<field name="reference"/>
|
<group>
|
||||||
<field name="mode" widget='selection'/>
|
<field name="reference"/>
|
||||||
<field name="user_id"/>
|
<field name="user_id"/>
|
||||||
<field name="date_prefered"/>
|
<field name="mode"/>
|
||||||
<field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
|
</group>
|
||||||
<field name="company_id" widget='selection' groups="base.group_multi_company"/>
|
<group>
|
||||||
<button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
|
<field name="date_prefered"/>
|
||||||
type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
|
<field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}"/>
|
||||||
|
<field name="company_id" widget='selection' groups="base.group_multi_company"/>
|
||||||
|
</group>
|
||||||
</group>
|
</group>
|
||||||
|
<button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
|
||||||
|
type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
|
||||||
<field name="line_ids" context="{'order_id': active_id or False}" >
|
<field name="line_ids" context="{'order_id': active_id or False}" >
|
||||||
<form string="Payment Line" version="7.0">
|
<form string="Payment Line" version="7.0">
|
||||||
<notebook>
|
<notebook>
|
||||||
|
|
Loading…
Reference in New Issue