[MERGE] tooltips improvement: merge from lp:~openerp-commiter/openobject-addons/ergonomy-search-views
bzr revid: hmo@tinyerp.com-20091223140846-tp4fsgktdiody2wx
This commit is contained in:
Harry (Open ERP)
@@ -471,7 +471,7 @@ class account_journal(osv.osv):
|
||||
" Select 'Cash' to be used at the time of making payment."\
|
||||
" Select 'General' to be used at the time of stock input/output."\
|
||||
" Select 'Situation' to be used at the time of making vouchers."),
|
||||
'refund_journal': fields.boolean('Refund Journal'),
|
||||
'refund_journal': fields.boolean('Refund Journal', help='Fill this if the journal is to be used for refunds of invoices.'),
|
||||
|
||||
'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
|
||||
'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
|
||||
|
||||
@@ -32,8 +32,8 @@ class account_analytic_line(osv.osv):
|
||||
_columns = {
|
||||
'name' : fields.char('Description', size=256, required=True),
|
||||
'date' : fields.date('Date', required=True),
|
||||
'amount' : fields.float('Amount', required=True),
|
||||
'unit_amount' : fields.float('Quantity'),
|
||||
'amount' : fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price.'),
|
||||
'unit_amount' : fields.float('Quantity', help='Specifies the amount of quantity to count.'),
|
||||
'product_uom_id' : fields.many2one('product.uom', 'UoM'),
|
||||
'product_id' : fields.many2one('product.product', 'Product'),
|
||||
'account_id' : fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True),
|
||||
|
||||
@@ -181,7 +181,7 @@ class account_analytic_account(osv.osv):
|
||||
'debit' : fields.function(_debit_calc, method=True, type='float', string='Debit'),
|
||||
'credit' : fields.function(_credit_calc, method=True, type='float', string='Credit'),
|
||||
'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity'),
|
||||
'quantity_max': fields.float('Maximum Quantity'),
|
||||
'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
|
||||
'partner_id' : fields.many2one('res.partner', 'Associated Partner'),
|
||||
'contact_id' : fields.many2one('res.partner.address', 'Contact'),
|
||||
'user_id' : fields.many2one('res.users', 'Account Manager'),
|
||||
|
||||
+1
-1
@@ -122,7 +122,7 @@ class hr_employee(osv.osv):
|
||||
'name' : fields.char("Employee's Name", size=128, required=True),
|
||||
'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the employee record without removing it."),
|
||||
'company_id': fields.many2one('res.company', 'Company'),
|
||||
'user_id' : fields.many2one('res.users', 'Related User'),
|
||||
'user_id' : fields.many2one('res.users', 'Related User', help='Related user name for an employee to manage his access rights.'),
|
||||
|
||||
'country_id' : fields.many2one('res.country', 'Nationality'),
|
||||
'birthday' : fields.date("Birthday"),
|
||||
|
||||
@@ -29,7 +29,7 @@ class hr_action_reason(osv.osv):
|
||||
_name = "hr.action.reason"
|
||||
_description = "Action reason"
|
||||
_columns = {
|
||||
'name' : fields.char('Reason', size=64, required=True),
|
||||
'name' : fields.char('Reason', size=64, required=True, help='Specifies the reason for Signing In/Signing Out.'),
|
||||
'action_type' : fields.selection([('sign_in', 'Sign in'), ('sign_out', 'Sign out')], "Action's type"),
|
||||
}
|
||||
_defaults = {
|
||||
@@ -49,7 +49,7 @@ class hr_attendance(osv.osv):
|
||||
_columns = {
|
||||
'name' : fields.datetime('Date', required=True),
|
||||
'action' : fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'),('action','Action')], 'Action', required=True),
|
||||
'action_desc' : fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]"),
|
||||
'action_desc' : fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
|
||||
'employee_id' : fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
|
||||
}
|
||||
_defaults = {
|
||||
|
||||
@@ -62,6 +62,8 @@
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Cases by User">
|
||||
<group col="12" colspan="4">
|
||||
<filter string="My Cases" icon="terp-hr" domain="[('user_id','=',uid)]" help="My cases by section"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
|
||||
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]"/>
|
||||
<separator orientation="vertical"/>
|
||||
@@ -88,16 +90,6 @@
|
||||
</record>
|
||||
<menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_64"/>
|
||||
|
||||
<record id="action_report_crm_case_user_tree_my" model="ir.actions.act_window">
|
||||
<field name="name">My cases by section</field>
|
||||
<field name="res_model">report.crm.case.user</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="domain">[('user_id','=',uid)]</field>
|
||||
<field name="search_view_id" ref="view_crm_case_user_filter"/>
|
||||
</record>
|
||||
<menuitem action="action_report_crm_case_user_tree_my" id="menu_crm_case_user_tree_my" parent="crm.next_id_64"/>
|
||||
|
||||
<!-- # Cases by section and categoryof case -->
|
||||
|
||||
<record id="view_crm_case_categ_tree" model="ir.ui.view">
|
||||
|
||||
@@ -228,7 +228,7 @@ class product_template(osv.osv):
|
||||
method=True,
|
||||
view_load=True,
|
||||
domain=[('usage','like','procurement')],
|
||||
help="For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements"),
|
||||
help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements"),
|
||||
'property_stock_production': fields.property(
|
||||
'stock.location',
|
||||
type='many2one',
|
||||
@@ -237,7 +237,7 @@ class product_template(osv.osv):
|
||||
method=True,
|
||||
view_load=True,
|
||||
domain=[('usage','like','production')],
|
||||
help="For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"),
|
||||
help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"),
|
||||
'property_stock_inventory': fields.property(
|
||||
'stock.location',
|
||||
type='many2one',
|
||||
@@ -246,7 +246,7 @@ class product_template(osv.osv):
|
||||
method=True,
|
||||
view_load=True,
|
||||
domain=[('usage','like','inventory')],
|
||||
help="For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory"),
|
||||
help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory"),
|
||||
'property_stock_account_input': fields.property('account.account',
|
||||
type='many2one', relation='account.account',
|
||||
string='Stock Input Account', method=True, view_load=True,
|
||||
|
||||
Reference in New Issue
Block a user