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

[MERGE] 

bzr revid: mra@tinyerp.com-20100513045245-q9rgkzbbr9b0f1jt
This commit is contained in:
mra (Open ERP) 2010-05-13 10:22:45 +05:30
parent e19d54b84c a15093819a
commit 47ad2debc5
24 changed files with 178 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/configurable_account_chart.xml
View File

@ -154,7 +154,7 @@
<field name="code">1104</field>
<field name="name">Bank Current Account</field>
<field ref="conf_cas" name="parent_id"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="conf_account_type_cash"/>
</record>

6
addons/account/installer.py
View File

@ -32,6 +32,11 @@ class account_installer(osv.osv_memory):
_name = 'account.installer'
_inherit = 'res.config.installer'
def _get_default_accounts(self, cr, uid, context=None):
accounts = [{'acc_name':'Current','account_type':'cash'},
{'acc_name':'Deposit','account_type':'cash'}]
return accounts
def _get_charts(self, cr, uid, context=None):
modules = self.pool.get('ir.module.module')
ids = modules.search(cr, uid, [('category_id','=','Account Charts')])
@ -77,6 +82,7 @@ class account_installer(osv.osv_memory):
'sale_tax':lambda *a:0.0,
'purchase_tax':lambda *a:0.0,
'charts':'configurable',
'bank_accounts_id':_get_default_accounts
}
def on_change_start_date(self, cr, uid, id, start_date):

9
addons/account/project/analytic_account_demo.xml
View File

@ -1,26 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record id="analytic_root" model="account.analytic.account">
<field name="name">Analytic Chart</field>
<field name="code">0</field>
</record>
<record id="analytic_absences" model="account.analytic.account">
<field name="name">Leaves</field>
<field name="code">1</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_internal" model="account.analytic.account">
<field name="name">Internal</field>
<field name="code">2</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_our_super_product" model="account.analytic.account">
<field name="name">Our Super Product</field>
<field name="code">100</field>
<field name="state">open</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_project_1" model="account.analytic.account">
<field name="name">Project 1</field>
<field name="code">101</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_project_2" model="account.analytic.account">
<field name="name">Project 2</field>
<field name="code">102</field>
<field name="parent_id" ref="analytic_root"/>
</record>
<record id="analytic_journal_trainings" model="account.analytic.account">
<field name="name">Training</field>

36
addons/base_setup/base_setup_data.xml
View File

@ -7,23 +7,25 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Setup">
<group colspan="4" col="8" width="600">
<group>
<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
</group>
<group colspan="6">
<separator string="Installation Done" colspan="8"/>
<label align="0.0" string="Your new database is now fully installed." colspan="8"/>
<field name="installed_users" nolabel= "1" colspan="8"/>
<label align="0.0" colspan="8" string="You can start configuring the system or connect directly to the database as an administrator."/>
</group>
</group>
<group colspan="8" col="8">
<separator string="" colspan="8"/>
<label string="" colspan="6"/>
<button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
<button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
</group>
<group colspan="4" col="8">
<group colspan="3" width="200">
<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
<newline/>
<label align="0.0" string="You can start configuring the system or connect directly to the database as an administrator." width="200" colspan="2"/>
</group>
<separator string="" position="vertical" colspan="1" rowspan="8"/>
<group colspan="4" width="400">
<separator string="Installation Done" colspan="4"/>
<label align="0.0" string="Your new database is now fully installed." colspan="4"/>
<field name="installed_users" nolabel= "1" colspan="4"/>
</group>
</group>
<group colspan="8" col="8">
<separator string="" colspan="8"/>
<label string="" colspan="6"/>
<button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
<button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
</group>
</form>
</field>
</record>

2
addons/base_setup/base_setup_installer.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Base Setup Modules Installation</attribute>
<attribute name="string">Install OpenERP Modules</attribute>
</form>
<xpath expr="//label[@string='description']"
position="attributes">

2
addons/base_setup/base_setup_todo.xml
View File

@ -11,7 +11,7 @@
<attribute name="string">Main Company Setup</attribute>
</form>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">Information of your company will be used to custiomize your documents like Invoices, Sale Orders,...</attribute>
<attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...</attribute>
</xpath>
<xpath expr='//separator[@string="title"]' position='attributes'>
<attribute name='string'>Configure Your Company</attribute>

6
addons/base_setup/gtk_contact_form.py
View File

@ -46,10 +46,10 @@ class base_gtkcontactform(osv.osv_memory):
return defaults
_columns = {
'name':fields.char('Your Name', size=64, required=True),
'name':fields.char('Your Name', size=64),
'job':fields.char('Job Title', size=64,),
'email':fields.char('E-mail', size=64, required=True),
'phone':fields.char('Phone', size=64, required=True),
'email':fields.char('E-mail', size=64),
'phone':fields.char('Phone', size=64),
'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32),
'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'),
('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'),

6
addons/base_setup/gtk_contact_form.xml
View File

@ -31,10 +31,10 @@
</group>
<group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
<separator colspan="4" string="About You"/>
<field name="name" colspan="2" required="True"/>
<field name="name" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
<field name="job" colspan="2"/>
<field name="email" colspan="2"/>
<field name="phone" colspan="2"/>
<field name="email" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
<field name="phone" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
<field name="total_employees" colspan="2"/>
<field name="industry" colspan="2"/>
</group>

6
addons/base_setup/installer.py
View File

@ -93,9 +93,9 @@ class base_setup_installer(osv.osv_memory):
def onchange_moduleselection(self, cr, uid, ids, *args):
progress = self._progress(cr, uid) - (2.5 * len(filter(lambda x: x==1, args)))
if progress <= 5.0:
progress = 5.0
progress = self._progress(cr, uid) - round((len(filter(lambda x: x==1, args)))*80/len(args))
if progress <= 10.0:
progress = 10.0
return {'value':{'progress':progress}}
def modules_to_install(self, cr, uid, ids, context=None):

2
addons/board_crm/board_crm_statistical_view.xml
View File

@ -21,7 +21,7 @@
<field name="model">crm.opportunity.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Opportunity by Sections and Categories" type="bar" orientation="horizontal">
<graph string="Opportunity by Sales Team and Categories" type="bar" orientation="horizontal">
<field name="categ_id"/>
<field name="nbr" operator="+"/>
</graph>

146
addons/board_crm/board_crm_view.xml
View File

@ -1,88 +1,88 @@
<?xml version="1.0"?>
<openerp>
<data>
<record model="board.note.type" id="note_crm_type">
<field name="name">CRM Configuration</field>
</record>
<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
<field name="name">crm.opportunity.user.graph1</field>
<field name="model">crm.opportunity.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Opportunities by User and Section" type="pie">
<field name="state"/>
<field name="nbr" operator="+"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="act_my_leads">
<field name="res_model">crm.lead</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm.crm_case_tree_view_leads"/>
<data>
<record model="board.note.type" id="note_crm_type">
<field name="name">CRM Configuration</field>
</record>
<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
<field name="name">crm.opportunity.user.graph1</field>
<field name="model">crm.opportunity.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Opportunities by User and Sales Team" type="pie">
<field name="state"/>
<field name="nbr" operator="+"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="act_my_leads">
<field name="res_model">crm.lead</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm.crm_case_tree_view_leads"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
<record model="ir.actions.act_window" id="act_my_meetings">
<field name="res_model">crm.meeting</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
<act_window name="My Cases"
domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
res_model="crm.case"
view_type="form"
view_mode="tree,form"
id="act_my_cases"/>
<record model="ir.actions.act_window" id="act_my_leads_stage">
<field name="res_model">crm.lead.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_lead_stage_graph1"/>
</record>
<record model="ir.actions.act_window" id="act_my_meetings">
<field name="res_model">crm.meeting</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
</record>
<act_window name="My Cases"
domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
res_model="crm.case"
view_type="form"
view_mode="tree,form"
id="act_my_cases"/>
<record model="ir.actions.act_window" id="act_my_leads_stage">
<field name="res_model">crm.lead.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_lead_stage_graph1"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
<record model="ir.actions.act_window" id="act_sales_pipeline">
<field name="res_model">crm.opportunity.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
<record model="ir.actions.act_window" id="act_sales_pipeline">
<field name="res_model">crm.opportunity.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
</record>
<record model="ir.ui.view" id="board_crm_form">
<field name="name">CRM - Dashboard Form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Connecting Dashboard">
<hpaned>
<record model="ir.ui.view" id="board_crm_form">
<field name="name">CRM - Dashboard Form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Connecting Dashboard">
<hpaned>
<child1>
<child1>
<action
name="%(act_my_leads)d"
colspan="4"
height="150"
width="510"/>
<action
name="%(act_my_leads)d"
colspan="4"
height="150"
width="510"/>
<action
string="My Meetings"
name="%(act_my_meetings)d"
height="150"
colspan="4"/>
<action
string="My Meetings"
name="%(act_my_meetings)d"
height="150"
colspan="4"/>
<action
string="My Cases"
name="%(act_my_cases)d"
colspan="4"
height="200"/>
<action
string="My Cases"
name="%(act_my_cases)d"
colspan="4"
height="200"/>
</child1>
</child1>
<child2>
<action
<child2>
<action
string="My Leads By Stage"
name="%(act_my_leads_stage)d"
colspan="4"/>

42
addons/crm/crm_report_view.xml
View File

@ -9,7 +9,7 @@
<field name="model">report.crm.case.section.categ2</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Cases by Section and Type">
<tree string="Cases by Team and Type">
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
@ -31,7 +31,7 @@
<field name="model">report.crm.case.section.categ2</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Cases by Section and Category2">
<form string="Cases by Team and Category2">
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
@ -49,11 +49,11 @@
<!-- Cases by section and category2 of case Graph View -->
<record model="ir.ui.view" id="view_crm_case_section_categ_graph">
<field name="name">CRM Report - Sections and Type(Graph)</field>
<field name="name">CRM Report - Teams and Type(Graph)</field>
<field name="model">report.crm.case.section.categ2</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Cases by Section and Type" type="bar" orientation="horizontal">
<graph string="Cases by Teams and Type" type="bar" orientation="horizontal">
<field name="category2_id"/>
<field name="amount_revenue" operator="+"/>
<field name="section_id" group="True"/>
@ -64,18 +64,18 @@
<!-- Cases by section and category2 of case Search View -->
<record id="view_crm_case_section_categ_filter" model="ir.ui.view">
<field name="name">CRM Report - Sections and Type(Select)</field>
<field name="name">CRM Report - Teams and Type(Select)</field>
<field name="model">report.crm.case.section.categ2</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Cases by Section and Type">
<search string="Cases by Team and Type">
<group col="10" colspan="4">
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by Section and Type for this year" />
help="Cases by Team and Type for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by Section and Type for this month" />
help="Cases by Team and Type for this month" />
<separator orientation="vertical"/>
<field name="section_id"
select="1" widget="selection" />
@ -99,11 +99,11 @@
<!-- Cases by section and stage Tree View -->
<record model="ir.ui.view" id="view_crm_case_section_stage_tree">
<field name="name">CRM Report - Sections and Stage(Tree)</field>
<field name="name">CRM Report - Teams and Stage(Tree)</field>
<field name="model">report.crm.case.section.stage</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Cases by Section and Stage">
<tree string="Cases by Team and Stage">
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
@ -120,11 +120,11 @@
<!-- Cases by section and stage Form View -->
<record model="ir.ui.view" id="view_crm_case_section_stage_form">
<field name="name">CRM Report - Sections and Stage(Form)</field>
<field name="name">CRM Report - Teams and Stage(Form)</field>
<field name="model">report.crm.case.section.stage</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Cases by Section and Stage">
<form string="Cases by Team and Stage">
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
@ -141,11 +141,11 @@
<!-- Cases by section and stage Graph View -->
<record model="ir.ui.view" id="view_crm_case_section_stage_graph">
<field name="name">CRM Report - Sections and Stage(Graph)</field>
<field name="name">CRM Report - Teams and Stage(Graph)</field>
<field name="model">report.crm.case.section.stage</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Cases by Section and Stage" type="bar" orientation="horizontal">
<graph string="Cases by Team and Stage" type="bar" orientation="horizontal">
<field name="stage_id"/>
<field name="amount_revenue" operator="+"/>
<field name="section_id" group="True"/>
@ -156,18 +156,18 @@
<!-- Cases by section and stage Search View -->
<record id="view_crm_case_section_stage_filter" model="ir.ui.view">
<field name="name">CRM Report - Sections and Stage(Select)</field>
<field name="name">CRM Report - Teams and Stage(Select)</field>
<field name="model">report.crm.case.section.stage</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Cases by Section and Stage">
<search string="Cases by Team and Stage">
<group col="8" colspan="4">
<filter string="This Year" icon="terp-hr"
domain="[('name','=',time.localtime()[0])]"
help="Cases by Section and Stage for this year" />
help="Cases by Team and Stage for this year" />
<filter string="This Month" icon="terp-hr"
domain="[('month','=',time.localtime()[1])]"
help="Cases by Section and Stage for this month" />
help="Cases by Team and Stage for this month" />
<separator orientation="vertical"/>
<field name="section_id" select="1" widget="selection"/>
<field name="nbr" select="1"/>
@ -189,11 +189,11 @@
<!-- Cases by section, category and stage Tree View -->
<record model="ir.ui.view" id="view_crm_case_section_categ_stage_tree">
<field name="name">CRM Report - Section, Category and Stage(Tree)</field>
<field name="name">CRM Report - Team, Category and Stage(Tree)</field>
<field name="model">report.crm.case.section.categ.stage</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Cases by Section, Category and Stage">
<tree string="Cases by Team, Category and Stage">
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
@ -210,7 +210,7 @@
<!-- Cases by section, category and stage Form View -->
<record model="ir.ui.view" id="view_crm_case_section_categ_stage_form">
<field name="name">CRM Report - Section, Category and Stage(Form)</field>
<field name="name">CRM Report - Team, Category and Stage(Form)</field>
<field name="model">report.crm.case.section.categ.stage</field>
<field name="type">form</field>
<field name="arch" type="xml">

26
addons/event/event_sequence.xml
View File

@ -2,20 +2,20 @@
<openerp>
<data>
#
# Sequences for crm.case.section
#
#
# Sequences for crm.case.section
#
<record model="ir.sequence.type" id="seq_section_code">
<field name="name">Section Code</field>
<field name="code">event.event</field>
</record>
<record model="ir.sequence" id="seq_section_code1">
<field name="name">Section Code</field>
<field name="code">event.event</field>
<field name="prefix">C/</field>
<field name="padding">3</field>
</record>
<record model="ir.sequence.type" id="seq_section_code">
<field name="name">Section Code</field>
<field name="code">event.event</field>
</record>
<record model="ir.sequence" id="seq_section_code1">
<field name="name">Section Code</field>
<field name="code">event.event</field>
<field name="prefix">C/</field>
<field name="padding">3</field>
</record>
</data>
</openerp>

2
addons/hr/hr_installer.xml
View File

@ -19,7 +19,7 @@
</xpath>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">The base Human Resources addon will help you manage your employee roster, but your can enhance it even further by installing a few HR-related applications.</attribute>
<attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute>
</xpath>
<group colspan="8">
<field name="hr_holidays"/>

2
addons/hr_holidays/hr_holidays.py
View File

@ -248,7 +248,7 @@ class hr_holidays(osv.osv):
if brows_obj.categ_id and brows_obj.categ_id.section_id and not brows_obj.categ_id.section_id.allow_unlink:
warning = {
'title': "Warning for ",
'message': "You won\'t be able to cancel this leave request because the CRM Section of the leave type disallows."
'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows."
}
return {'warning': warning}

3
addons/hr_timesheet/hr_timesheet.py
View File

@ -43,7 +43,8 @@ class hr_analytic_timesheet(osv.osv):
_inherits = {'account.analytic.line': 'line_id'}
_order = "id desc"
_columns = {
'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'),
'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'),
'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id',relation='account.analytic.account',store=True),
}
def unlink(self, cr, uid, ids, context={}):

2
addons/partner_crm/__init__.py → addons/partner_infotab/__init__.py
View File

@ -19,7 +19,7 @@
#
##############################################################################
import partner_crm
import partner_infotab
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/partner_crm/__openerp__.py → addons/partner_infotab/__openerp__.py
View File

@ -21,7 +21,7 @@
{
'name': 'Detailed info on partner form',
'name': 'Detailed information on partner form',
'version': '1.0',
'category': 'Generic Modules/Base',
'description': """
@ -44,7 +44,7 @@ It adds the following fields on the partner form:
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
'partner_crm_view.xml'
'partner_infotab_view.xml'
],
'demo_xml': [],
'installable': True,

2
addons/partner_crm/partner_crm.py → addons/partner_infotab/partner_infotab.py
View File

@ -33,6 +33,8 @@ class res_partner(osv.osv):
'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'),
'contract_ids': fields.one2many('account.analytic.account', \
'partner_id', 'Contracts'),
'account_line_ids': fields.one2many('hr.analytic.timesheet', \
'partner_id', 'Anaylitic account lines '),
}
res_partner()

22
addons/partner_crm/partner_crm_view.xml → addons/partner_infotab/partner_infotab_view.xml
View File

@ -11,19 +11,19 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Other Info">
<group col="2" colspan="4">
<field name="opportunity_ids" colspan="4" nolabel="1" />
<field name="meeting_ids" colspan="4" nolabel="1" />
<page string="CRM Info">
<field name="opportunity_ids" colspan="4" nolabel="1" />
<field name="meeting_ids" colspan="4" nolabel="1" />
<field name="phonecall_ids" colspan="4" nolabel="1" />
</group>
<group col="2" colspan="4">
<field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
</group>
<group col="2" colspan="4">
<field name="contract_ids" colspan="4" nolabel="1" />
</group>
</page>
<page string="Other Info">
<field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
<field name="contract_ids" colspan="4" nolabel="1"/>
<field name="account_line_ids" colspan="4" nolabel="1" context="{'group_by':'date'}"/>
</page>
</notebook>
</field>
</record>

0
addons/partner_crm/security/ir.model.access.csv → addons/partner_infotab/security/ir.model.access.csv
View File

17
addons/sale_crm/process/sale_crm_process.xml
View File

@ -4,7 +4,6 @@
<!--
Process Node
-->
<record id="process_node_crmquotation0" model="process.node">
<field name="menu_id" ref="sale.menu_sale_order"/>
@ -17,17 +16,6 @@
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_crmopportunity0" model="process.node">
<field name="model_id" ref="crm.model_crm_case"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;CRM Opportunity&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;The CRM Opportunity can lead to a quotation.&quot;&quot;&quot;" name="note"/>
<field name="subflow_id" ref="crm.process_process_contractprocess0"/>
<field name="process_id" ref="sale.process_process_salesprocess0"/>
<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/>
</record>
<record id="process_node_contractanalytic0" model="process.node">
<field name="menu_id" ref="account.account_analytic_def_account"/>
<field name="model_id" ref="analytic.model_account_analytic_account"/>
@ -49,9 +37,6 @@
</record>
<!--
Process Transition
-->
<record id="process_transition_crmopportunityquotation" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
@ -90,5 +75,7 @@
<field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
</record>
-->
</data>
</openerp>

2
addons/sale_crm/sale_crm.py
View File

@ -25,7 +25,7 @@ class sale_order(osv.osv):
_inherit = 'sale.order'
_description = 'Sale orders'
_columns = {
'section_id': fields.many2one('crm.case.section', 'Section'),
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
}
def _get_section(self, cr, uid, context):

2
addons/sale_crm/sale_crm_view.xml
View File

@ -38,7 +38,7 @@
<filter icon="terp-crm"
domain="[('section_id','=',context.get('section_id',False))]"
groups="base.group_extended"
help="My section"/>
help="My Sales Team"/>
</field>
</field>
</field>