Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso-improvements-bde
into lp:~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso-improvements-bde/+merge/121742
Hello Sir,
I have made some improvements in CRM section described
in pad http://pad.openerp.com/p/rd-project.task-4096-AOS6Q5TD which are as
follows:
1) Renamed Buttons in customer form.
2) Added and changed default values of crm.case.stage.
3) Added class oe_edit_only for ( [ ] all day).
4) Assigned logged in user to salesperson.
5) Renamed Button, and kept buttons in sheet of schedule call form.
6) Added access rights in sale and purchase module.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso-improvements-bde/+merge/121742
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso-improvements-bde
into lp:~openerp-dev/openobject-addons/trunk-addons-issues5-crm-pso.
=== modified file 'base_calendar/crm_meeting_view.xml'
--- base_calendar/crm_meeting_view.xml 2012-08-22 09:21:49 +0000
+++ base_calendar/crm_meeting_view.xml 2012-08-29 05:03:23 +0000
@@ -111,8 +111,10 @@
<field name="date_deadline"
string="End Date" attrs="{'invisible': [('allday','=',True)]}"
on_change="onchange_dates(date,False,date_deadline)"/>
- (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
- <label for="allday" string="All Day?"/>)
+ <div class="oe_edit_only">
+ (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+ <label for="allday" string="All Day?"/>)
+ </div>
</div>
<field name="recurrency"
attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
=== modified file 'crm/crm.py'
--- crm/crm.py 2012-08-14 10:51:14 +0000
+++ crm/crm.py 2012-08-29 05:03:23 +0000
@@ -90,9 +90,10 @@
_defaults = {
'sequence': lambda *args: 1,
'probability': lambda *args: 0.0,
- 'state': 'draft',
+ 'state': 'open',
'fold': False,
'type': 'both',
+ 'case_default': True,
}
class crm_case_section(osv.osv):
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-08-23 14:35:21 +0000
+++ crm/crm_lead.py 2012-08-29 05:03:23 +0000
@@ -267,7 +267,7 @@
_defaults = {
'active': 1,
'type': 'lead',
- 'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
+ 'user_id': lambda self, cr, uid, context: uid,
'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml 2012-08-15 22:30:38 +0000
+++ crm/crm_phonecall_view.xml 2012-08-29 05:03:23 +0000
@@ -106,56 +106,55 @@
<field name="arch" type="xml">
<form string="Phone Call" version="7.0">
<header>
- <button name="case_close" string="Held" type="object" class="oe_highlight"
+ <button name="case_close" string="Call Done" type="object" class="oe_highlight"
states="open,pending"/>
<button name="case_reset" string="Reset to Todo" type="object"
states="cancel"/>
- <button string="Convert to Opportunity"
- name="%(phonecall2opportunity_act)d"
- type="action"
- attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}"/>
- <button string="Convert to Opportunity" class="oe_highlight"
- name="%(phonecall2opportunity_act)d"
- type="action"
- attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}"/>
- <button string="Schedule Other Call"
- name="%(phonecall_to_phonecall_act)d"
- type="action"/>
- <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
<button name="case_cancel" string="Cancel" type="object"
states="draft,open,pending"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done"/>
</header>
- <sheet string="Phone Call">
- <div class="oe_title">
- <div class="oe_edit_only">
- <label for="name" string="Title"/>
- </div>
- <h1><field name="name" required="1"/></h1>
- <div class="oe_edit_only">
- <label for="partner_phone" string="Phone"/>
- </div>
- <h2><field name="partner_phone"/></h2>
- </div>
- <group col="4">
- <field name="date"/>
- <field name="user_id"/>
- <field name="duration" widget="float_time"/>
- <field name="section_id" colspan="1" widget="selection"/>
- <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
- <field name="categ_id" widget="selection"
- domain="[('object_id.model', '=', 'crm.phonecall')]"/>
- <field name="partner_mobile"/>
- <field name="priority"/>
- <field name="opportunity_id"/>
- </group>
+ <sheet string="Phone Call">
+ <div class="oe_right">
+ <button string="Convert to Opportunity"
+ name="%(phonecall2opportunity_act)d"
+ type="action"
+ attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}"/>
+ <button string="Schedule Other Call"
+ name="%(phonecall_to_phonecall_act)d"
+ type="action"/>
+ <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
+ </div>
+ <div class="oe_title">
+ <div class="oe_edit_only">
+ <label for="name" string="Title"/>
+ </div>
+ <h1><field name="name" required="1"/></h1>
+ <div class="oe_edit_only">
+ <label for="partner_phone" string="Phone"/>
+ </div>
+ <h2><field name="partner_phone"/></h2>
+ </div>
+
+ <group col="4">
+ <field name="date"/>
+ <field name="user_id"/>
+ <field name="duration" widget="float_time"/>
+ <field name="section_id" colspan="1" widget="selection"/>
+ <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+ <field name="categ_id" widget="selection"
+ domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+ <field name="partner_mobile"/>
+ <field name="priority"/>
+ <field name="opportunity_id"/>
+ </group>
- <field name="description" placeholder="Description..."/>
- </sheet>
- <div class="oe_chatter">
- <field name="message_ids" widget="mail_thread"/>
- <field name="message_follower_ids" widget="mail_followers"/>
- </div>
+ <field name="description" placeholder="Description..."/>
+ </sheet>
+ <div class="oe_chatter">
+ <field name="message_ids" widget="mail_thread"/>
+ <field name="message_follower_ids" widget="mail_followers"/>
+ </div>
</form>
</field>
</record>
=== modified file 'crm/res_partner_view.xml'
--- crm/res_partner_view.xml 2012-08-08 12:19:50 +0000
+++ crm/res_partner_view.xml 2012-08-29 05:03:23 +0000
@@ -130,10 +130,10 @@
<field name="arch" type="xml">
<xpath expr="//div[@name='buttons']" position="inside">
<button type="action"
- string="Schedule a Meeting"
+ string="Meetings"
name="%(base_calendar.action_crm_meeting)d"
context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
- <button type="action" string="Schedule a Call"
+ <button type="action" string="Call"
name="%(crm.crm_case_categ_phone_create_partner)d"
context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
<button type="action" string="Opportunities" attrs="{'invisible': [('customer', '=', False)]}"
=== modified file 'purchase/board_purchase_view.xml'
--- purchase/board_purchase_view.xml 2012-08-09 06:05:16 +0000
+++ purchase/board_purchase_view.xml 2012-08-29 05:03:23 +0000
@@ -85,6 +85,7 @@
icon="terp-graph"
id="menu_board_purchase"
parent="base.menu_reporting_dashboard"
+ groups="group_purchase_user"
sequence="20"/>
</data>
=== modified file 'purchase/security/ir.model.access.csv'
--- purchase/security/ir.model.access.csv 2012-08-22 13:37:29 +0000
+++ purchase/security/ir.model.access.csv 2012-08-29 05:03:23 +0000
@@ -65,3 +65,4 @@
access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
+access_purchase_order_partner_manager,purchase.order,model_purchase_order,base.group_partner_manager,1,0,0,0
=== modified file 'sale/security/ir.model.access.csv'
--- sale/security/ir.model.access.csv 2012-07-06 15:08:17 +0000
+++ sale/security/ir.model.access.csv 2012-08-29 05:03:23 +0000
@@ -60,3 +60,4 @@
access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,base.group_sale_salesman,1,0,0,0
+access_sale_order_partner_manager,sale.order,model_sale_order,base.group_partner_manager,1,0,0,0
_______________________________________________
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
