RavishchandraMurari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-add_tooltip_menutip-rmu into
lp:~openerp-dev/openobject-addons/trunk-usability.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-add_tooltip_menutip-rmu/+merge/67310
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-add_tooltip_menutip-rmu/+merge/67310
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-usability-add_tooltip_menutip-rmu into
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2011-04-29 08:53:55 +0000
+++ account/account_invoice_view.xml 2011-07-08 11:01:46 +0000
@@ -203,7 +203,7 @@
</field>
</group>
<group col="4" colspan="2">
- <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific"/>
+ <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="it will erase taxes"/>
<field name="amount_untaxed"/>
<label string="" colspan="2"/>
<field name="amount_tax"/>
@@ -297,7 +297,7 @@
</field>
</group>
<group col="4" colspan="2">
- <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific"/>
+ <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="it will erase taxes"/>
<field name="amount_untaxed"/>
<label string="" colspan="2"/>
<field name="amount_tax"/>
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2011-07-05 12:28:57 +0000
+++ crm/crm_lead.py 2011-07-08 11:01:46 +0000
@@ -142,9 +142,8 @@
'categ_id': fields.many2one('crm.case.categ', 'Category', \
domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]"),
'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
- domain="['|',('section_id','=',section_id),('section_id','=',False)]"),
- 'channel_id': fields.many2one('res.partner.canal', 'Lead Source'),
-
+ domain="['|',('section_id','=',section_id),('section_id','=',False)]",help="From which Campaign (Seminar, Marketing Campaign, Mass mailing, ...) did this contact come from ?"),
+ 'channel_id': fields.many2one('res.partner.canal', 'Channel',help="From which channel (mail, direct, phone, ...) did this contact reach you ?"),
'contact_name': fields.char('Contact Name', size=64),
'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity'),
'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2011-07-06 07:31:13 +0000
+++ mrp/mrp_view.xml 2011-07-08 11:01:46 +0000
@@ -1000,7 +1000,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="mrp_workcenter_tree_view"/>
<field name="search_view_id" ref="view_mrp_workcenter_search"/>
- <field name="help">Work Centers allow you to create and manage manufacturing units consisting of one or more persons and/or machines that can be considered as a unit for capacity and planning forecasting.</field>
+ <field name="help">Work Centers allow you to create and manage manufacturing units. They consist of workers and/or machines, which are considered as units for capacity and planning forecast. Keep in mind that the working time and the resource leave are not taken into account in the time computation of the work center.</field>
</record>
<menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
