diff options
| -rw-r--r-- | addons/crm/crm_lead.py | 2 | ||||
| -rw-r--r-- | addons/crm/crm_lead_view.xml | 6 | ||||
| -rw-r--r-- | addons/crm/crm_opportunity_view.xml | 2 | ||||
| -rw-r--r-- | addons/crm_claim/crm_claim_view.xml | 4 | ||||
| -rw-r--r-- | addons/crm_fundraising/crm_fundraising_view.xml | 2 | ||||
| -rw-r--r-- | addons/crm_helpdesk/crm_helpdesk_view.xml | 2 | ||||
| -rw-r--r-- | addons/hr_recruitment/hr_recruitment_view.xml | 2 | ||||
| -rw-r--r-- | addons/project/project_view.xml | 8 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 2 |
9 files changed, 16 insertions, 14 deletions
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index fc2b38dcfb1..f8cf6b39930 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -125,7 +125,7 @@ class crm_lead(crm_case, osv.osv): 'channel_id': fields.many2one('res.partner.canal', 'Channel'), 'contact_name': fields.char('Contact Name', size=64), - 'partner_name': fields.char("Customer 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."), 'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."), 'type':fields.selection([ diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 63056b89539..119237c3824 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -57,8 +57,8 @@ help="Convert to Opportunity" icon="gtk-go-forward" type="object"/> <newline /> - <field name="section_id" widget="selection" /> <field name="user_id" /> + <field name="section_id" widget="selection" /> <field name="stage_id" domain="[('type','=','lead'),('section_ids', '=', section_id)]" /> <group col="2" colspan="1"> <button name="stage_previous" string="" @@ -89,7 +89,7 @@ <field name="state_id"/> </group> <group colspan="2" col="3"> - <separator string="Communication" colspan="4" col="3"/> + <separator string="Communication History" colspan="4" col="3"/> <field name="email_from" widget="email"/> <newline/> <field name="phone"/> @@ -160,7 +160,7 @@ <field name="day_close"/> </group> </page> - <page string="History" groups="base.group_extended"> + <page string="Communication & History" groups="base.group_extended"> <group colspan="4"> <field colspan="4" name="email_cc" widget="char" size="512"/> </group> diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index b5f3728443d..ee41e865b2d 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -146,7 +146,7 @@ </group> </page> - <page string="History" groups="base.group_extended"> + <page string="Communication & History" groups="base.group_extended"> <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/> </group> diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 4b34da6a58e..70772e6ebfd 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -155,7 +155,7 @@ <field name="resolution" colspan="2" nolabel="1"/> </group> </page> - <page string="History" groups="base.group_extended"> + <page string="Communication & History" groups="base.group_extended"> <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="char"/> </group> @@ -168,7 +168,7 @@ context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}" icon="terp-mail-replied" type="action" attrs="{'invisible': [('history', '!=', True)]}" /> </tree> - <form string="History"> + <form string="Communication & History"> <group col="4" colspan="4"> <field name="email_from"/> <field name="date"/> diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index c0b5fcd58d0..8c704347c67 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -140,7 +140,7 @@ type="object" icon="gtk-convert" /> </group> </page> - <page string="History" groups="base.group_extended"> + <page string="Communication & History" groups="base.group_extended"> <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="char"/> </group> diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 55eaf16ff85..2fccc7cbcea 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -92,7 +92,7 @@ icon="gtk-convert" /> </group> </page> - <page string="History" groups="base.group_extended"> + <page string="Communication & History" groups="base.group_extended"> <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="char"/> </group> diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 010a46faaf2..ebc22352e3a 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -135,7 +135,7 @@ <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/> </group> </page> - <page string="Emails" groups="base.group_extended"> + <page string="Communication & History" groups="base.group_extended"> <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="char"/> </group> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 5fb67b80a50..fafb808ea37 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -235,7 +235,7 @@ </group> <field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/> - <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}"> + <field colspan="4" name="work_ids" nolabel="1" attrs="{'invisible':[('state','in',['draft'])],'readonly':[('state','=','done')]}"> <tree string="Task Work" editable="top"> <field name="name" /> <field name="hours" widget="float_time" sum="Spent Hours"/> @@ -312,8 +312,10 @@ <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/> <field name="user_id" invisible="context.get('user_invisible', False)"/> <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/> - <field name="effective_hours" widget="float_time" sum="Spent Hours"/> - <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/> + <field name="total_hours"/> + <field name="planned_hours"/> + <field name="effective_hours" widget="float_time" sum="Spent Hours"/> + <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/> <field name="date_deadline" invisible="context.get('deadline_visible',True)"/> <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/> <button name="next_type" invisible="context.get('set_visible',False)" diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 0687c4fe26a..b40d0f42335 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -93,7 +93,7 @@ <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/> </group> </page> - <page string="History" groups="base.group_extended"> + <page string="Communication & History" groups="base.group_extended"> <group colspan="4"> <field colspan="4" name="email_cc" string="Global CC" widget="url"/> </group> |