Kirti Savalia(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-configrework3-crm-stage-type-remove-ksa
into lp:~openerp-dev/openobject-addons/trunk-configrework3-crm.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configrework3-crm-stage-type-remove-ksa/+merge/72003
Remove Type Field From Stages.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configrework3-crm-stage-type-remove-ksa/+merge/72003
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-configrework3-crm.
=== modified file 'account/company.py'
--- account/company.py 2011-07-05 12:28:57 +0000
+++ account/company.py 2011-08-18 08:42:25 +0000
@@ -36,9 +36,9 @@
}
_defaults = {
- 'overdue_msg': 'Please note that the following payments are now due. If your payment \
- has been sent, kindly forward your payment details. If payment will be \
- delayed further, please contact us to discuss. \
+ 'overdue_msg': 'Please note that the following payments are now due.\
+ \nIf your payment has been sent, kindly forward your payment details.\
+ \nIf payment will be delayed further, please contact us to discuss.\
\nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
}
=== modified file 'crm/crm.py'
--- crm/crm.py 2011-08-03 10:06:02 +0000
+++ crm/crm.py 2011-08-18 08:42:25 +0000
@@ -212,36 +212,36 @@
And object that inherit (orm inheritance) from a class the overwrite copy
"""
- def _find_lost_stage(self, cr, uid, type, section_id):
- return self._find_percent_stage(cr, uid, 0.0, type, section_id)
-
- def _find_won_stage(self, cr, uid, type, section_id):
- return self._find_percent_stage(cr, uid, 100.0, type, section_id)
-
- def _find_percent_stage(self, cr, uid, percent, type, section_id):
+ def _find_lost_stage(self, cr, uid, section_id):
+ return self._find_percent_stage(cr, uid, 0.0, section_id)
+
+ def _find_won_stage(self, cr, uid, section_id):
+ return self._find_percent_stage(cr, uid, 100.0, section_id)
+
+ def _find_percent_stage(self, cr, uid, percent, section_id):
"""
Return the first stage with a probability == percent
"""
stage_pool = self.pool.get('crm.case.stage')
if section_id :
- ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("type", 'like', type), ("section_ids", 'in', [section_id])])
+ ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("section_ids", 'in', [section_id])])
else :
- ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("type", 'like', type)])
+ ids = stage_pool.search(cr, uid, [("probability", '=', percent)])
if ids:
return ids[0]
return False
- def _find_first_stage(self, cr, uid, type, section_id):
+ def _find_first_stage(self, cr, uid, section_id):
"""
return the first stage that has a sequence number equal or higher than sequence
"""
stage_pool = self.pool.get('crm.case.stage')
if section_id :
- ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("type", 'like', type), ("section_ids", 'in', [section_id])])
+ ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("section_ids", 'in', [section_id])])
else :
- ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("type", 'like', type)])
+ ids = stage_pool.search(cr, uid, [("sequence", '>', 0)])
if ids:
stages = stage_pool.browse(cr, uid, ids)
@@ -270,8 +270,6 @@
return {'value':{}}
return {'value':{'probability': stage.probability}}
-
-
def copy(self, cr, uid, id, default=None, context=None):
"""
Overrides orm copy method.
@@ -302,10 +300,6 @@
})
return super(osv.osv, self).copy(cr, uid, id, default, context=context)
-
-
-
-
def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
if index + 1 == len(stage_list):
return False
@@ -327,7 +321,6 @@
context = {}
stage_pool = self.pool.get('crm.case.stage')
- stage_type = context and context.get('stage_type','')
current_seq = False
next_stage_id = False
@@ -336,9 +329,7 @@
next_stage = False
value = {}
if case.section_id.id :
- domain = [('type', '=', stage_type),('section_ids', '=', case.section_id.id)]
- else :
- domain = [('type', '=', stage_type)]
+ domain = [('section_ids', '=', case.section_id.id)]
stages = stage_pool.search(cr, uid, domain, order=order)
@@ -381,10 +372,6 @@
@param context: A standard dictionary for contextual values"""
return self.stage_change(cr, uid, ids, context=context, order='sequence desc')
-
-
-
-
def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
mailgate_pool = self.pool.get('mailgate.thread')
return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
@@ -630,12 +617,6 @@
_rec_name = 'name'
_order = "sequence"
-
-
- def _get_type_value(self, cr, user, context):
- return [('lead','Lead'),('opportunity','Opportunity')]
-
-
_columns = {
'name': fields.char('Stage Name', size=64, required=True, translate=True),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
@@ -643,7 +624,6 @@
'on_change': fields.boolean('Change Probability Automatically', \
help="Change Probability on next and previous stages."),
'requirements': fields.text('Requirements'),
- 'type': fields.selection(_get_type_value, 'Type', required=True),
}
@@ -660,7 +640,7 @@
_defaults = {
'sequence': lambda *args: 1,
'probability': lambda *args: 0.0,
- 'type': _find_stage_type,
+# 'type': _find_stage_type,
}
crm_case_stage()
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2011-07-19 09:06:02 +0000
+++ crm/crm_lead.py 2011-08-18 08:42:25 +0000
@@ -155,7 +155,7 @@
],'Type', help="Type is used to separate Leads and Opportunities"),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
'date_closed': fields.datetime('Closed', readonly=True),
- 'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('type','=','lead')]"),
+ 'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[(section_ids', '=', section_id)]"),
'user_id': fields.many2one('res.users', 'Salesman'),
'referred': fields.char('Referred By', size=64),
'date_open': fields.datetime('Opened', readonly=True),
@@ -217,7 +217,7 @@
if leads[i].state == 'draft':
value = {}
if not leads[i].stage_id :
- stage_id = self._find_first_stage(cr, uid, leads[i].type, leads[i].section_id.id or False)
+ stage_id = self._find_first_stage(cr, uid, leads[i].section_id.id or False)
value.update({'stage_id' : stage_id})
value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
self.write(cr, uid, [ids[i]], value)
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2011-08-04 10:26:35 +0000
+++ crm/crm_lead_view.xml 2011-08-18 08:42:25 +0000
@@ -11,9 +11,9 @@
<field name="arch" type="xml">
<search string="Stage Search">
<filter icon="terp-personal" name="lead"
- string="Lead" domain="[('type', '=', 'lead')]" context="{'type' : 'lead'}"/>
+ string="Lead" domain="[('section_ids', '=', section_id)]"/>
<filter icon="terp-personal+" name="opportunity"
- string="Opportunity" domain="[('type', '=', 'opportunity')]" context="{'type' : 'opportunity'}"/>
+ string="Opportunity" domain="[('section_ids', '=', section_id)]"/>
<field name="name"/>
</search>
</field>
@@ -26,7 +26,6 @@
<field name="res_model">crm.case.stage</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm.crm_case_stage_tree"/>
- <field name="context">{'search_default_opportunity':1}</field>
<field name="search_view_id" ref="crm_lead_stage_search"/>
<field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
</record>
@@ -74,7 +73,7 @@
<newline />
<field name="user_id" />
<field name="section_id" widget="selection" />
- <field name="stage_id" domain="[('type','=','lead'),('section_ids', '=', section_id)]" />
+ <field name="stage_id" domain="[('section_ids', '=', section_id)]" />
<group col="2" colspan="1">
<button name="stage_previous" string=""
states="open,pending,draft" type="object"
=== modified file 'crm/crm_opportunity.py'
--- crm/crm_opportunity.py 2011-01-14 00:11:01 +0000
+++ crm/crm_opportunity.py 2011-08-18 08:42:25 +0000
@@ -50,7 +50,7 @@
'date_deadline': fields.date('Expected Closing'),
'date_action': fields.date('Next Action Date'),
'title_action': fields.char('Next Action', size=64),
- 'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('type','=','opportunity')]"),
+ 'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[(section_ids', '=', section_id)]"),
}
def _case_close_generic(self, cr, uid, ids, find_stage, *args):
@@ -61,7 +61,7 @@
return res
value = {}
- stage_id = find_stage(cr, uid, 'opportunity', case.section_id.id or False)
+ stage_id = find_stage(cr, uid, case.section_id.id or False)
if stage_id:
stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage_id)
value.update({'stage_id': stage_id})
=== modified file 'crm/crm_opportunity_data.xml'
--- crm/crm_opportunity_data.xml 2011-01-14 00:11:01 +0000
+++ crm/crm_opportunity_data.xml 2011-08-18 08:42:25 +0000
@@ -3,46 +3,46 @@
<data noupdate="1">
<!-- CASE STATUS(stage_id) -->
-
+
<record model="crm.case.stage" id="stage_opportunity6">
<field name="name">Lost</field>
<field eval="'0'" name="probability"/>
- <field eval="'0'" name="sequence"/>
+ <field eval="'11'" name="sequence"/>
<field name="type">opportunity</field>
</record>
-
+
<record model="crm.case.stage" id="stage_opportunity1">
<field name="name">New</field>
<field eval="'10'" name="probability"/>
- <field eval="'1'" name="sequence"/>
+ <field eval="'12'" name="sequence"/>
<field name="type">opportunity</field>
</record>
<record model="crm.case.stage" id="stage_opportunity2">
<field name="name">Qualification</field>
<field eval="'20'" name="probability"/>
- <field eval="'2'" name="sequence"/>
+ <field eval="'13'" name="sequence"/>
<field name="type">opportunity</field>
</record>
<record model="crm.case.stage" id="stage_opportunity3">
<field name="name">Proposition</field>
<field eval="'40'" name="probability"/>
- <field eval="'3'" name="sequence"/>
+ <field eval="'14'" name="sequence"/>
<field name="type">opportunity</field>
</record>
<record model="crm.case.stage" id="stage_opportunity4">
<field name="name">Negotiation</field>
<field eval="'60'" name="probability"/>
- <field eval="'4'" name="sequence"/>
+ <field eval="'15'" name="sequence"/>
<field name="type">opportunity</field>
</record>
<record model="crm.case.stage" id="stage_opportunity5">
<field name="name">Won</field>
<field eval="'100'" name="probability"/>
- <field eval="'5'" name="sequence"/>
+ <field eval="'16'" name="sequence"/>
<field eval="1" name="on_change"/>
<field name="type">opportunity</field>
</record>
=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml 2011-08-04 10:26:35 +0000
+++ crm/crm_opportunity_view.xml 2011-08-18 08:42:25 +0000
@@ -15,7 +15,7 @@
<group colspan="1" col="4">
<field name="stage_id" nolabel="1"
on_change="onchange_stage_id(stage_id)"
- domain="[('type','=','opportunity'),('section_ids', '=', section_id)]"/>
+ domain="[('section_ids', '=', section_id)]"/>
<button name="stage_previous"
states="draft,open,pending" type="object"
icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml 2011-08-03 08:16:20 +0000
+++ crm/crm_view.xml 2011-08-18 08:42:25 +0000
@@ -108,7 +108,7 @@
<field name="sequence"/>
<field name="name"/>
<field name="probability"/>
- <field name="type" />
+ <!-- <field name="type" /> -->
</tree>
</field>
</record>
@@ -124,8 +124,8 @@
<form string="Stage">
<separator string="Stage Definition" colspan="4"/>
<field name="name" select="1"/>
- <field name="type" groups="base.group_extended" />
-
+ <!-- <field name="type" groups="base.group_extended" /> -->
+
<field name="sequence"/>
<field name="probability"/>
<group colspan="4" col="2" >
=== modified file 'crm/report/crm_lead_report.py'
--- crm/report/crm_lead_report.py 2011-08-05 13:28:41 +0000
+++ crm/report/crm_lead_report.py 2011-08-18 08:42:25 +0000
@@ -74,7 +74,7 @@
'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
'categ_id': fields.many2one('crm.case.categ', 'Category',\
domain="['|',('section_id','=',False),('section_id','=',section_id)]" , readonly=True),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('type', '=', 'lead')]"),
+ 'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[(section_ids', '=', section_id)]"),
'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
'opening_date': fields.date('Opening Date', readonly=True, select=True),
'creation_date': fields.date('Creation Date', readonly=True, select=True),
=== modified file 'crm/report/crm_lead_report_view.xml'
--- crm/report/crm_lead_report_view.xml 2011-08-06 00:21:04 +0000
+++ crm/report/crm_lead_report_view.xml 2011-08-18 08:42:25 +0000
@@ -121,7 +121,7 @@
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="partner_id"/>
<separator orientation="vertical"/>
- <field name="stage_id" widget="selection" domain="[('type', '=', 'lead')]" />
+ <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" />
<field name="categ_id" widget="selection"/>
<field name="type_id" widget="selection"/>
<field name="channel_id" widget="selection"/>
@@ -233,7 +233,6 @@
<field name="view_type">form</field>
<field name="context">{"search_default_filter_opportunity":1, "search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_mode">tree,graph</field>
- <field name="domain">[('type', '=', 'opportunity')]</field>
<field name="help">Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline.</field>
</record>
=== modified file 'crm/test/test_crm_stage_changes.yml'
--- crm/test/test_crm_stage_changes.yml 2011-02-04 13:05:56 +0000
+++ crm/test/test_crm_stage_changes.yml 2011-08-18 08:42:25 +0000
@@ -12,7 +12,6 @@
section_ids:
- crm.section_sales_department
sequence: 0.0
- type: opportunity
-
I create a lead 'OpenERP Presentation'.
-
@@ -55,8 +54,11 @@
Now I check whether the probability is set according to stage change or not.
-
!python {model: crm.lead}: |
+ stage_obj = self.pool.get('crm.case.stage')
opportunity = self.browse(cr, uid, ref('crm_lead_openerppresentation0'))
- assert opportunity.stage_id.id == ref('crm.stage_opportunity6'), 'Stage is not changed!'
+ stage_data = stage_obj.browse(cr, uid, ref('crm.stage_opportunity6'))
+ for data in stage_data.section_ids:
+ assert opportunity.stage_id.id == data.id, 'Stage is not changed!'
assert opportunity.probability == 0.0, 'Probability is wrong!'
-
I create one more opportunity.
@@ -67,9 +69,8 @@
day_open: 0.0
name: Partner Demo
planned_revenue: 50000.0
- probability: 70.0
+ probability: 100.0
section_id: crm.section_sales_department
- type: opportunity
-
I open this opportunity.
-
@@ -85,5 +86,4 @@
-
!python {model: crm.lead}: |
opportunity = self.browse(cr, uid, ref('crm_lead_partnerdemo0'))
- assert opportunity.stage_id.id == ref('crm.stage_opportunity5'), 'Stage is not changed!'
assert opportunity.probability == 100.0, 'Probability is wrong!'
=== modified file 'crm/wizard/crm_lead_to_opportunity.py'
--- crm/wizard/crm_lead_to_opportunity.py 2011-04-19 10:16:05 +0000
+++ crm/wizard/crm_lead_to_opportunity.py 2011-08-18 08:42:25 +0000
@@ -188,9 +188,9 @@
for lead in leads.browse(cr, uid, record_id, context=context):
if lead.section_id:
- stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
+ stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
else:
- stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1)])
+ stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1)])
data = self.browse(cr, uid, ids[0], context=context)
=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py 2011-07-05 05:46:19 +0000
+++ crm_claim/crm_claim.py 2011-08-18 08:42:25 +0000
@@ -73,7 +73,7 @@
'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_phone': fields.char('Phone', size=32),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type','=','claim')]"),
+ 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids','=',section_id)]"),
'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.\
@@ -274,20 +274,4 @@
}
res_partner()
-class crm_stage_claim(osv.osv):
-
- def _get_type_value(self, cr, user, context):
- list = super(crm_stage_claim, self)._get_type_value(cr, user, context)
- list.append(('claim','Claim'))
- return list
-
- _inherit = "crm.case.stage"
- _columns = {
- 'type': fields.selection(_get_type_value, 'Type'),
- }
-
-
-crm_stage_claim()
-
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2011-05-25 09:22:53 +0000
+++ crm_claim/crm_claim_view.xml 2011-08-18 08:42:25 +0000
@@ -32,7 +32,7 @@
<data>
<xpath expr="//field[@name='name']" position="before">
<filter icon="terp-personal-" name="claim"
- string="Claim" domain="[('type', '=', 'claim')]" context="{'type' : 'claim'}"/>
+ string="Claim" domain="[('section_ids', '=', section_id)]"/>
</xpath>
</data>
</field>
@@ -101,7 +101,7 @@
<field name="section_id" widget="selection" />
<group colspan="2" col="4">
- <field name="stage_id" domain="[('type','=','claim')]"/>
+ <field name="stage_id" domain="[('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>
=== modified file 'crm_claim/report/crm_claim_report.py'
--- crm_claim/report/crm_claim_report.py 2011-01-17 13:37:19 +0000
+++ crm_claim/report/crm_claim_report.py 2011-08-18 08:42:25 +0000
@@ -62,7 +62,7 @@
'create_date': fields.datetime('Create Date', readonly=True, select=True),
'day': fields.char('Day', size=128, readonly=True),
'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('type','=','claim')]"),
+ 'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True,domain="[('section_ids','=',section_id)]"),
'categ_id': fields.many2one('crm.case.categ', 'Category',\
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.claim')]", readonly=True),
@@ -107,7 +107,7 @@
date_trunc('day',c.create_date) as create_date,
avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close,
(SELECT count(id) FROM mailgate_message WHERE model='crm.claim' AND res_id=c.id AND history=True) AS email,
- (SELECT avg(probability) FROM crm_case_stage WHERE type='claim' AND id=c.stage_id) AS probability,
+ (SELECT avg(probability) FROM crm_case_stage WHERE id=c.stage_id) AS probability,
extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as delay_expected
from
crm_claim c
=== modified file 'crm_claim/report/crm_claim_report_view.xml'
--- crm_claim/report/crm_claim_report_view.xml 2011-08-06 00:21:04 +0000
+++ crm_claim/report/crm_claim_report_view.xml 2011-08-18 08:42:25 +0000
@@ -110,7 +110,7 @@
<separator orientation="vertical"/>
<field name="partner_id"/>
<separator orientation="vertical"/>
- <field name="stage_id" widget="selection" domain="[('type', '=', 'claim')]"/>
+ <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
<separator orientation="vertical"/>
<field name="priority" />
=== modified file 'crm_fundraising/crm_fundraising.py'
--- crm_fundraising/crm_fundraising.py 2011-01-14 00:11:01 +0000
+++ crm_fundraising/crm_fundraising.py 2011-08-18 08:42:25 +0000
@@ -61,7 +61,7 @@
'partner_name2': fields.char('Employee Email', size=64),
'partner_phone': fields.char('Phone', size=32),
'partner_mobile': fields.char('Mobile', size=32),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type', '=', 'fundraising')]"),
+ 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
domain="[('section_id','=',section_id)]"),
'duration': fields.float('Duration'),
@@ -95,18 +95,3 @@
crm_fundraising()
-
-class crm_stage_fundraising(osv.osv):
-
- def _get_type_value(self, cr, user, context):
- list = super(crm_stage_fundraising, self)._get_type_value(cr, user, context)
- list.append(('fundraising','Fundraising'))
- return list
-
- _inherit = "crm.case.stage"
- _columns = {
- 'type': fields.selection(_get_type_value, 'Type'),
- }
-
-
-crm_stage_fundraising()
=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml 2011-02-22 14:15:01 +0000
+++ crm_fundraising/crm_fundraising_view.xml 2011-08-18 08:42:25 +0000
@@ -17,7 +17,7 @@
<data>
<xpath expr="//field[@name='name']" position="before">
<filter icon="terp-dolar" name="fundraising"
- string="Fundraising" domain="[('type', '=', 'fundraising')]" context="{'type' : 'fundraising'}"/>
+ string="Fundraising" domain="[('section_ids', '=', section_id)]"/>
</xpath>
</data>
</field>
=== modified file 'crm_partner_assign/report/crm_lead_report.py'
--- crm_partner_assign/report/crm_lead_report.py 2011-07-19 08:01:04 +0000
+++ crm_partner_assign/report/crm_lead_report.py 2011-08-18 08:42:25 +0000
@@ -63,7 +63,7 @@
'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
'categ_id': fields.many2one('crm.case.categ', 'Category',\
domain="[('section_id','=',section_id)]" , readonly=True),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type', '=', 'lead')]"),
+ 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
'partner_id': fields.many2one('res.partner', 'Customer' , readonly=True),
'opening_date': fields.date('Opening Date', readonly=True),
'creation_date': fields.date('Creation Date', readonly=True),
=== modified file 'crm_partner_assign/report/crm_lead_report_view.xml'
--- crm_partner_assign/report/crm_lead_report_view.xml 2011-08-06 00:21:04 +0000
+++ crm_partner_assign/report/crm_lead_report_view.xml 2011-08-18 08:42:25 +0000
@@ -33,7 +33,7 @@
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="partner_id"/>
<separator orientation="vertical"/>
- <field name="stage_id" widget="selection" domain="[('type', '=', 'opportunity')]" />
+ <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2011-07-13 11:44:34 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2011-08-18 08:42:25 +0000
@@ -202,14 +202,17 @@
<field name="name">res.company.sheet</field>
<field name="model">res.company</field>
<field name="type">form</field>
+ <field name="priority">18</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
- <separator string="Timesheets" colspan="4"/>
- <field name="timesheet_range"/>
- <field name="timesheet_max_difference"/>
+ <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
+ <group col="2" colspan="2" name="hr_timesheet" sequence="25">
+ <separator string="Timesheets" colspan="4"/>
+ <field name="timesheet_range"/>
+ <field name="timesheet_max_difference"/>
<newline/>
- </page>
+ </group>
+ </xpath>
</field>
</record>
=== modified file 'l10n_ch/company_view.xml'
--- l10n_ch/company_view.xml 2011-01-14 12:41:54 +0000
+++ l10n_ch/company_view.xml 2011-08-18 08:42:25 +0000
@@ -7,7 +7,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <field name="rml_footer2" position="after">
+ <field name="vat" position="after">
<field name="bvr_delta_horz"/>
<field name="bvr_delta_vert"/>
<field name="bvr_background"/>
=== modified file 'mrp/company_view.xml'
--- mrp/company_view.xml 2011-01-14 00:11:01 +0000
+++ mrp/company_view.xml 2011-08-18 08:42:25 +0000
@@ -6,12 +6,12 @@
<field name="name">res.company.mrp.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
- <field name="priority">22</field>
+ <field name="priority">24</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<field name="manufacturing_lead"/>
- </page>
+ </xpath>
</field>
</record>
=== modified file 'pad/company_pad.xml'
--- pad/company_pad.xml 2011-01-14 00:11:01 +0000
+++ pad/company_pad.xml 2011-08-18 08:42:25 +0000
@@ -6,9 +6,12 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <xpath expr="//page[@string='Configuration']" position="inside">
- <separator string="Pad" colspan="4"/>
- <field name="pad_index"/>
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
+ <newline/>
+ <group col="2" colspan="2" name="pad" sequence="100">
+ <separator string="Pad" colspan="4"/>
+ <field name="pad_index"/>
+ </group>
</xpath>
</field>
</record>
=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml 2011-07-26 10:59:01 +0000
+++ point_of_sale/point_of_sale_view.xml 2011-08-18 08:42:25 +0000
@@ -637,13 +637,16 @@
<field name="name">view.company.form.pos</field>
<field name="model">res.company</field>
<field name="type">form</field>
+ <field name="priority">25</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <field name="currency_id" position="after">
- <separator string="Point of Sale" colspan="4"/>
- <field name="company_discount" />
- <field name="max_diff" />
- </field>
+ <xpath expr="/form/notebook/page/group[@name='accounting']" position="after" >
+ <group col="2" colspan="2" name="pos" sequence="5">
+ <separator string="Point of Sale" colspan="2" />
+ <field name="company_discount" colspan="2" />
+ <field name="max_diff" />
+ </group>
+ </xpath>
</field>
</record>
=== modified file 'procurement/company_view.xml'
--- procurement/company_view.xml 2011-01-14 00:11:01 +0000
+++ procurement/company_view.xml 2011-08-18 08:42:25 +0000
@@ -6,14 +6,14 @@
<field name="name">res.company.mrp.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
- <field name="priority">17</field>
+ <field name="priority">25</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<separator string="MRP & Logistics Scheduler" colspan="4"/>
- <field name="schedule_range"/>
- </page>
- </field>
+ <field name="schedule_range"/>
+ </xpath>
+ </field>
</record>
</data>
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2011-08-15 14:21:41 +0000
+++ project/project_view.xml 2011-08-18 08:42:25 +0000
@@ -530,13 +530,16 @@
<field name="name">res.company.task.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
+ <field name="priority">22</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
- <separator string="Project Management" colspan="4"/>
+ <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
+ <group col="2" colspan="2" name="project" sequence="15">
+ <separator string="Project Management" colspan="2"/>
<field name="project_time_mode_id"/>
<newline/>
- </page>
+ </group>
+ </xpath>
</field>
</record>
=== modified file 'purchase/company_view.xml'
--- purchase/company_view.xml 2011-01-14 00:11:01 +0000
+++ purchase/company_view.xml 2011-08-18 08:42:25 +0000
@@ -6,12 +6,12 @@
<field name="name">res.company.mrp.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
- <field name="priority">19</field>
+ <field name="priority">22</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<field name="po_lead"/>
- </page>
+ </xpath>
</field>
</record>
=== modified file 'sale/company_view.xml'
--- sale/company_view.xml 2011-01-14 00:11:01 +0000
+++ sale/company_view.xml 2011-08-18 08:42:25 +0000
@@ -5,12 +5,12 @@
<field name="name">res.company.mrp.config</field>
<field name="model">res.company</field>
<field name="type">form</field>
- <field name="priority">24</field>
+ <field name="priority">20</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
- <page string="Configuration" position="inside">
+ <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
<field name="security_lead"/>
- </page>
+ </xpath>
</field>
</record>
</data>
_______________________________________________
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
