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

[IMP]change the place of fields for better view and add note for details 

bzr revid: sgo@tinyerp.com-20120625050753-lhe0p8xnp5r2g6zp
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-06-25 10:37:53 +05:30
parent dec35ad98a
commit 352e054068
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -30,14 +30,21 @@
<field name="remaining_hours" class="oe_form_inline"/>
</div>
</xpath>
<xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
<group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
<field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
<field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
<xpath expr="//field[@name='use_timesheets']" position="replace">
<group colspan="2" col="4">
<field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)"/>
<field name="to_invoice" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
</group>
</xpath>
<xpath expr="//group[@name='invoice_on_timesheets']" position="replace"/>
<xpath expr='//group[@name="master"]' position='after'>
<separator name="toinvoice" string="Invoicing"/>
<group>
<group>
<field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)],'invisible': [('invoice_on_timesheets','=',False)]}"/>
</group>
<group></group>
</group>
<table width="100%%">
<tr>
<th></th>

11
addons/analytic_contract_project/analytic_contract_project.py
View File

@ -70,5 +70,14 @@ class project_project(osv.osv):
'context': view_context,
'nodestroy': True,
}
project_project()
class task(osv.osv):
_inherit = "project.task"
def create(self, cr, uid, vals, context=None):
task_id = super(task, self).create(cr, uid, vals, context=context)
task_browse = self.browse(cr,uid,task_id,context)
self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task has been <b>created</b>."), context=context)
return task_id
task()

2
addons/hr_timesheet_invoice/hr_timesheet_invoice.py
View File

@ -69,7 +69,7 @@ class account_analytic_account(osv.osv):
help="Keep empty if this contract is not limited to a total fixed price."),
'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
help="Total invoiced"),
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Timesheet Invocing Ratio',
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invocing Ratio',
help="Fill this field if you plan to automatically generate invoices based " \
"on the costs in this analytic account: timesheets, expenses, ..." \
"You can configure an automatic invoice rate on analytic accounts."),