[MERGE] [IMP] hr_timesheet: sign_in / sign_out wizard form view usability improvement

[IMP] account: form view usability improvement: compute balance field visible in bank statement

Coming from an old PS task.

bzr revid: tde@openerp.com-20130723111935-22sm7ung473mcyf0
This commit is contained in:
Thibault Delavallée 2013-07-23 13:19:35 +02:00
commit 8c054f1bd2
4 changed files with 15 additions and 8 deletions

View File

@ -612,6 +612,13 @@
</field> </field>
</page> </page>
</notebook> </notebook>
<group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
<div class="oe_subtotal_footer_separator oe_inline">
<label for="balance_end" />
</div>
<field name="balance_end" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
</group>
<div class="oe_clear"/>
</sheet> </sheet>
</form> </form>
</field> </field>

View File

@ -35,7 +35,7 @@
new_id = self.create(cr, uid, {'account_id': ref('account.analytic_nebula'),'analytic_amount': 7.0, new_id = self.create(cr, uid, {'account_id': ref('account.analytic_nebula'),'analytic_amount': 7.0,
'date': (datetime.now()+timedelta(1)).strftime('%Y-%m-%d %H:%M:%S') , 'date': (datetime.now()+timedelta(1)).strftime('%Y-%m-%d %H:%M:%S') ,
'date_start': time.strftime('%Y-%m-%d %H:%M:%S'), 'info': 'Create Yaml for hr module', 'date_start': time.strftime('%Y-%m-%d %H:%M:%S'), 'info': 'Create Yaml for hr module',
'name': 'Quentin Paolino', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'action'}) 'name': 'Quentin Paolino', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'present'})
self.sign_out_result(cr, uid, [new_id], context) self.sign_out_result(cr, uid, [new_id], context)
- -
My work for this project "Sednacom" is over and I stop working by clicking on "Stop Work" button of this wizard. My work for this project "Sednacom" is over and I stop working by clicking on "Stop Work" button of this wizard.

View File

@ -32,8 +32,8 @@ class hr_so_project(osv.osv_memory):
'date_start': fields.datetime('Starting Date', readonly=True), 'date_start': fields.datetime('Starting Date', readonly=True),
'date': fields.datetime('Closing Date'), 'date': fields.datetime('Closing Date'),
'analytic_amount': fields.float('Minimum Analytic Amount'), 'analytic_amount': fields.float('Minimum Analytic Amount'),
'name': fields.char('Employees name', size=32, required=True, readonly=True), 'name': fields.char('Employee\'s Name', size=32, required=True, readonly=True),
'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), 'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent')], required=True, readonly=True),
'server_date': fields.datetime('Current Date', required=True, readonly=True), 'server_date': fields.datetime('Current Date', required=True, readonly=True),
'emp_id': fields.many2one('hr.employee', 'Employee ID') 'emp_id': fields.many2one('hr.employee', 'Employee ID')
} }
@ -109,8 +109,8 @@ class hr_si_project(osv.osv_memory):
_name = 'hr.sign.in.project' _name = 'hr.sign.in.project'
_description = 'Sign In By Project' _description = 'Sign In By Project'
_columns = { _columns = {
'name': fields.char('Employees name', size=32, readonly=True), 'name': fields.char('Employee\'s Name', size=32, readonly=True),
'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True), 'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent')], required=True, readonly=True),
'date': fields.datetime('Starting Date'), 'date': fields.datetime('Starting Date'),
'server_date': fields.datetime('Current Date', readonly=True), 'server_date': fields.datetime('Current Date', readonly=True),
'emp_id': fields.many2one('hr.employee', 'Employee ID') 'emp_id': fields.many2one('hr.employee', 'Employee ID')

View File

@ -43,7 +43,7 @@
</record> </record>
<record id="action_hr_timesheet_sign_in" model="ir.actions.act_window"> <record id="action_hr_timesheet_sign_in" model="ir.actions.act_window">
<field name="name">Sign in / Sign out by project</field> <field name="name">Sign in / Sign out by Project</field>
<field name="res_model">hr.sign.in.project</field> <field name="res_model">hr.sign.in.project</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
@ -67,7 +67,7 @@
<field name="account_id" colspan="2"/> <field name="account_id" colspan="2"/>
<field name="info" colspan="2"/> <field name="info" colspan="2"/>
<field name="date"/> <field name="date"/>
<label string="(Keep empty for current_time)" colspan="2"/> <label string="(Keep empty for current time)" colspan="2"/>
<field name="analytic_amount"/> <field name="analytic_amount"/>
</group> </group>
@ -82,7 +82,7 @@
</record> </record>
<record id="action_hr_timesheet_sign_out" model="ir.actions.act_window"> <record id="action_hr_timesheet_sign_out" model="ir.actions.act_window">
<field name="name">Sign in / Sign out by project</field> <field name="name">Sign in / Sign out by Project</field>
<field name="res_model">hr.sign.out.project</field> <field name="res_model">hr.sign.out.project</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>