odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

fix 

bzr revid: fp@tinyerp.com-20101127163712-90hr1ixzh8ne4t2x
This commit is contained in:
Fabien Pinckaers 2010-11-27 17:37:12 +01:00
parent 882e176a8a
commit ddb433cb79
4 changed files with 99 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
addons/crm/wizard/crm_partner_to_opportunity_view.xml
View File

@ -1,31 +1,31 @@
<openerp>
<data>
<data>
<!-- partner To Opportunity form -->
<!-- partner To Opportunity form -->
<record id="view_crm_partner2opportunity" model="ir.ui.view">
<field name="name">crm.crm.partner2opportunity</field>
<field name="model">crm.partner2opportunity</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert To Opportunity">
<field name="name"/>
<field name="partner_id"/>
<newline/>
<field name="planned_revenue"/>
<field name="probability"/>
<separator string="" colspan="4" />
<group col="4" colspan="4">
<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
<button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>
<record id="view_crm_partner2opportunity" model="ir.ui.view">
<field name="name">crm.crm.partner2opportunity</field>
<field name="model">crm.partner2opportunity</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert To Opportunity">
<field name="name"/>
<field name="partner_id"/>
<newline/>
<field name="planned_revenue"/>
<field name="probability"/>
<separator string="" colspan="4" />
<group col="4" colspan="4">
<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
<button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>
<!-- partner To Opportunity Action -->
<record model="ir.actions.act_window" id="action_view_crm_partner2opportunity">
<record model="ir.actions.act_window" id="action_view_crm_partner2opportunity">
<field name="name">Create Opportunity</field>
<field name="res_model">crm.partner2opportunity</field>
<field name="view_type">form</field>
@ -33,14 +33,13 @@
<field name="target">new</field>
</record>
<!-- partner To Opportunity wizard -->
<!-- partner To Opportunity wizard -->
<act_window id="crm_partner2opportunity"
key2="client_action_multi" name="Create Opportunity"
res_model="crm.partner2opportunity" src_model="res.partner"
view_id="view_crm_lead2partner_create"
view_mode="form" target="new" view_type="form"
groups="base.group_extended"/>
<act_window id="crm_partner2opportunity"
key2="client_action_multi" name="Create Opportunity"
res_model="crm.partner2opportunity" src_model="res.partner"
view_mode="form" target="new" view_type="form"
groups="base.group_extended"/>
</data>
</data>
</openerp>

24
addons/crm_claim/crm_claim.py
View File

@ -29,33 +29,28 @@ class crm_claim(crm.crm_case, osv.osv):
"""
_name = "crm.claim"
_description = "Claim"
_order = "id desc"
_order = "priority,date desc"
_inherit = ['mailgate.thread']
_columns = {
'id': fields.integer('ID', readonly=True),
'name': fields.char('Name', size=128, required=True),
'active': fields.boolean('Active', required=False),
'date_action_last': fields.datetime('Last Action', readonly=1),
'date_action_next': fields.datetime('Next Action', readonly=1),
'name': fields.char('Claim Subject', size=128, required=True),
'action_next': fields.char('Next Action', size=200),
'date_action_next': fields.datetime('Next Action Date'),
'description': fields.text('Description'),
'resolution': fields.text('Resolution'),
'create_date': fields.datetime('Creation Date' , readonly=True),
'write_date': fields.datetime('Update Date' , readonly=True),
'date_deadline': fields.date('Deadline'),
'date_closed': fields.datetime('Closed', readonly=True),
'date': fields.datetime('Date'),
'date': fields.datetime('Claim Date'),
'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
'canal_id': fields.many2one('res.partner.canal', 'Channel', \
help="The channels represent the different communication \
modes available with the customer."),
'planned_revenue': fields.float('Planned Revenue'),
'planned_cost': fields.float('Planned Costs'),
'categ_id': fields.many2one('crm.case.categ', 'Category', \
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.claim')]"),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'),
'user_id': fields.many2one('res.users', 'Responsible'),
'user_fault': fields.char('Trouble Responsible', size=64),
'section_id': fields.many2one('crm.case.section', 'Sales Team', \
select=True, help="Sales team to which Case belongs to."\
"Define Responsible user and Email account for"\
@ -67,11 +62,9 @@ class crm_claim(crm.crm_case, osv.osv):
),
'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
'email_from': fields.char('Email', size=128, help="These people will receive email."),
'partner_name': fields.char("Employee's Name", size=64),
'partner_mobile': fields.char('Mobile', size=32),
'partner_phone': fields.char('Phone', size=32),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="('object_id.model', '=', 'crm.claim')]"),
'probability': fields.float('Probability (%)'),
'cause': fields.text('Root Cause'),
'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True,
help='The state is set to \'Draft\', when a case is created.\
\nIf the case is in progress the state is set to \'Open\'.\
@ -81,7 +74,6 @@ class crm_claim(crm.crm_case, osv.osv):
}
_defaults = {
'active': lambda *a: 1,
'user_id': crm.crm_case._get_default_user,
'partner_id': crm.crm_case._get_default_partner,
'partner_address_id': crm.crm_case._get_default_partner_address,

140
addons/crm_claim/crm_claim_view.xml
View File

@ -48,27 +48,18 @@
<field name="name"/>
<field name="partner_id"/>
<field name="user_id" />
<field name="section_id"/>
<field name="date" string="Claim Date"/>
<field name="date_deadline" string="Deadline"/>
<field name="date_closed" string="Closure Date"/>
<field name="date"/>
<field name="date_action_next"/>
<field name="action_next"/>
<field name="categ_id" string="Type" select="1"/>
<field name="stage_id" invisible="1"/>
<field name="state"/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
<button name="case_pending" string="Pending"
states="draft,open" type="object"
icon="gtk-media-pause" />
<button name="case_close" string="Close"
states="open,draft,pending" type="object"
icon="gtk-close" />
<button name="case_reset" string="Reset to Draft"
states="done,cancel" type="object" icon="gtk-convert" />
</tree>
</field>
</record>
@ -79,51 +70,38 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Claims">
<group colspan="4" col="4">
<group colspan="1" col="2">
<field name="name" />
</group>
<group colspan="1" col="2">
<field name="date" string="Date of Claim"/>
</group>
<group colspan="1" col="2">
<field name="date_deadline" string="Deadline"/><newline/>
<group colspan="4" col="6">
<field name="name" />
<field name="date"/>
<field name="date_deadline"/>
<newline/>
<field name="user_id"/>
<field name="priority"/>
<group colspan="2" col="4">
<field name="stage_id"
domain="[('object_id.model', '=', 'crm.claim'), ('section_ids', '=', section_id)]" />
<button name="stage_previous" string="" type="object" icon="gtk-go-back" />
<button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
</group>
</group>
<group colspan="4" col="4">
<notebook>
<page string="Claim Info">
<separator colspan="4" string="Communication"/>
<group colspan="4" col="4">
<page string="Claim Description">
<group colspan="2" col="2">
<separator colspan="2" string="Claim Reporter"/>
<field name="partner_id" string="Partner"
on_change="onchange_partner_id(partner_id)" />
on_change="onchange_partner_id(partner_id)" />
<field name="partner_address_id" string="Contact"
on_change="onchange_partner_address_id(partner_address_id, email_from)" />
on_change="onchange_partner_address_id(partner_address_id, email_from)" />
<field name="partner_phone"/>
<field name="partner_mobile"/>
<field name="email_from"/>
</group>
<separator colspan="4" string="Status and Categorization"/>
<group colspan="4" col="6">
<field name="user_id" string="Responsible"/>
<field name="section_id" widget="selection"/>
<group colspan="2" col="4">
<field name="stage_id"
domain="[('object_id.model', '=', 'crm.claim'), ('section_ids', '=', section_id)]" />
<button name="stage_previous" string="" type="object" icon="gtk-go-back" />
<button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
</group>
<field name="categ_id" select="1" widget="selection"
domain="[('object_id.model', '=', 'crm.claim')]" />
<field name="type_action" select="1"/>
<field name="priority"/>
</group>
<separator colspan="4" string="References"/>
<group colspan="4" col="4">
<group colspan="2" col="2">
<separator colspan="2" string="Responsibilities"/>
<field name="user_fault"/>
<field name="categ_id" widget="selection"
domain="[('object_id.model', '=', 'crm.claim')]" />
<field name="ref"/>
<field name="ref2"/>
</group>
<separator colspan="4" string="Claim/Action Description"/>
<field name="description" colspan="4" nolabel="1"/>
@ -131,20 +109,43 @@
<group col="8" colspan="4">
<field name="state" select="1"/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_pending" string="Pending"
states="draft,open" type="object"
icon="gtk-media-pause" />
states="draft,open" type="object"
icon="gtk-media-pause" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
<button name="case_close" string="Done"
states="open,draft,pending" type="object"
icon="gtk-jump-to" />
states="open,pending" type="object"
icon="gtk-jump-to" />
<button name="case_reset"
string="Reset to Draft" states="done,cancel"
type="object" icon="gtk-convert" />
string="Reset to Draft" states="done,cancel"
type="object" icon="gtk-convert" />
</group>
</page>
<page string="Follow Up">
<group colspan="2" col="2">
<separator colspan="2" string="Actions"/>
<field name="date_action_next"/>
<field name="action_next"/>
</group>
<group colspan="2" col="2">
<separator colspan="2" string="Dates"/>
<field name="create_date"/>
<field name="date_closed"/>
<field name="write_date"/>
</group>
<group colspan="2" col="2">
<separator colspan="2" string="Root Causes"/>
<field name="cause" colspan="2" nolabel="1"/>
</group>
<group colspan="2" col="2">
<separator colspan="2" string="Resolution Actions"/>
<field name="type_action"/>
<field name="resolution" colspan="2" nolabel="1"/>
</group>
</page>
<page string="History" groups="base.group_extended">
@ -198,14 +199,6 @@
context="{'mail':'new', 'model': 'crm.claim'}"
icon="terp-mail-message-new" type="action" />
</page>
<page string="Extra Info" groups="base.group_extended">
<field name="id" select="1"/>
<field name="active"/>
<field name="canal_id"/>
<separator colspan="4" string="Dates"/>
<field name="create_date"/>
<field name="date_closed"/>
</page>
</notebook>
</group>
</form>
@ -215,15 +208,13 @@
<!-- Claim Calendar view -->
<record model="ir.ui.view" id="crm_case_claims_calendar_view">
<field name="name">CRM - Claims Calendar</field>
<field name="name">Claims Actions</field>
<field name="model">crm.claim</field>
<field name="type">calendar</field>
<field name="priority" eval="2"/>
<field name="arch" type="xml">
<calendar string="Claims" date_start="date" color="user_id">
<calendar string="Claims" date_start="date_action_next" color="user_id">
<field name="name"/>
<field name="partner_name"/>
<field name="categ_id"/>
</calendar>
</field>
</record>
@ -273,12 +264,6 @@
domain="[('user_id','=', False)]"
help="Unassigned Claims" />
</field>
<field name="section_id" select="1"
widget="selection">
<filter icon="terp-personal+" groups="base.group_extended"
domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
help="My Sales Team(s)" />
</field>
<newline/>
<group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner"
@ -287,9 +272,6 @@
<filter string="Responsible" icon="terp-personal"
domain="[]" help="Responsible User"
context="{'group_by':'user_id'}" />
<filter string="Sales Team" icon="terp-personal+"
domain="[]" help="Sales Team"
context="{'group_by':'section_id'}" />
<separator orientation="vertical"/>
<filter string="Stage" icon="terp-stage"
domain="[]" context="{'group_by':'stage_id'}" />

2
addons/document/__openerp__.py
View File

@ -46,7 +46,7 @@
'security/document_security.xml',
'document_view.xml',
'document_data.xml',
# 'wizard/document_configuration_view.xml',
'wizard/document_configuration_view.xml',
'security/ir.model.access.csv',
'report/document_report_view.xml',
'board_document_view.xml',