pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge with main trunk addons

Browse Source 
bzr revid: mra@tinyerp.com-20100528123823-1dqoekk14sghh6hu
This commit is contained in:
mra (Open ERP)
2010-05-28 18:08:23 +05:30
parent a8af6dbac5 1d4290ff9d
commit f52bdf2ae8
17 changed files with 254 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_analytic_entries_report_view.xml
+2 -2
View File
@@ -35,10 +35,10 @@
<field name="arch" type="xml">
<search string="Analytic Entries Analysis">
<group col="10" colspan="12">
<filter icon="gtk-media-rewind" string="Last 365 Days"
<filter icon="gtk-media-rewind" string=" 365 Days "
domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Analytic Entries of last 365 days"/>
<filter icon="gtk-media-rewind" string="Last 30 Days"
<filter icon="gtk-media-rewind" string=" 30 Days "
name="month"
domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Analytic Entries of last 30 days"/>
addons/account/report/account_analytic_report_view.xml
+2 -2
View File
@@ -36,10 +36,10 @@
<field name="arch" type="xml">
<search string="Analytic Accounts Analysis">
<group>
<filter icon="gtk-media-rewind" string="Last 365 Days"
<filter icon="gtk-media-rewind" string=" 365 Days "
domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Analytic Accounts of last 365 days"/>
<filter icon="gtk-media-rewind" string="Last 30 Days"
<filter icon="gtk-media-rewind" string=" 30 Days "
name="This Month"
domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Analytic Accounts of last 30 days"/>
addons/account/report/account_entries_report_view.xml
+2 -2
View File
@@ -50,10 +50,10 @@
<field name="arch" type="xml">
<search string="Entries Analysis">
<group colspan="10" col="12">
<filter icon="gtk-media-rewind" string="Last 365 Days"
<filter icon="gtk-media-rewind" string=" 365 Days "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Entries of last 365 days"/>
<filter icon="gtk-media-rewind" string="Last 30 Days"
<filter icon="gtk-media-rewind" string=" 30 Days "
name="This Month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Entries of last 30 days"/>
addons/account/report/account_invoice_report_view.xml
+2 -2
View File
@@ -54,10 +54,10 @@
<field name="arch" type="xml">
<search string="Invoices Analysis">
<group col="10" colspan="12">
<filter icon="gtk-media-rewind" string="Last 365 Days"
<filter icon="gtk-media-rewind" string=" 365 Days "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Invoices of last 365 days"/>
<filter icon="gtk-media-rewind" string="Last 30 Days"
<filter icon="gtk-media-rewind" string=" 30 Days "
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Invoices of last 30 days"/>
addons/hr_evaluation/report/hr_evaluation_report_view.xml
+6 -6
View File
@@ -6,7 +6,7 @@
<field name="model">hr.evaluation.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluations Statistics">
<tree string="Evaluations Analysis">
<field name="create_date" invisible="1"/>
<field name="employee_id" invisible="1"/>
<field name="deadline" invisible="1"/>
@@ -27,7 +27,7 @@
<field name="model">hr.evaluation.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Evaluations" type="bar">
<graph string="Evaluations Analysis" type="bar">
<field name="employee_id"/>
<field name="nbr" operator="+"/>
<field name="state" group="True"/>
@@ -40,12 +40,12 @@
<field name="model">hr.evaluation.report</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Evaluations">
<search string="Evaluations Analysis">
<group>
<filter icon="gtk-media-rewind" string="Last 365 Days"
<filter icon="gtk-media-rewind" string="365 Days"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in last 365 days"/>
<filter icon="gtk-media-rewind" string="Last 30 Days"
<filter icon="gtk-media-rewind" string="30 Days"
name="month"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in last 30 days"/>
@@ -99,7 +99,7 @@
</record>
<record id="action_evaluation_report_all" model="ir.actions.act_window">
<field name="name">Evaluations</field>
<field name="name">Evaluations Analysis</field>
<field name="res_model">hr.evaluation.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
addons/hr_expense/report/hr_expense_report_view.xml
+41 -49
View File
@@ -6,7 +6,7 @@
<field name="model">hr.expense.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Expenses Statistics">
<tree string="Expenses Analysis">
<field name="date" invisible="1"/>
<field name="employee_id" invisible="1"/>
<field name="user_id" invisible="1"/>
@@ -36,7 +36,7 @@
<field name="model">hr.expense.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Expenses Statistics" type="bar">
<graph string="Expenses Analysis" type="bar">
<field name="user_id"/>
<field name="state" group="True"/>
<field name="nbr" operator="+"/>
@@ -49,42 +49,42 @@
<field name="model">hr.expense.report</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Expenses">
<search string="Expenses Analysis">
<group>
<filter icon="terp-hr" string="Last 365 Days"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 year"/>
<filter icon="terp-hr" string="This Month"
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last month"/>
<filter icon="gtk-media-rewind" string=" 365 Days "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 year"/>
<filter icon="gtk-media-rewind" string=" 30 Days "
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last month"/>
<filter icon="gtk-media-rewind"
string=" 7 Days "
separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 days"/>
string=" 7 Days "
separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Expenses during last 7 days"/>
<separator orientation="vertical"/>
<filter string="Draft"
icon="terp-hr"
domain="[('state','=','draft')]"
help = "Draft Expenses"/>
icon="terp-hr"
domain="[('state','=','draft')]"
help = "Draft Expenses"/>
<filter string="Waiting"
icon="terp-hr"
domain="[('state', '=' ,'confirm')]"
help = "Confirm Expenses"/>
icon="terp-hr"
domain="[('state', '=' ,'confirm')]"
help = "Confirm Expenses"/>
<filter string="Accepted"
icon="terp-hr"
domain="[('state','=','accepted')]"
help = "Accepted Expenses"/>
icon="terp-hr"
domain="[('state','=','accepted')]"
help = "Accepted Expenses"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection">
<filter icon="terp-hr"
string="Expenses Non Assigned User"
help="Expenses Non Assigned User"
domain="[('user_id','=',False)]"/>
</field>
<field name="product_id"/>
<field name="employee_id" widget="selection"/>
<field name="user_id" widget="selection">
<filter icon="terp-hr"
string="My Expenses"
help="My Expenses"
domain="[('user_id','=',uid)]"/>
</field>
</group>
<newline/>
<group expand="1" string="Group By...">
@@ -106,37 +106,29 @@
</group>
<newline/>
<group expand="0" string="Extended filters..." groups="base.group_extended">
<filter string="Invoiced"
icon="terp-hr"
domain="[('state','=','invoiced')]"
help = "Invoiced Expenses"/>
<filter string="Reimbursed"
icon="terp-hr"
domain="[('state','=','paid')]"
help = "Reimbursed Expenses"/>
<filter string="Cancelled"
icon="terp-hr"
domain="[('state','=','cancelled')]"
help = "Cancelled Expenses"/>
<separator orientation="vertical"/>
<field name="state"/>
<separator orientation="vertical"/>
<field name="date_confirm"/>
<separator orientation="vertical"/>
<field name="journal_id" widget="selection"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<newline/>
<field name="department_id" widget="selection"/>
<field name="journal_id" widget="selection"/>
<field name="currency_id" widget="selection"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<newline/>
<field name="date_confirm"/>
<separator orientation="vertical"/>
<field name="date_valid"/>
<separator orientation="vertical"/>
<field name="currency_id" widget="selection"/>
</group>
</search>
</field>
</record>
<record id="action_hr_expense_report_all" model="ir.actions.act_window">
<field name="name">Expenses</field>
<field name="name">Expenses Analysis</field>
<field name="res_model">hr.expense.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_expense_report_search"/>
</record>
addons/hr_recruitment/report/hr_recruitment_report.py
+2 -6
View File
@@ -35,7 +35,7 @@ class hr_recruitment_report(osv.osv):
_description = "Recruitments Statistics"
_auto = False
_rec_name = 'date'
def _get_data(self, cr, uid, ids, field_name, arg, context={}):
""" @param cr: the current row, from the database cursor,
@@ -73,9 +73,7 @@ class hr_recruitment_report(osv.osv):
return res
_columns = {
'name': fields.char('Year', size=64, required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'nbr': fields.integer('# of Cases', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
@@ -88,8 +86,7 @@ class hr_recruitment_report(osv.osv):
('09', 'September'), ('10', 'October'),\
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
'create_date': fields.datetime('Create Date', readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'year': fields.char('Year', size=4, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
@@ -99,7 +96,6 @@ class hr_recruitment_report(osv.osv):
'date_closed': fields.date('Closed', readonly=True),
'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
# 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]",readonly=True),
'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
'department_id':fields.many2one('hr.department','Department',readonly=True),
'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
addons/hr_recruitment/report/hr_recruitment_report_view.xml
+30 -47
View File
@@ -6,7 +6,7 @@
<field name="model">hr.recruitment.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Recruitments Statistics">
<tree string="Recruitment Analysis">
<field name="date" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="job_id" invisible="1"/>
@@ -33,7 +33,7 @@
<field name="model">hr.recruitment.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Recruitments Statistics" type="bar">
<graph string="Recruitment Analysis" type="bar">
<field name="job_id"/>
<field name="nbr" operator="+"/>
</graph>
@@ -45,66 +45,56 @@
<field name="model">hr.recruitment.report</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Recruitments">
<search string="Recruitment Analysis">
<group>
<filter icon="terp-hr" string="This Year"
<filter icon="gtk-media-rewind" string="365 Days"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in this year"/>
<filter icon="terp-hr" string="This Month"
help="Recruitment performed in last 356 days"/>
<filter icon="gtk-media-rewind" string="30 Days"
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in this month"/>
help="Recruitment performed in this month"/>
<filter icon="gtk-media-rewind"
string=" 7 Days "
separator="1"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Tasks during last 7 days"/>
help="Recruitment during last 7 days"/>
<separator orientation="vertical"/>
<filter string="Draft"
icon="terp-hr"
domain="[('state','=','draft')]"
help = "Draft tasks"/>
help = "Draft recruitment"/>
<filter string="Current"
icon="terp-hr"
domain="[('state', '=' ,'open')]"
help = "In progress tasks"/>
help = "In progress recruitment"/>
<filter string="Pending"
icon="terp-hr"
domain="[('state','=','pending')]"
help = "Pending tasks"/>
help = "Pending recruitment"/>
<separator orientation="vertical"/>
<field name="department_id" widget="selection">
<filter icon="terp-hr"
string="My Recruitments "
help="My Department Recruitments"
domain="[('user_id','=',uid)]"/>
<filter icon="terp-hr"
string="Recruitments non assigned to departments"
help="Recruitments non assigned to departments"
domain="[('user_id','=',False)]"/>
<field name="partner_id"/>
<field name="department_id" widget="selection"/>
<field name="user_id" widget="selection">
<filter icon="terp-hr"
string="My Recruitment"
help="My Recruitment"
domain="[('user_id','=',uid)]"/>
</field>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="user_id" widget="selection">
<filter icon="terp-hr"
string="Recruitments non assigned"
help="Recruitments non assigned"
domain="[('user_id','=',False)]"/>
</field>
</group>
<newline/>
<newline/>
<group expand="1" string="Group By ...">
<filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
<separator orientation="vertical"/>
<filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
<filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
<separator orientation="vertical"/>
<filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
<filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
<separator orientation="vertical"/>
<filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
<filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
@@ -112,37 +102,30 @@
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<filter icon="terp-hr"
string="Hired"
name="done"
domain="[('state','=','done')]"/>
<field name="state"/>
<separator orientation="vertical"/>
<field name="date"/>
<separator orientation="vertical"/>
<field name="priority"/>
<field name="stage_id" widget="selection"/>
<field name="job_id" widget="selection"/>
<newline/>
<filter icon="terp-hr"
string="Refused"
domain="[('state','=','cancel')]"/>
<field name="type_id" widget="selection"/>
<newline/>
<field name="priority"/>
<separator orientation="vertical"/>
<field name="date_closed"/>
<separator orientation="vertical"/>
<field name="type_id" widget="selection"/>
<field name="partner_id"/>
<field name="partner_address_id"/>
</group>
<field name="job_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</search>
</field>
</record>
<record id="action_hr_recruitment_report_all" model="ir.actions.act_window">
<field name="name">Recruitments</field>
<field name="name">Recruitment Analysis</field>
<field name="res_model">hr.recruitment.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
</record>
<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
addons/marketing/__init__.py
+25
View File
@@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import marketing_wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/marketing/__openerp__.py
+37
View File
@@ -0,0 +1,37 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
"name" : "Marketing",
"version" : "1.1",
"depends" : ["base"],
"author" : "Tiny",
"category": 'Generic Modules/Marketing',
"description": "Menu for Marketing",
'website': 'http://www.openerp.com',
'init_xml': [],
'update_xml': ['marketing_view.xml'],
'demo_xml': [],
'installable': True,
'active': False,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/marketing/marketing_view.xml
+52
View File
@@ -0,0 +1,52 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="10"/>
<record id="view_marketing_installer" model="ir.ui.view">
<field name="name">marketing.installer.view</field>
<field name="model">marketing.installer</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Marketing Modules Installation</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Marketing System</attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">You can enhance OpenERP's basic Marketing support with a few additional OpenERP applications</attribute>
</xpath>
<group colspan="8">
<group colspan="2" col="2">
<separator string="Marketing Mdules" colspan="4" />
<field name="marketing_campaign" />
<field name="crm_profiling" />
</group>
</group>
</data>
</field>
</record>
<record id="action_marketing_installer" model="ir.actions.act_window">
<field name="name">Marketing Modules Installation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">marketing.installer</field>
<field name="view_id" ref="view_marketing_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="marketing_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_marketing_installer"/>
<field name="sequence">3</field>
</record>
</data>
</openerp>
addons/marketing/marketing_wizard.py
+38
View File
@@ -0,0 +1,38 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
class marketing_installer(osv.osv_memory):
_name = 'marketing.installer'
_inherit = 'res.config.installer'
_columns = {
# Generic modules
'marketing_campaign':fields.boolean('Marketing Campaign',
help="Helps you to manage your marketing campaigns step by step."),
'crm_profiling':fields.boolean('Crm Profile',
help="Helps you to perform segmentation within partners.")
}
marketing_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/marketing_campaign/__openerp__.py
+3 -1
View File
@@ -23,7 +23,8 @@
{
"name" : "",
"version" : "1.1",
"depends" : ["crm",
"depends" : ["marketing",
"crm",
"document",
"poweremail" # need to get this module form the branch
# lp:poweremail
@@ -39,6 +40,7 @@
'marketing_campaign_data.xml',
'marketing_campaign_workflow.xml',
'report/campaign_analysis_view.xml',
'marketing_campaign_demo.xml'
],
'demo_xml': [
'marketing_campaign_demo.xml',
addons/marketing_campaign/marketing_campaign_view.xml
+6 -5
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Direct Marketing" id="menu_marketing" parent="base.menu_base_partner"/>
<!--
======================
Marketing Campaign
@@ -168,8 +168,9 @@
</record>
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing" action="action_marketing_campaign_form" sequence="10" />
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
<menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
<!--
======================
Marketing Segments
@@ -262,7 +263,7 @@
<field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_create_date': 1}</field>
</record>
<menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing" action="action_marketing_campaign_segment_form" sequence="20" />
<menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" />
<!--
======================
@@ -437,7 +438,7 @@
<field name="context">{'group_by': [], 'search_default_todo': 1}</field>
</record>
<menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
<menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
</data>
</openerp>
addons/marketing_campaign/report/campaign_analysis_view.xml
+4 -3
View File
@@ -61,15 +61,16 @@
</record>
<record id="action_campaign_analysis_all" model="ir.actions.act_window">
<field name="name">Marketing Report</field>
<field name="name">Campaigns</field>
<field name="res_model">campaign.analysis</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1}</field>
<field name="search_view_id" ref="view_campaign_analysis_search"/>
</record>
<menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing" sequence="40"/>
<menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
<menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing_reporting" sequence="40"/>
</data>
</openerp>
addons/sale/report/sale_report.py
-5
View File
@@ -36,13 +36,8 @@ class sale_report(osv.osv):
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
<<<<<<< TREE
'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True),
'product_qty':fields.float('# of Qty', readonly=True),
=======
'uom_name': fields.char('Default UoM', size=128, readonly=True),
'product_uom_qty':fields.float('# of Qty', readonly=True),
>>>>>>> MERGE-SOURCE
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
addons/stock/report/report_stock_picking_view.xml
+2 -2
View File
@@ -54,10 +54,10 @@
<field name="arch" type="xml">
<search string="Search">
<group col="16" colspan="6">
<filter icon="gtk-media-rewind" string="Last 365 Days"
<filter icon="gtk-media-rewind" string=" 365 Days "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Picking in last 365 days"/>
<filter icon="gtk-media-rewind" string="Last 30 Days"
<filter icon="gtk-media-rewind" string=" 30 Days "
name="month"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Picking in last 30 days"/>