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

[MERGE] 

bzr revid: hmo@tinyerp.com-20100906073057-0u8wz5zsyzekb4gy
This commit is contained in:
Harry (OpenERP) 2010-09-06 13:00:57 +05:30
parent 7cc2e27105 75a7213498
commit 9b126ff0aa
35 changed files with 201 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/account/account_installer.xml
View File

@ -8,13 +8,13 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Accounting System Configuration</attribute>
<attribute name="string">Accounting Modules Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Accounting System</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs.</attribute>
<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>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
@ -66,7 +66,7 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Extra Accounting Modules Installation</attribute>
<attribute name="string">Accounting Modules Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Install Extra Accounting Modules In Your Accounting System</attribute>
@ -75,19 +75,15 @@
<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>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='rowspan'>23</attribute>
<attribute name='string'></attribute>
</xpath>
<group colspan="8">
<group colspan="4" height="450" width="600">
<group colspan="4">
<field name="account_analytic_plans"/>
<field name="account_payment"/>
<field name="account_followup"/>
<field name="account_voucher"/>
<!-- <field name="account_voucher_payment"/>-->
</group>
</group>
<field name="account_voucher"/>
<field name="account_followup"/>
<field name="account_payment"/>
<field name="account_analytic_plans"/>
<field name="account_anglo_saxon"/>
<!-- <field name="account_voucher_payment"/>-->
</group>
</data>
</field>

7
addons/account/installer.py
View File

@ -53,7 +53,7 @@ class account_installer(osv.osv_memory):
_columns = {
# Accounting
'charts':fields.selection(_get_charts, 'Chart of Accounts',
required=False,
required=True,
help="Installs localized accounting charts to match as closely as "
"possible the accounting needs of your company based on your "
"country."),
@ -625,7 +625,10 @@ class account_installer_modules(osv.osv_memory):
"per-partner policies."),
'account_voucher':fields.boolean('Voucher Management',
help="Account Voucher module includes all the basic requirements of "
"Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc... "),
"Voucher Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "),
'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
help="This module will support the Anglo-Saxons accounting methodology by "
"changing the accounting logic with stock transactions."),
# 'account_voucher_payment':fields.boolean('Voucher and Reconcile Management',
# help="Extension Account Voucher module includes allows to link payment / receipt "
# "entries with voucher, also automatically reconcile during the payment and receipt entries."),

32
addons/base_calendar/base_calendar.py
View File

@ -403,6 +403,7 @@ property or property parameter."),
else:
return datetime.strptime(idate, '%Y-%m-%d %H:%M:%S')
try:
# FIXME: why isn't this in CalDAV?
import vobject
except ImportError:
return res
@ -941,7 +942,7 @@ class calendar_event(osv.osv):
if not start_date:
return value
if not end_date and not duration:
duration = 8.00
duration = 1.00
value['duration'] = duration
if allday: # For all day event
@ -1113,8 +1114,8 @@ class calendar_event(osv.osv):
('cancelled', 'Cancelled')], 'State', readonly=True),
'exdate': fields.text('Exception Date/Times', help="This property \
defines the list of date/time exceptions for a recurring calendar component."),
'exrule': fields.char('Exception Rule', size=352, help="defines a \
rule or repeating pattern for an exception to a recurrence set"),
'exrule': fields.char('Exception Rule', size=352, help="Defines a \
rule or repeating pattern of time to exclude from the recurring rule."),
'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
string='Recurrent Rule', store=True, \
fnct_inv=_set_rrulestring, help='Defines a\
@ -1123,8 +1124,11 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU'),
'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
('weekly', 'Weekly'), ('monthly', 'Monthly'), \
('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency', states={'done': [('readonly', True)]}),
'alarm_id': fields.many2one('res.alarm', 'Alarm', states={'done': [('readonly', True)]}),
('yearly', 'Yearly'), ('custom', 'Custom')],
'Recurrency', states={'done': [('readonly', True)]},
help="Let the event automatically repeat at that interval"),
'alarm_id': fields.many2one('res.alarm', 'Alarm', states={'done': [('readonly', True)]},
help="Set an alarm at this time, before the event occurs" ),
'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
'recurrent_uid': fields.integer('Recurrent ID'),
'recurrent_id': fields.datetime('Recurrent ID date'),
@ -1133,15 +1137,15 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
'freq': fields.selection([('None', 'No Repeat'), \
('secondly', 'Secondly'), \
('minutely', 'Minutely'), \
('hourly', 'Hourly'), \
('daily', 'Daily'), \
('weekly', 'Weekly'), \
('monthly', 'Monthly'), \
('yearly', 'Yearly')], 'Frequency'),
'interval': fields.integer('Interval'),
'count': fields.integer('Count'),
('hourly', 'Hours'), \
('daily', 'Days'), \
('weekly', 'Weeks'), \
('monthly', 'Months'), \
('yearly', 'Years'), \
('secondly', 'Seconds'), \
('minutely', 'Minutes') ], 'Frequency'),
'interval': fields.integer('Interval', help="Repeat every x"),
'count': fields.integer('Count', help="Repeat max that times"),
'mo': fields.boolean('Mon'),
'tu': fields.boolean('Tue'),
'we': fields.boolean('Wed'),

20
addons/base_calendar/base_calendar_view.xml
View File

@ -245,7 +245,7 @@
attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
name="open_event" icon="gtk-edit"
type="object" />
<button string="ExRule"
<button string="Exclude range" groups="base.group_extended"
help="Add Exception Rule"
name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out" type="action"
context="{'model' : 'calendar.event'}"
@ -255,8 +255,8 @@
<group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
<separator string="Select data for Custom Rule" colspan="8"/>
<group col="8" colspan="4">
<field name="freq" />
<field name="interval" />
<field name="freq" />
<field name="count" />
<field name="end_date" />
</group>
@ -339,6 +339,22 @@
<field name="email" />
<field name="role" width="200" select="1" />
<field name="state" />
<button name="do_tentative"
states="needs-action,declined,accepted"
string="Uncertain" type="object"
icon="terp-crm" />
<button name="do_accept" string="Accept"
states="needs-action,tentative,declined"
type="object" icon="gtk-apply" />
<button name="do_decline" string="Decline"
states="needs-action,tentative,accepted"
type="object" icon="gtk-cancel" />
<button
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate" type="action"
icon="gtk-sort-descending"
states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
</tree>
<form string="Invitation details">
<notebook colspan="4">

3
addons/base_calendar/wizard/base_calendar_invite_attendee.py
View File

@ -48,7 +48,8 @@ send an Email to Invited Person')
}
_defaults = {
'type': lambda *x: 'internal'
'type': 'internal',
'send_mail': True
}
def do_invite(self, cr, uid, ids, context=None):

8
addons/base_calendar/wizard/base_calendar_set_exrule_view.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_base_calendar_set_exrule" model="ir.ui.view">
<record id="view_base_calendar_set_exrule" model="ir.ui.view">
<field name="name">base.calendar.set.exrule.form</field>
<field name="model">base.calendar.set.exrule</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Set Exrule">
<separator string="Select data for ExRule" colspan="8"/>
<separator string="Select range to Exclude" colspan="8"/>
<group col="8" colspan="6">
<field name="freq" />
<field name="interval" />
<field name="freq" />
<field name="count" />
<field name="end_date" />
</group>
@ -60,7 +60,7 @@
</record>
<record id="action_base_calendar_set_exrule" model="ir.actions.act_window">
<field name="name">Set Exrule</field>
<field name="name">Set Exclude range</field>
<field name="res_model">base.calendar.set.exrule</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>

23
addons/base_setup/base_setup_installer.xml
View File

@ -12,8 +12,7 @@
</form>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string"
>The most common applications have been pre selected. You can directly install them. You can either choose generic modules, or select modules for specific business sectors and industries. If you do not think you need any of these right now, you can easily install them later.</attribute>
<attribute name="string">Select applications you want to install. If you don't think you need any of these right now, you can easily install them later.</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>
@ -23,17 +22,17 @@
<attribute name="string">Install Generic Modules</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,misc_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,misc_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,misc_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,misc_tools,report_designer,association,auction)"/>
<field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
<field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,association,auction)"/>
<field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_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,misc_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,misc_tools,report_designer,association,auction)" groups="base.group_extended"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_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,misc_tools,report_designer,association,auction)"/>
<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)"/>
<field name="stock" 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="mrp" 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="account" 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="purchase" 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="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"/>
<field name="association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_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,misc_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,misc_tools,report_designer,association,auction)"/>
<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)"/>
</group>
</data>
</field>

14
addons/base_setup/installer.py
View File

@ -59,26 +59,24 @@ class base_setup_installer(osv.osv_memory):
help="Helps you manage your purchase-related processes such as "
"requests for quotations, supplier invoices, etc..."),
'hr':fields.boolean('Human Resources',
help="Helps you manage your human resources by encoding your "
"employee structure, generating work sheets, tracking "
"attendance and more."),
help="Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more"),
'point_of_sale':fields.boolean('Point of Sales',
help="Helps you get the most out of your points of sales with "
"fast sale encoding, simplified payment mode encoding, "
"automatic picking lists generation and more."),
'marketing':fields.boolean('Marketing',
help="Helps you manage your marketing campaigns step by step."),
'misc_tools':fields.boolean('Miscellaneous Tools',
help="Lets you install various interesting but non-essential "
"tools like Survey, Lunch,..."),
'profile_tools':fields.boolean('Miscellaneous Tools',
help="Lets you install various interesting but non-essential tools "
"like Survey, Lunch and Ideas box."),
'report_designer':fields.boolean('Advanced Reporting',
help="Lets you install various tools to simplify and enhance "
"OpenERP's report creation."),
'thunderbird' :fields.boolean('Thunderbird'),
# Vertical modules
'product_expiry':fields.boolean('Food Industry',
help="Installs a preselected set of OpenERP "
"applications which will help you manage foods."),
help="Installs a preselected set of OpenERP applications "
"which will help you manage your industry"),
'association':fields.boolean('Associations',
help="Installs a preselected set of OpenERP "
"applications which will help you manage your association "

12
addons/crm/crm_installer.py
View File

@ -34,13 +34,13 @@ class crm_installer(osv.osv_memory):
_columns = {
'name': fields.char('Name', size=64),
'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."),
'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."),
'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale to opportunity cases in the CRM."),
'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."),
'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."),
'outlook': fields.boolean('MS-Outlook', help="Microsoft Office Outlook Interface."),
'thunderbird': fields.boolean('Thunderbird', help="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"),
'outlook': fields.boolean('MS-Outlook', help="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"),
'wiki_sale_faq': fields.boolean('Sale FAQ', help="Sale FAQ."),
}

2
addons/crm/crm_installer_view.xml
View File

@ -39,7 +39,7 @@
<field name="fetchmail" />
</group>
<group colspan="2" col="2">
<separator string="Plugins" colspan="4" />
<separator string="Plug-In" colspan="4" />
<field name="thunderbird" />
<field name="outlook" />
</group>

22
addons/crm/crm_meeting_view.xml
View File

@ -51,7 +51,7 @@
attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
name="open_meeting" icon="gtk-edit"
type="object" />
<button string="ExRule"
<button string="Exclude range" groups="base.group_extended"
help="Add Exception Rule"
name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out" type="action"
context="{'model' : 'crm.meeting'}"
@ -59,10 +59,10 @@
</group>
</group>
<group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
<separator string="Data for Custom Rule" colspan="8"/>
<separator string="Custom Recurrency Rule" colspan="8"/>
<group col="8" colspan="4">
<field name="freq" />
<field name="interval" />
<field name="freq" />
<field name="count" />
<field name="end_date" />
</group>
@ -161,6 +161,22 @@
<field name="email" string="Mail TO"/>
<field name="role" select="1" />
<field name="state" />
<button name="do_tentative"
states="needs-action,declined,accepted"
string="Uncertain" type="object"
icon="terp-crm" />
<button name="do_accept" string="Accept"
states="needs-action,tentative,declined"
type="object" icon="gtk-apply" />
<button name="do_decline" string="Decline"
states="needs-action,tentative,accepted"
type="object" icon="gtk-cancel" />
<button
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate" type="action"
icon="gtk-sort-descending"
states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
</tree>
<form string="Invitation details">
<notebook colspan="4">

14
addons/email_template/email_template.py
View File

@ -133,22 +133,26 @@ class email_template(osv.osv):
'Recipient (To)',
size=250,
help="The Recipient of email. "
"Placeholders can be used here."),
"Placeholders can be used here. "
"e.g. ${object.email_to}"),
'def_cc':fields.char(
'CC',
size=250,
help="Carbon Copy address(es), comma-separated."
" Placeholders can be used here."),
" Placeholders can be used here. "
"e.g. ${object.email_cc}"),
'def_bcc':fields.char(
'BCC',
size=250,
help="Blind Carbon Copy address(es), comma-separated."
" Placeholders can be used here."),
" Placeholders can be used here. "
"e.g. ${object.email_bcc}"),
'reply_to':fields.char('Reply-To',
size=250,
help="The address recipients should reply to,"
" if different from the From address."
" Placeholders can be used here."),
" if different from the From address."
" Placeholders can be used here. "
"e.g. ${object.email_reply_to}"),
'message_id':fields.char('Message-ID',
size=250,
help="Specify the Message-ID SMTP header to use in outgoing emails. Please note that this overrides the Resource tracking option! Placeholders can be used here."),

10
addons/email_template/email_template_account_view.xml
View File

@ -25,7 +25,7 @@
<field name="smtptls" select="2" />
<field name="auto_delete" />
</group>
<button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" />
<button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" icon="gtk-network"/>
<separator string="User Information" colspan="4" />
<group col="2" colspan="2">
<field name="email_id" select="1" colspan="2" />
@ -41,10 +41,10 @@
</notebook>
<group colspan="4" col="10">
<field name="state" select="1"/>
<button string="Approve Account" name="button_approval" states="draft" type="workflow"/>
<button string="Suspend Account" name="button_suspended" states="approved" type="workflow" />
<button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" />
<button string="Send/Receive" name="send_receive" states="approved" type="object" />
<button string="Approve Account" name="button_approval" states="draft" type="workflow" icon="terp-camera_test"/>
<button string="Suspend Account" name="button_suspended" states="approved" type="workflow" icon="gtk-cancel"/>
<button string="Request Re-activation" name="get_reapprove" states="suspended" type="workflow" icon="gtk-convert"/>
<button string="Send/Receive" name="send_receive" states="approved" type="object" icon="terp-check"/>
</group>
</form>
</field>

6
addons/email_template/email_template_view.xml
View File

@ -109,17 +109,17 @@
</page>
</notebook>
<button name="%(wizard_email_template_preview)d" string="Preview Template"
type="action" colspan="4" target="new" />
type="action" colspan="4" target="new" icon="gtk-zoom-fit"/>
</group>
</page>
<page string="Advanced">
<group colspan="2" col="2">
<group colspan="2" col="2">
<separator string="Actions" colspan="2"/>
<button name="create_action" string="Create Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
<button name="create_action" string="Create Action" type="object" icon="gtk-execute" colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
<field name="ref_ir_act_window"/>
<field name="ref_ir_value"/>
<button name="delete_action" string="Delete Action" type="object" colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
<button name="delete_action" string="Delete Action" type="object" icon="gtk-delete" colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"/>
</group>
<group colspan="2" col="2">
<separator string="Advanced Options" colspan="2"/>

16
addons/email_template/i18n/en_US.po
View File

@ -221,8 +221,8 @@ msgstr "Download Full Mail"
#. module: email_template
#: help:email.template,def_to:0
msgid "The recipient of email.Placeholders can be used here."
msgstr "The recipient of email.Placeholders can be used here."
msgid "The recipient of email. Placeholders can be used here. e.g. ${object.email_to}"
msgstr "The recipient of email. Placeholders can be used here. e.g. ${object.email_to}"
#. module: email_template
#: view:email_template.mailbox:0
@ -275,8 +275,8 @@ msgstr "Tip: Multiple emails are sent in the same language (the first one is pro
#: help:email.template,reply_to:0
#: help:email_template.preview,reply_to:0
#: help:email_template.send.wizard,reply_to:0
msgid "The address recipients should reply to, if different from the From address. Placeholders can be used here."
msgstr "The address recipients should reply to, if different from the From address. Placeholders can be used here."
msgid "The address recipients should reply to, if different from the From address. Placeholders can be used here. e.g. ${object.email_reply_to}"
msgstr "The address recipients should reply to, if different from the From address. Placeholders can be used here. e.g. ${object.email_reply_to}"
#. module: email_template
#: field:email_template.mailbox,subject:0
@ -1127,8 +1127,8 @@ msgstr "Subject"
#. module: email_template
#: help:email.template,def_bcc:0
msgid "Blind Carbon Copy address(es), comma-separated. Placeholders can be used here."
msgstr "Blind Carbon Copy address(es), comma-separated. Placeholders can be used here."
msgid "Blind Carbon Copy address(es), comma-separated. Placeholders can be used here. e.g. ${object.email_bcc}"
msgstr "Blind Carbon Copy address(es), comma-separated. Placeholders can be used here. e.g. ${object.email_bcc}"
#. module: email_template
#: code:addons/email_template/email_template_account.py:0
@ -1159,8 +1159,8 @@ msgstr "email-template"
#. module: email_template
#: help:email.template,def_cc:0
msgid "Carbon Copy address(es), comma-separated. Placeholders can be used here."
msgstr "Carbon Copy address(es), comma-separated. Placeholders can be used here."
msgid "Carbon Copy address(es), comma-separated. Placeholders can be used here. e.g. ${object.email_cc}"
msgstr "Carbon Copy address(es), comma-separated. Placeholders can be used here. e.g. ${object.email_cc}"
#. module: email_template
#: selection:email_template.send.wizard,state:0

2
addons/hr/hr_installer.xml
View File

@ -19,7 +19,7 @@
<attribute name='string'></attribute>
</xpath>
<xpath expr="//label[@string='description']" position="attributes">
<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>
<attribute name="string">You can enhance the base HR addon by installing few HR-related applications.</attribute>
</xpath>
<group colspan="8">
<field name="hr_holidays"/>

7
addons/hr/installer.py
View File

@ -26,10 +26,7 @@ class hr_installer(osv.osv_memory):
_columns = {
# Human Resources Management
'hr_holidays': fields.boolean('Holidays / Leaves Management',
help="Tracks employee leaves allocations, requests and planning."
"\n\nCan also plug into OpenERP's agendas and calendars "
"applications in order to display accepted leaves requests on"
" OpenERP's calendars."),
help="Tracks employee leaves, allocation requests and planning."),
'hr_expense': fields.boolean('Expenses',
help="Tracks and manages employee expenses, and can "
"automatically re-invoice clients if the expenses are "
@ -45,7 +42,7 @@ class hr_installer(osv.osv_memory):
help="Lets you create and manage the periodic evaluation and "
"performance review of employees."),
'hr_attendance': fields.boolean('Attendances (Sign In/Out)',
help="Simplifies the management of employee attendances."),
help="Simplifies the management of employee's attendances."),
'hr_payroll': fields.boolean('Payroll',
help="Generic Payroll system"),
'hr_payroll_account': fields.boolean('Payroll Accounting',

4
addons/knowledge/i18n/en_US.po
View File

@ -72,8 +72,8 @@ msgstr "title"
#. module: knowledge
#: help:knowledge.installer,document_ftp:0
msgid "Provides an FTP access to your OpenERP's Document Management System. Lets you access attachments and virtual documents through a standard FTP client."
msgstr "Provides an FTP access to your OpenERP's Document Management System. Lets you access attachments and virtual documents through a standard FTP client."
msgid "Provides an FTP access to your OpenERP's Document Management System. It lets you access attachments and virtual documents through a standard FTP client."
msgstr "Provides an FTP access to your OpenERP's Document Management System. It lets you access attachments and virtual documents through a standard FTP client."
#. module: knowledge
#: model:ir.module.module,description:knowledge.module_meta_information

6
addons/knowledge/installer.py
View File

@ -27,9 +27,9 @@ class knowledge_installer(osv.osv_memory):
_columns = {
# Knowledge Management
'document_ftp':fields.boolean('Shared Repositories (FTP)',
help="Provides an FTP access to your OpenERP's Document "
"Management System. Lets you access attachments and "
"virtual documents through a standard FTP client."),
help="Provides an FTP access to your OpenERP's "
"Document Management System. It lets you access attachments "
"and virtual documents through a standard FTP client."),
'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
help="Provides a WebDAV access to your OpenERP's Document "
"Management System. Lets you access attachments and "

13
addons/marketing_campaign/marketing_campaign.py
View File

@ -526,7 +526,18 @@ class marketing_campaign_transition(osv.osv):
'interval_type': 'days',
'trigger': 'time',
}
def _check_campaign(self, cr, uid, ids, context=None):
if not context:
context = {}
for obj in self.browse(cr, uid, ids, context=context):
if obj.activity_from_id.campaign_id != obj.activity_to_id.campaign_id:
return False
return True
_constraints = [
(_check_campaign, _('The To/From Activity of transition must be of the same Campaign '), ['activity_from_id,activity_to_id']),
]
_sql_constraints = [
('interval_positive', 'CHECK(interval_nbr >= 0)', 'The interval must be positive or zero')
]
@ -581,7 +592,7 @@ class marketing_campaign_workitem(osv.osv):
'activity_id': fields.many2one('marketing.campaign.activity','Activity',
required=True, readonly=True),
'campaign_id': fields.related('activity_id', 'campaign_id',
type='many2one', relation='marketing.campaign', string='Campaign', readonly=True),
type='many2one', relation='marketing.campaign', string='Campaign', readonly=True, store=True),
'object_id': fields.related('activity_id', 'campaign_id', 'object_id',
type='many2one', relation='ir.model', string='Resource', select=1, readonly=True),
'res_id': fields.integer('Resource ID', select=1, readonly=True),

3
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -340,6 +340,7 @@
<field name="date"/>
<field name="state"/>
<field name="res_id" invisible="1"/>
<field name="campaign_id" invisible="1"/>
<button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
<button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
<button string="Cancel" states="todo" name="button_cancel" type="object" icon="terp-gtk-stop"/>
@ -404,7 +405,7 @@
<field name="date" select="1"/>
<newline/>
<group expand="0" string="Group By..." colspan="10" col="12">
<!--filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" /-->
<filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
<filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
<filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
<filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />

4
addons/mrp/installer.py
View File

@ -37,10 +37,10 @@ class mrp_installer(osv.osv_memory):
"procurement scheduler manually."),
'mrp_operations': fields.boolean('Manufacturing Operations',
help="Enhances production orders with readiness states as well "
"as the dates of start and end of execution of the order."),
"as the date of start and end of execution of the order."),
'mrp_subproduct': fields.boolean('MRP Subproducts',
help="Enables multiple product output from a single production "
"order: without this, a productio order can have only one "
"order : without this, a production order can have only one "
"output product."),
'mrp_repair': fields.boolean('Repairs',
help="Enables warranty and repair management (and their impact "

2
addons/mrp/mrp_installer.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">MRP Modules Installation</attribute>
<attribute name="string">MRP Modules Configuration</attribute>
</form>
<separator string="title" position="attributes">

25
addons/outlook/installer.py
View File

@ -50,21 +50,22 @@ class outlook_installer(osv.osv_memory):
'outlook' : True,
'name' : 'OpenERP-Outlook-PlugIn.zip',
'doc_name' : 'Installation Guide to OpenERP Outlook Plug-in.doc',
'description' : """ * Save the outlook plug­in.
* Follows the step to install outlook plug­in.
'description' : """
* Save the Outlook plug­-in.
* Follows these steps to install outlook plug­in.
Pre-requirements :
1) Python 2.6+ .
2) Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python.
1. Python 2.6+ .
2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python.
How to install openerp-outlook plug-in?
1) Extract zip file “openerp-outlook-plugin.zip” .
2) Open the folder openerp-outlook-plugin.
3) And Run “Register-plugin.bat” file.
4) Run Outlook and Check addin has been registered.
5) Tools->OpenERP Configuration and test your connection.
6) See User Guide for More.
7) Keep All extratced files in some safe palce
(e.g. python installation Directory "C:\pythonXX\\" or Windows installation Directory "C:\Program Files\\" ).
1. Extract zip file “openerp-outlook-plugin.zip” .
2. Open the folder openerp-outlook-plugin.
3. Run “Register-plugin.bat” file.
4. Run Outlook and Check addon has been registered.
5. Tools->OpenERP Configuration and test your connection.
6. See User Guide for more information.
7. Keep All extratced files in some safe places
(e.g. python installation Directory "C:\pythonXX\" or Windows installation Directory "C:\Program Files\" ).
"""
}
outlook_installer()

6
addons/outlook/outlook_installer.xml
View File

@ -9,13 +9,13 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Outlook Plug-In Installation</attribute>
<attribute name="string">Outlook Plug-In Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Outlook</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="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.</attribute>
<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>
@ -34,7 +34,7 @@
<newline/>
<field name="doc_file" filename="doc_name"/>
<newline/>
<separator string="Outlook plugin installation note." colspan="4"/>
<separator string="Installation and Configuration Steps" colspan="4"/>
<field name="description" nolabel="1" colspan="8"/>
</group>
</group>

10
addons/profile_tools/installer.py
View File

@ -25,11 +25,11 @@ class misc_tools_installer(osv.osv_memory):
_inherit = 'res.config.installer'
_columns = {
'lunch':fields.boolean('Lunch Orders',help='Installs tools for lunch module'),
'subscription':fields.boolean('Recurring Documents',help='Installs tools for subscription module'),
'survey':fields.boolean('Survey',help='Installs tools for survey module'),
'idea':fields.boolean('Idea',help='Installs tools for idea module'),
'audittrail':fields.boolean('Audit Trail',help='Installs tools for audittrail module'),
'lunch':fields.boolean('Lunch',help='Helps to manage Lunch Orders'),
'subscription':fields.boolean('Recurring Documents',help='Helps to add subscription on documents'),
'survey':fields.boolean('Survey',help='Manages Custom Surveys'),
'idea':fields.boolean('Idea',help='Manages ideas and votes'),
'audittrail':fields.boolean('Audit Trail',help="Lets you to track user's operations on specific Objects."),
}
_defaults = {
'lunch': True,

2
addons/profile_tools/misc_tools_installer.xml
View File

@ -19,7 +19,7 @@
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">Here are a few useful applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute>
<attribute name="string">Here are applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>

6
addons/project_caldav/project_caldav_view.xml
View File

@ -72,7 +72,7 @@
attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
name="open_meeting" icon="gtk-edit"
type="object" />
<button string="ExRule"
<button string="Exclude range" groups="base.group_extended"
help="Add Exception Rule"
name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out" type="action"
context="{'model' : 'project.task'}"
@ -80,10 +80,10 @@
</group>
<newline/>
<group col="4" colspan="6" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
<separator string="Data for Custom Rule" colspan="8"/>
<separator string="Custom Recurrency Rule" colspan="8"/>
<group col="8" colspan="4">
<field name="freq" />
<field name="interval" />
<field name="freq" />
<field name="count" />
<field name="end_date" />
</group>

2
addons/purchase/wizard/purchase_installer.py
View File

@ -25,7 +25,7 @@ class purchase_installer(osv.osv_memory):
_inherit = 'res.config.installer'
_columns = {
'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allow you to easily keep track and manage all your purchase orders."),
'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders.")
}
purchase_installer()

6
addons/report_designer/installer.py
View File

@ -29,14 +29,14 @@ class report_designer_installer(osv.osv_memory):
'base_report_designer':fields.boolean('OpenOffice Report Designer',help="This module adds wizards to import/export .SXW report that "
"you can modify in OpenOffice.Once you have modified it you can "
"upload the report using the same wizard."),
'base_report_creator':fields.boolean('Query Builder',help="his module allows you to create any statistic "
'base_report_creator':fields.boolean('Query Builder',help="Query Builder allows you to create any statistic "
"reports on several objects. It's a SQL query builder and browser for and users. "
"After installation, it adds a menu to define custom report in the Dashboard menu."),
'olap':fields.boolean('Business Intelligence Report',help="Olap module is used to install BI module in client. Olap provides Online "
"Analytical Process with the mdx query. BI provides Cube Browsing and Cube Designing. "
"After installation you will get Cube Browser and Cube Desinger in Reporting Menu. "
"After installation you will get Cube Browser and Cube Designer in Reporting Menu. "
"Cube Browser is used to generate the reports with table view (mdx view) of mdx query "
"and Cube designer is used to make cubes in BI."),
"and Cube Designer is used to make cubes in BI."),
}
report_designer_installer()

2
addons/report_designer/report_designer_installer.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Report Modules Installation</attribute>
<attribute name="string">Report Modules Configuration</attribute>
</form>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='string'></attribute>

4
addons/sale/sale_installer.py
View File

@ -26,8 +26,8 @@ class sale_installer(osv.osv_memory):
_inherit = 'res.config.installer'
_columns = {
'sale_analytic_plans': fields.boolean('Sales Analytic Distribution Management',
help="The base module to manage analytic distribution and sales orders."),
'sale_analytic_plans': fields.boolean('Sales Analytic Distribution',
help="The base module to manage analytic distribution and sale orders."),
'sale_journal': fields.boolean('Sales and deliveries by journal',
help="The sale journal modules allows you to categorise your "
"sales and deliveries (picking lists) between different journals. "

2
addons/sale/sale_installer.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Sale Management Modules Configuration</attribute>
<attribute name="string">Sale Modules Configuration</attribute>
</form>
<separator string="title" position="attributes">

30
addons/thunderbird/installer.py
View File

@ -51,21 +51,21 @@ class thunderbird_installer(osv.osv_memory):
'thunderbird' : True,
'name' : 'openerp_plugin.xpi',
'pdf_name' : 'Installation Guide to OpenERP Thunderbid Plug-in.pdf',
'description' : """* Save the Thunderbird plug-­in.
* Follow the following steps to install Thunderbird plug-­in.
1. From Menu Bar of Thunderbird, open Tools ­> Add-ons.
2. Click install button and a browser window appears.
3. Select the plug-in(openerp_plugin.xpi file) and click Ok.
4. A software installation window appears and within a short time “Install Now” button will be enabled.
5. Click "Install Now".
6. Restart Thunderbird.
* Follow the steps to configure OpenERP in Thunderbird.
1. Go to Tools > OpenERP Configuration.
2. Check data (configured by default).
3. Click "Connect".
4. A message appears with state of your connection.
5. If your connection failed, check if your database is open, and check your data again.
6. If your database is connected successfully, you can start to archive your e-mail in OpenERP. """
'description' : """
* Save the Thunderbird plug-­in.
* Follow these steps to install Thunderbird plug-­in.
1. From Menu Bar of Thunderbird, open Tools ­> Add-ons.
2. Click "Install" button.
3. Select the plug-in(openerp_plugin.xpi file)
5. Click "Install Now".
6. Restart Thunderbird.
* Follow the steps to configure OpenERP in Thunderbird.
1. Go to Tools > OpenERP Configuration.
2. Check data (configured by default).
3. Click "Connect".
4. A message appears with the state of your connection.
5. If your connection failed, check if your database is opened, and check data again.
6. If your database is connected successfully, you can start to archive your e-mail in OpenERP. """
}
thunderbird_installer()

8
addons/thunderbird/thunderbird_installer.xml
View File

@ -9,13 +9,13 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Thunderbird Module Installation</attribute>
<attribute name="string">Thunderbird Plug-In Configuration</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Thunderbird</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="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.</attribute>
<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>
@ -35,7 +35,7 @@
<newline/>
<field name="pdf_file" filename="pdf_name"/>
<newline/>
<separator string="Thunderbird plugin installation note." colspan="4"/>
<separator string="Installation and Configuration Steps" colspan="4"/>
<field name="description" nolabel="1" colspan="8"/>
</group>
</group>
@ -84,7 +84,7 @@
<newline/>
<field name="pdf_file" filename="pdf_name"/>
<newline/>
<separator string="Thunderbird plugin installation note." colspan="4"/>
<separator string="Installation and Configuration Steps" colspan="4"/>
<field name="description" nolabel="1" colspan="8"/>
</group>
</group>