pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merge crm and project improvement

Browse Source 
bzr revid: sbh@tinyerp.com-20101223081458-kcbi2ul623hxr31y
This commit is contained in:
Sbh (OpenERP)
2010-12-23 13:44:58 +05:30
parent d375799f66 7c46db34b0
commit 6b8317f704
9 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_lead.py
+1 -1
View File
@@ -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([
addons/crm/crm_lead_view.xml
+3 -3
View File
@@ -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 &amp; History" groups="base.group_extended">
<group colspan="4">
<field colspan="4" name="email_cc" widget="char" size="512"/>
</group>
addons/crm/crm_opportunity_view.xml
+1 -1
View File
@@ -146,7 +146,7 @@
</group>
</page>
<page string="History" groups="base.group_extended">
<page string="Communication &amp; History" groups="base.group_extended">
<group colspan="4">
<field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
</group>
addons/crm_claim/crm_claim_view.xml
+2 -2
View File
@@ -155,7 +155,7 @@
<field name="resolution" colspan="2" nolabel="1"/>
</group>
</page>
<page string="History" groups="base.group_extended">
<page string="Communication &amp; 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 &amp; History">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>
addons/crm_fundraising/crm_fundraising_view.xml
+1 -1
View File
@@ -140,7 +140,7 @@
type="object" icon="gtk-convert" />
</group>
</page>
<page string="History" groups="base.group_extended">
<page string="Communication &amp; History" groups="base.group_extended">
<group colspan="4">
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
</group>
addons/crm_helpdesk/crm_helpdesk_view.xml
+1 -1
View File
@@ -92,7 +92,7 @@
icon="gtk-convert" />
</group>
</page>
<page string="History" groups="base.group_extended">
<page string="Communication &amp; History" groups="base.group_extended">
<group colspan="4">
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
</group>
addons/hr_recruitment/hr_recruitment_view.xml
+1 -1
View File
@@ -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 &amp; History" groups="base.group_extended">
<group colspan="4">
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
</group>
addons/project/project_view.xml
+5 -3
View File
@@ -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)"
addons/project_issue/project_issue_view.xml
+1 -1
View File
@@ -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 &amp; History" groups="base.group_extended">
<group colspan="4">
<field colspan="4" name="email_cc" string="Global CC" widget="url"/>
</group>