openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01500
[Merge] lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
Sbh (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#644398 Resource : there is no menu entry to configure resource.calendar
https://bugs.launchpad.net/bugs/644398
#671360 [RC1] base_report_designer can't push report to db
https://bugs.launchpad.net/bugs/671360
#680121 Partner : History tab should be invisible by default,must be available on request of concerned modules.
https://bugs.launchpad.net/bugs/680121
#684791 troubles with recurency in calendar
https://bugs.launchpad.net/bugs/684791
#689574 Not possible to create a Inbound call from the history tab of the partner form
https://bugs.launchpad.net/bugs/689574
#691006 cannot save new lead after have duplicated it.
https://bugs.launchpad.net/bugs/691006
#691640 Required field customer in project empty after customer delete
https://bugs.launchpad.net/bugs/691640
#692971 Sign in / Sign out by project : shouldn't be available if the project module isn't installed
https://bugs.launchpad.net/bugs/692971
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/sbh-dev-addons1/+merge/44548
Hello,
CRM and project Improvement. http://pad.openerp.com/addons1-6-0
--
https://code.launchpad.net/~openerp-dev/openobject-addons/sbh-dev-addons1/+merge/44548
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2010-12-22 04:05:12 +0000
+++ crm/crm_lead.py 2010-12-23 06:23:35 +0000
@@ -125,7 +125,7 @@
'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([
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2010-12-16 10:28:40 +0000
+++ crm/crm_lead_view.xml 2010-12-23 06:23:35 +0000
@@ -57,8 +57,8 @@
help="Convert to Opportunity" icon="gtk-go-forward"
type="object"/>
<newline />
+ <field name="user_id" />
<field name="section_id" widget="selection" />
- <field name="user_id" />
<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>
=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml 2010-12-16 10:28:40 +0000
+++ crm/crm_opportunity_view.xml 2010-12-23 06:23:35 +0000
@@ -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>
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2010-12-16 10:28:40 +0000
+++ crm_claim/crm_claim_view.xml 2010-12-23 06:23:35 +0000
@@ -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"/>
=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml 2010-12-16 10:28:40 +0000
+++ crm_fundraising/crm_fundraising_view.xml 2010-12-23 06:23:35 +0000
@@ -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>
=== modified file 'crm_helpdesk/crm_helpdesk_view.xml'
--- crm_helpdesk/crm_helpdesk_view.xml 2010-10-16 08:26:55 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml 2010-12-23 06:23:35 +0000
@@ -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>
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml 2010-12-08 10:23:05 +0000
+++ hr_recruitment/hr_recruitment_view.xml 2010-12-23 06:23:35 +0000
@@ -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>
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2010-12-21 09:18:39 +0000
+++ project/project_view.xml 2010-12-23 06:23:35 +0000
@@ -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)"
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2010-12-08 10:23:05 +0000
+++ project_issue/project_issue_view.xml 2010-12-23 06:23:35 +0000
@@ -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>
Follow ups
