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

[MERGE] merged trunk-dev-addons2

Browse Source 
bzr revid: hmo@tinyerp.com-20100913124342-x0335pmsmrkf8vxg
bzr revid: hmo@tinyerp.com-20100913125139-u2hdi5jjhnzoq831
This commit is contained in:
Harry (OpenERP)
2010-09-13 18:21:39 +05:30
parent 6d18364f4e 5e6ccabb73
commit b9d8ec4b5a
37 changed files with 285 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_installer.xml
+10 -6
View File
@@ -8,10 +8,10 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Accounting Modules Configuration</attribute>
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Accounting System</attribute>
<attribute name="string">Configure Your Accounting Chart</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">Configure your accounting system. By default, Chart of Account is matching to your country. If there are not chart of account certified for your county, you can install the generic chart of account.</attribute>
@@ -66,13 +66,17 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Accounting Modules Configuration</attribute>
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Extra Accounting Modules</attribute>
<attribute name="string">Configure Your Accounting Application</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
<attribute name="string">From this screen, you can install Other Addons in your accounting Application. Select the Addons to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
@@ -100,7 +104,7 @@
</record>
<record id="action_account_installer" model="ir.actions.act_window">
<field name="name">Accounting Modules Installation</field>
<field name="name">Accounting Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.installer.modules</field>
<field name="view_id" ref="view_account_modules_installer"/>
addons/account/account_view.xml
+2 -2
View File
@@ -2227,11 +2227,11 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Generate Chart of Accounts from a Chart Template</attribute>
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string"
>Generate Chart of Accounts from a Chart Template</attribute>
>Generate Your Accounting Chart from a Chart Template</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
addons/association/profile_association.xml
+4 -4
View File
@@ -2,21 +2,21 @@
<openerp>
<data>
<record id="view_confirm_install_module_form" model="ir.ui.view">
<field name="name">Association Profile : Install extra modules</field>
<field name="name">Association Application Configuration</field>
<field name="model">profile.association.config.install_modules_wizard</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">Association Profile Configuration</attribute>
<attribute name="string">Association Application Configuration</attribute>
</form>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
</xpath>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">Install more modules. A few modules are proposed according to the Association Profile you selected. You will be able to install them based on our requirements.</attribute>
<attribute name="string">Install more applications. A few applications are proposed according to the Association Profile you selected. You will be able to install them based on our requirements.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
@@ -37,7 +37,7 @@
</record>
<record id="action_config_install_module" model="ir.actions.act_window">
<field name="name">Association Profile : Install Extra Modules</field>
<field name="name">Association Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">profile.association.config.install_modules_wizard</field>
<field name="view_id" ref="view_confirm_install_module_form"/>
addons/base_contact/base_contact_installer.py
-4
View File
@@ -29,7 +29,6 @@ class base_contact_installer(osv.osv_memory):
_columns = {
'name': fields.char('Name', size=64),
'migrate': fields.boolean('Migrate', help="If you select this, all addresses will be migrated."),
'nomigrate': fields.boolean('NoMigrate', help="If you select this, all addresses will not be migrated."),
}
def execute(self, cr, uid, ids, context=None):
@@ -54,15 +53,12 @@ class base_contact_installer(osv.osv_memory):
END;
$contactjob$ LANGUAGE plpgsql;
CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
cr.commit()
cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website) (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)")
cr.commit()
cr.execute("DROP TRIGGER IF EXISTS contactjob on res_partner_contact")
cr.execute("DROP LANGUAGE IF EXISTS plpgsql CASCADE;")
cr.execute("DROP FUNCTION IF EXISTS add_to_job()")
cr.commit()
base_contact_installer()
addons/base_contact/base_contact_installer_view.xml
+1 -1
View File
@@ -33,7 +33,6 @@
<group colspan="6">
<label string="Migrate:" colspan="1"/>
<field name="migrate" string="Yes" colspan="1"/>
<field name="nomigrate" string="No" colspan="1"/>
</group>
</group>
</group>
@@ -54,6 +53,7 @@
<record id="base_contact_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_base_contact_installer"/>
<field name="sequence">3</field>
<field name="state">skip</field>
</record>
</data>
addons/base_setup/base_setup_installer.xml
+8 -4
View File
@@ -8,7 +8,7 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Install OpenERP Modules</attribute>
<attribute name="string">Install Applications</attribute>
</form>
<xpath expr="//label[@string='description']"
position="attributes">
@@ -18,9 +18,13 @@
<attribute name='string'></attribute>
<attribute name='rowspan'>15</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Install</attribute>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Install Generic Modules</attribute>
<attribute name="string">Install Applications</attribute>
</separator>
<group colspan="8">
<field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
<field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
@@ -29,7 +33,7 @@
<field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
<field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
<field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
<separator string="Install Specific Business Modules" colspan="4"/>
<separator string="Install Specific Business Applications" colspan="4"/>
<field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
<field name="auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
<field name="product_expiry" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
@@ -39,7 +43,7 @@
</record>
<record id="action_base_setup_installer" model="ir.actions.act_window">
<field name="name">Base Setup Modules Installation</field>
<field name="name">Install Applications</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base.setup.installer</field>
<field name="view_id" ref="view_base_setup_installer"/>
addons/crm/__openerp__.py
+1
View File
@@ -84,6 +84,7 @@ Create dashboard for CRM that includes:
'wizard/crm_partner_to_opportunity_view.xml',
'wizard/crm_send_email_view.xml',
'wizard/crm_add_note_view.xml',
'wizard/crm_forward_to_partner_view.xml',
'wizard/crm_custom_create_menu_view.xml',
'wizard/crm_merge_opportunities_view.xml',
addons/crm/crm_action_rule.py
+2 -1
View File
@@ -96,7 +96,8 @@ this if you want the rule to send an email to the partner."),
res_count = True
if action.trg_max_history:
res_count = False
if len(obj.message_ids) <= action.trg_max_history:
history_ids = filter(lambda x: x.history, obj.message_ids)
if len(history_ids) <= action.trg_max_history:
res_count = True
ok = ok and res_count
return ok
addons/crm/crm_installer_view.xml
+4 -4
View File
@@ -8,15 +8,15 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">CRM Modules Configuration</attribute>
<attribute name="string">CRM Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Configure Your CRM System</attribute>
<attribute name="string">Configure Your CRM Application</attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute>
<attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP modules</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='rowspan'>13</attribute>
@@ -49,7 +49,7 @@
</record>
<record id="action_crm_installer" model="ir.actions.act_window">
<field name="name">CRM Modules Installation</field>
<field name="name">CRM Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">crm.installer</field>
<field name="view_id" ref="view_crm_installer"/>
addons/crm/crm_lead_view.xml
+7 -2
View File
@@ -175,6 +175,7 @@
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(crm.action_crm_send_mail)d"
@@ -210,11 +211,15 @@
</notebook>
</form>
</field>
<button colspan="2" string="Send New Email"
<button string="Add New Note"
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'crm.lead'}"
icon="terp-mail-message-new" type="action" />
<button colspan="2" string="Forward"
<button string="Forward"
name="%(crm_lead_forward_to_partner_act)d"
icon="terp-mail-forward" type="action" />
</page>
addons/crm/crm_opportunity_view.xml
+7 -2
View File
@@ -130,6 +130,7 @@
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(crm.action_crm_send_mail)d"
@@ -165,11 +166,15 @@
</notebook>
</form>
</field>
<button colspan="2" string="Send New Email"
<button string="Add New Note"
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'crm.lead'}"
icon="terp-mail-message-new" type="action" />
<button colspan="2" string="Forward"
<button string="Forward"
name="%(crm_lead_forward_to_partner_act)d"
icon="terp-mail-forward" type="action" />
</page>
addons/crm/crm_view.xml
+7 -2
View File
@@ -532,6 +532,7 @@
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(crm.action_crm_send_mail)d"
@@ -567,11 +568,15 @@
</notebook>
</form>
</field>
<button colspan="2" string="Send New Email"
<button string="Add New Note"
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'crm.case.custom'}"
icon="terp-mail-message-new" type="action" />
<button colspan="2" string="Forward to Partner"
<button string="Forward to Partner"
name="%(crm_lead_forward_to_partner_act)d"
icon="terp-mail-forward" type="action" />
</page>
addons/crm/wizard/__init__.py
+1
View File
@@ -21,6 +21,7 @@
import crm_send_email
import crm_forward_to_partner
import crm_add_note
import crm_lead_to_partner
import crm_lead_to_opportunity
addons/crm/wizard/crm_add_note.py
+62
View File
@@ -0,0 +1,62 @@
from crm import crm
from osv import fields, osv
from tools.translate import _
import base64
AVAILABLE_STATES = crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')]
class crm_add_note(osv.osv_memory):
"""Adds a new note to the case."""
_name = 'crm.add.note'
_description = "Add New Note"
_columns = {
'body': fields.text('Note Body', required=True),
'state': fields.selection(AVAILABLE_STATES, string='Set New State To',
required=True),
'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'),
}
def action_add(self, cr, uid, ids, context=None):
if not context:
context = {}
if not context.get('active_model'):
raise osv.except_osv(_('Error'), _('Can not add note!'))
model = context.get('active_model')
case_pool = self.pool.get(model)
for obj in self.browse(cr, uid, ids, context=context):
case_list = case_pool.browse(cr, uid, context['active_ids'],
context=context)
case = case_list[0]
user_obj = self.pool.get('res.users')
user_name = user_obj.browse(cr, uid, [uid], context=context)[0].name
attach = [
(x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
]
case_pool.history(cr, uid, [case], _("Note"), history=False,
details=obj.body, email_from=user_name, attach=attach)
if obj.state == 'unchanged':
pass
elif obj.state == 'done':
case_pool.case_close(cr, uid, [case.id])
elif obj.state == 'draft':
case_pool.case_reset(cr, uid, [case.id])
elif obj.state in ['cancel', 'open', 'pending']:
act = 'case_' + obj.state
getattr(case_pool, act)(cr, uid, [case.id])
return {}
def default_get(self, cr, uid, fields, context=None):
"""
This function gets default values
"""
return {'state': u'unchanged'}
crm_add_note()
addons/crm/wizard/crm_add_note_view.xml
+53
View File
@@ -0,0 +1,53 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- Add New Note view -->
<record model="ir.ui.view" id="crm_add_new_note_view">
<field name="name">crm.new.add.note.form</field>
<field name="model">crm.add.note</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Add Note" col="4">
<separator string="Add Note" colspan="6"/>
<notebook colspan="6">
<page string="Note">
<field name="body" nolabel="1" colspan="4" default_focus="1"/>
</page>
<page string="Attachments">
<field name="attachment_ids" colspan="4" nolabel="1">
<form string="Attachment">
<field name="binary" filename="name" />
<field name="name" />
</form>
<tree string="Attachments">
<field name="name" />
</tree>
</field>
</page>
</notebook>
<separator string="" colspan="6"/>
<group colspan="6" col="4" >
<field name="state" />
<button string="_Cancel" icon="gtk-cancel" special="cancel" />
<button name="action_add" type="object" string="_Add" icon="gtk-ok" />
</group>
</form>
</field>
</record>
<!-- Add New Note action -->
<record model="ir.actions.act_window" id="action_crm_add_note">
<field name="name">Add Note</field>
<field name="res_model">crm.add.note</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_add_new_note_view"/>
<field name="target">new</field>
</record>
</data>
</openerp>
addons/crm/wizard/crm_send_email.py
+5 -1
View File
@@ -28,6 +28,10 @@ import itertools
import tools
import re
AVAILABLE_STATES = crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')]
class crm_send_new_email_attachment(osv.osv_memory):
_name = 'crm.send.mail.attachment'
@@ -51,7 +55,7 @@ class crm_send_new_email(osv.osv_memory):
'email_cc' : fields.char('CC', size=512, help="These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"),
'subject': fields.char('Subject', size=512, required=True),
'body': fields.text('Message Body', required=True),
'state': fields.selection(crm.AVAILABLE_STATES, string='Set New State To', required=True),
'state': fields.selection(AVAILABLE_STATES, string='Set New State To', required=True),
'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'),
}
addons/crm_claim/crm_claim_view.xml
+8 -4
View File
@@ -205,10 +205,14 @@
</notebook>
</form>
</field>
<button colspan="4" string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'crm.claim'}"
icon="terp-mail-message-new" type="action" />
<button string="Add New Note"
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
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"/>
addons/crm_fundraising/crm_fundraising_view.xml
+6 -1
View File
@@ -161,6 +161,7 @@
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(crm.action_crm_send_mail)d"
@@ -196,7 +197,11 @@
</notebook>
</form>
</field>
<button colspan="4" string="Send New Email"
<button string="Add New Note"
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'crm.fundraising'}"
icon="terp-mail-message-new" type="action" />
addons/crm_helpdesk/crm_helpdesk_view.xml
+6 -1
View File
@@ -98,6 +98,7 @@
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(crm.action_crm_send_mail)d"
@@ -133,7 +134,11 @@
</notebook>
</form>
</field>
<button colspan="4" string="Send New Email"
<button string="Add New Note"
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'crm.helpdesk'}"
icon="terp-mail-message-new" type="action" />
addons/event/event_view.xml
+6 -1
View File
@@ -373,6 +373,7 @@
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(crm.action_crm_send_mail)d"
@@ -408,7 +409,11 @@
</notebook>
</form>
</field>
<button colspan="4" string="Send New Email"
<button string="Add New Note"
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'event.registration'}"
icon="terp-mail-message-new" type="action" />
addons/hr/hr_installer.xml
+4 -4
View File
@@ -10,16 +10,16 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Human Resources Modules Configuration</attribute>
<attribute name="string">Human Resources Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Select Human Resources Modules To Install</attribute>
<attribute name="string">Configure Your Human Resources Application</attribute>
</separator>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
</xpath>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">You can enhance the base HR addon by installing few HR-related applications.</attribute>
<attribute name="string">You can enhance the base HR Application by installing few HR-related modules.</attribute>
</xpath>
<group colspan="8">
<field name="hr_holidays"/>
@@ -40,7 +40,7 @@
</record>
<record id="action_hr_installer" model="ir.actions.act_window">
<field name="name">Human Resources Modules Installation</field>
<field name="name">Human Resources Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.installer</field>
<field name="view_id" ref="view_hr_installer"/>
addons/hr_recruitment/hr_recruitment_view.xml
+7 -2
View File
@@ -150,6 +150,7 @@
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(crm.action_crm_send_mail)d"
@@ -185,11 +186,15 @@
</notebook>
</form>
</field>
<button colspan="2" string="Send New Email"
<button string="Add New Note"
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'hr.applicant'}"
icon="terp-mail-message-new" type="action" />
<button colspan="2" string="Forward"
<button string="Forward"
name="%(crm.crm_lead_forward_to_partner_act)d"
icon="terp-mail-forward" type="action" />
</page>
addons/knowledge/knowledge_installer.xml
+3 -3
View File
@@ -8,12 +8,12 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Knowledge Modules Configuration</attribute>
<attribute name="string">Knowledge Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string"
>Knowledge Management</attribute>
>Configure Your Knowledge Application</attribute>
</separator>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
@@ -40,7 +40,7 @@
</record>
<record id="action_knowledge_installer" model="ir.actions.act_window">
<field name="name">Knowledge Modules Installation</field>
<field name="name">Knowledge Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">knowledge.installer</field>
<field name="view_id" ref="view_knowledge_installer"/>
addons/mail_gateway/mail_gateway.py
+8 -5
View File
@@ -122,6 +122,10 @@ class mailgate_thread(osv.osv):
obj = self.pool.get('mailgate.message')
for case in cases:
attachments = []
for att in attach:
attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])}))
partner_id = hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False
if not partner_id and case._name == 'res.partner':
partner_id = case.id
@@ -132,13 +136,12 @@ class mailgate_thread(osv.osv):
'partner_id': partner_id,
'res_id': case.id,
'date': time.strftime('%Y-%m-%d %H:%M:%S'),
'message_id': message_id,
'message_id': message_id,
'description': details or (hasattr(case, 'description') and case.description or False),
'attachment_ids': [(6, 0, attachments)]
}
attachments = []
if history:
for att in attach:
attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])}))
if history:
for param in (email, email_cc, email_bcc):
if isinstance(param, list):
param = ", ".join(param)
addons/marketing/marketing_view.xml
+3 -3
View File
@@ -12,10 +12,10 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Marketing Modules Configuration</attribute>
<attribute name="string">Marketing Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Select Marketing Modules to Install</attribute>
<attribute name="string">Configure Your Marketing Application</attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
@@ -39,7 +39,7 @@
</record>
<record id="action_marketing_installer" model="ir.actions.act_window">
<field name="name">Marketing Modules Installation</field>
<field name="name">Marketing Applications Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">marketing.installer</field>
<field name="view_id" ref="view_marketing_installer"/>
addons/mrp/mrp_installer.xml
+3 -3
View File
@@ -8,11 +8,11 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">MRP Modules Configuration</attribute>
<attribute name="string">MRP Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Manufacturing Resource Planning</attribute>
<attribute name="string">Configure Your Manufacturing Resource Planning Application</attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
@@ -36,7 +36,7 @@
</record>
<record id="action_mrp_installer" model="ir.actions.act_window">
<field name="name">MRP Modules Installation</field>
<field name="name">MRP Applications Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.installer</field>
<field name="view_id" ref="view_mrp_installer"/>
addons/outlook/installer.py
+1 -1
View File
@@ -40,7 +40,7 @@ class outlook_installer(osv.osv_memory):
_columns = {
'name':fields.char('File name', size=34),
'doc_name':fields.char('File name', size=64),
'outlook':fields.boolean('Outlook Module ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
'plugin_file':fields.binary('Outlook Plug-in', readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
'doc_file':fields.binary('Installation Manual', help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
'description':fields.text('Description', readonly=True)
addons/outlook/outlook_installer.xml
+14 -46
View File
@@ -12,13 +12,19 @@
<attribute name="string">Outlook Plug-In Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Outlook</attribute>
<attribute name="string">Outlook Plug-In</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
<xpath expr="//button[@string='Install Modules']" position="replace">
<button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
</xpath>
<xpath expr="//button[@string='Skip']" position="replace">
<button name="action_skip" icon="gtk-jump-to" special="cancel"
type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
@@ -43,7 +49,7 @@
</record>
<record id="action_outlook_installer" model="ir.actions.act_window">
<field name="name">Outlook Module Installation</field>
<field name="name">Outlook Plug-In Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">outlook.installer</field>
<field name="view_id" ref="view_outlook_installer"/>
@@ -57,53 +63,15 @@
<field name="sequence">4</field>
</record>
<!-- Configuration wizard. -->
<record id="view_outlook_wizard" model="ir.ui.view">
<field name="name">outlook.wizard</field>
<field name="model">outlook.installer</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string= "Outlook Plug-In Configuration">
<group colspan="4">
<separator string="Configure Outlook Module" colspan="4"/>
<group colspan="4" col="10">
<group colspan="2">
<image name="gtk-dialog-info"/>
<newline/>
<label align="0.0" string="This Module allows you to select an object that you would like to add to your email and its attachments from MS Outlook. You can select a partner, a task, a project, an analytical account, or any other object and Archived selected mail in mailgate.messages with attachments" width="200"/>
</group>
<group colspan="8">
<field name="outlook" invisible="1"/>
<field name="name" invisible="1"/>
<field name="doc_name" invisible="1"/>
<newline/>
<field name="plugin_file" filename="name"/>
<newline/>
<field name="doc_file" filename="doc_name"/>
<newline/>
<separator string="Outlook plugin installation note." colspan="4"/>
<field name="description" nolabel="1" colspan="8"/>
</group>
</group>
</group>
<separator string="" colspan="4"/>
<group colspan="4">
<label align="0.0" string="" colspan="3"/>
<button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
</group>
</form>
</field>
</record>
<record id="action_outlook_wizard" model="ir.actions.act_window">
<field name="name">Outlook Module Installation</field>
<field name="name">Outlook Plug-In Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">outlook.installer</field>
<field name="view_id" ref="view_outlook_wizard"/>
<field name="view_id" ref="view_outlook_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
<field name="context">{'menu':True}</field>
</record>
<menuitem id="base.menu_base_config_mail"
@@ -118,7 +86,7 @@
<menuitem id="menu_base_config_plugins_outlook"
action="action_outlook_wizard"
name="Outlook"
name="Outlook Plug-In"
parent="base.menu_base_config_plugins"
sequence="10" />
</data>
addons/profile_tools/misc_tools_installer.xml
+3 -3
View File
@@ -8,14 +8,14 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Tools Modules Configuration</attribute>
<attribute name="string">Tools Configuration</attribute>
</form>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Tools</attribute>
<attribute name="string">Configure Tools</attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
@@ -36,7 +36,7 @@
</record>
<record id="action_misc_tools_installer" model="ir.actions.act_window">
<field name="name">Tools Modules Installation</field>
<field name="name">Tools Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">misc_tools.installer</field>
<field name="view_id" ref="view_misc_tools_installer"/>
addons/project/project_installer.xml
+3 -3
View File
@@ -9,10 +9,10 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Project Modules Configuration</attribute>
<attribute name="string">Project Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Project Management</attribute>
<attribute name="string">Configure Your Project Management Application</attribute>
</separator>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
@@ -40,7 +40,7 @@
</record>
<record id="action_project_installer" model="ir.actions.act_window">
<field name="name">Project Modules Installation</field>
<field name="name">Project Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">project.installer</field>
<field name="view_id" ref="view_project_installer"/>
addons/project_issue/project_issue_view.xml
+6 -1
View File
@@ -80,6 +80,7 @@
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(crm.action_crm_send_mail)d"
@@ -116,7 +117,11 @@
</form>
</field>
<separator colspan="4"/>
<button colspan="4" string="Send New Email"
<button string="Add New Note"
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'project.issue'}"
icon="terp-mail-message-new" type="action" />
addons/purchase/wizard/purchase_installer.xml
+5 -5
View File
@@ -2,25 +2,25 @@
<openerp>
<data>
<record id="view_purchase_install_module_form" model="ir.ui.view">
<field name="name">Purchase Requisition</field>
<field name="name">Purchases Application Configuration</field>
<field name="model">purchase.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"> Purchase Modules Configuration</attribute>
<attribute name="string">Purchases Application Configuration</attribute>
</form>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
</xpath>
<separator string="title" position="attributes">
<attribute name="string"
>Configure Your Purchase System</attribute>
>Configure Your Purchases Management Application</attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">In this page, you can extend your purchase system with purchase requisition facility and analytic distribution of purchase orders.</attribute>
<attribute name="string">In this page, you can extend your purchases Application with purchase requisition facility and analytic distribution of purchase orders.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
@@ -34,7 +34,7 @@
</record>
<record id="action_purchase_install_module" model="ir.actions.act_window">
<field name="name">Purchase Profile : Install Extra Modules</field>
<field name="name">Purchases Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.installer</field>
<field name="view_id" ref="view_purchase_install_module_form"/>
addons/report_designer/report_designer_installer.xml
+3 -3
View File
@@ -8,14 +8,14 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Report Modules Configuration</attribute>
<attribute name="string">Reporting Tools Configuration</attribute>
</form>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
</xpath>
<separator string="title" position="attributes">
<attribute name="string"
>Reporting Tools</attribute>
>Configure Reporting Tools</attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
@@ -35,7 +35,7 @@
</record>
<record id="action_report_designer_installer" model="ir.actions.act_window">
<field name="name">Report Modules Installation</field>
<field name="name">Reporting Tools Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">report_designer.installer</field>
<field name="view_id" ref="view_report_designer_installer"/>
addons/sale/sale_installer.xml
+3 -3
View File
@@ -8,11 +8,11 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Sale Modules Configuration</attribute>
<attribute name="string">Sales Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Sales Management</attribute>
<attribute name="string">Configure Your Sales Management Application</attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
@@ -36,7 +36,7 @@
</record>
<record id="action_sale_installer" model="ir.actions.act_window">
<field name="name">Sale Management Modules Installation</field>
<field name="name">Sales Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.installer</field>
<field name="view_id" ref="view_sale_installer"/>
addons/survey/survey.py
+4 -2
View File
@@ -125,7 +125,8 @@ class survey(osv.osv):
'type': 'ir.actions.report.xml',
'report_name': 'survey.browse.response',
'datas': datas,
'context' : context
'context' : context,
'nodestroy':True,
}
else:
@@ -135,7 +136,8 @@ class survey(osv.osv):
'type': 'ir.actions.report.xml',
'report_name': 'survey.form',
'datas': datas,
'context' : context
'context' : context,
'nodestroy':True,
}
return report
survey()
addons/thunderbird/installer.py
+1 -1
View File
@@ -41,7 +41,7 @@ class thunderbird_installer(osv.osv_memory):
_columns = {
'name':fields.char('File name', size=34),
'pdf_name':fields.char('File name', size=64),
'thunderbird':fields.boolean('Thunderbird Module ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
'thunderbird':fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you’d like to add to your email and its attachments."),
'plugin_file':fields.binary('Thunderbird Plug-in', readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."),
'pdf_file':fields.binary('Installation Manual', help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
'description':fields.text('Description', readonly=True)
addons/thunderbird/thunderbird_installer.xml
+14 -46
View File
@@ -12,14 +12,20 @@
<attribute name="string">Thunderbird Plug-In Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Thunderbird</attribute>
<attribute name="string">Thunderbird Plug-In</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="replace">
<button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
</xpath>
<xpath expr="//button[@string='Skip']" position="replace">
<button name="action_skip" icon="gtk-jump-to" special="cancel"
type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
<attribute name='rowspan'>15</attribute>
@@ -44,7 +50,7 @@
</record>
<record id="action_thunderbird_installer" model="ir.actions.act_window">
<field name="name">Thunderbird Module Installation</field>
<field name="name">Thunderbird Plug-In Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">thunderbird.installer</field>
<field name="view_id" ref="view_thunderbird_installer"/>
@@ -58,58 +64,20 @@
<field name="sequence">3</field>
</record>
<!-- Configuration wizard. -->
<record id="view_thunderbird_wizard" model="ir.ui.view">
<field name="name">thunderbird.wizard</field>
<field name="model">thunderbird.installer</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string= "Thunderbird Installation">
<group colspan="4">
<separator string="Configure Thunderbird Module" colspan="4"/>
<group colspan="4" col="10">
<group colspan="2">
<image name="gtk-dialog-info"/>
<newline/>
<label align="0.0" string="This module allows you to archive an e-mail on one or more objects of OpenERP. You can attach an email to a partner, a task, an analytic account or any other object. You can also create a new object like a lead, a phone call, claim and many more." width="200"/>
</group>
<group colspan="8">
<field name="thunderbird" invisible="1"/>
<field name="name" invisible="1"/>
<field name="pdf_name" invisible="1"/>
<newline/>
<field name="plugin_file" filename="name"/>
<newline/>
<field name="pdf_file" filename="pdf_name"/>
<newline/>
<separator string="Installation and Configuration Steps" colspan="4"/>
<field name="description" nolabel="1" colspan="8"/>
</group>
</group>
</group>
<separator string="" colspan="4"/>
<group colspan="4">
<label align="0.0" string="" colspan="3"/>
<button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
</group>
</form>
</field>
</record>
<record id="action_thunderbird_wizard" model="ir.actions.act_window">
<field name="name">Thunderbird Module Installation</field>
<field name="name">Thunderbird Plug-In Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">thunderbird.installer</field>
<field name="view_id" ref="view_thunderbird_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
<field name="context">{'menu':True}</field>
</record>
<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10" />
<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird" parent="base.menu_base_config_plugins" sequence="10" />
<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
</data>
</openerp>