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

[MERGE]merge with parent branch

Browse Source 
bzr revid: sgo@tinyerp.com-20120608133423-rv33zgeckkm4fvt0
This commit is contained in:
Sanjay Gohel (Open ERP)
2012-06-08 19:04:23 +05:30
parent 4cf3671e60 cd519494e6
commit 17df69b548
5 changed files with 182 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_sequence/account_sequence_installer_view.xml
+52 -53
View File
@@ -1,56 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data>
<record id="view_account_sequence_installer" model="ir.ui.view">
<field name="name">account.sequence.installer.view</field>
<field name="model">account.sequence.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">Account Sequence Application Configuration</attribute>
</form>
<separator string="title" position="before">
<label string="You can enhance the Account Sequence Application by installing ."/>
</separator>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" position="inside">
<field name="name" colspan="4"/>
<field name="prefix"/>
<field name="suffix"/>
<field name="number_next"/>
<field name="number_increment"/>
<field name="padding"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Account Sequence Application</attribute>
</separator>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
</data>
</field>
</record>
<record id="view_account_sequence_installer" model="ir.ui.view">
<field name="name">account.sequence.installer.view</field>
<field name="model">account.sequence.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">Account Sequence Application Configuration</attribute>
</form>
<separator string="title" position="before">
<label string="You can enhance the Account Sequence Application by installing ."/>
</separator>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" position="inside">
<field name="name" colspan="4"/>
<field name="prefix"/>
<field name="suffix"/>
<field name="number_next"/>
<field name="number_increment"/>
<field name="padding"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Account Sequence Application</attribute>
</separator>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
</data>
</field>
</record>
<record id="action_account_seq_installer" model="ir.actions.act_window">
<field name="name">Account Sequence Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.sequence.installer</field>
<field name="view_id" ref="view_account_sequence_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="account_seq_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_seq_installer"/>
<field name="category_id" ref="account.category_accounting_configuration"/>
<field name="sequence">3</field>
<field name="type">automatic</field>
</record>
</data>
<record id="action_account_seq_installer" model="ir.actions.act_window">
<field name="name">Account Sequence Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.sequence.installer</field>
<field name="view_id" ref="view_account_sequence_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="account_seq_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_seq_installer"/>
<field name="category_id" ref="account.category_accounting_configuration"/>
<field name="sequence">3</field>
<field name="type">automatic</field>
</record>
</data>
</openerp>
addons/base_report_designer/base_report_designer_installer.xml
+63 -70
View File
@@ -1,72 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_report_designer_installer" model="ir.ui.view">
<field name="name">Form View: OpenERP Report Designer Installation</field>
<field name="model">base_report_designer.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">OpenERP Report Designer Configuration</attribute>
</form>
<separator string="title" position="before">
<label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
</separator>
<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='Cancel']" position="replace">
<button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
</xpath>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" height="450" width="750">
<field name="name" invisible="1"/>
<field name="plugin_file" filename="name"/>
<separator string="Installation and Configuration Steps" colspan="4"/>
<field name="description" nolabel="1" colspan="8"/>
</group>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">OpenERP Report Designer</attribute>
</separator>
</data>
</field>
</record>
<record id="action_report_designer_installer" model="ir.actions.act_window">
<field name="name">OpenERP Report Designer Installation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base_report_designer.installer</field>
<field name="view_id" ref="view_report_designer_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="report_designer_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_designer_installer"/>
<field name="category_id" ref="base.category_tools_customization_config"/>
<field name="sequence">3</field>
<field name="type">automatic</field>
</record>
<record id="action_report_designer_wizard" model="ir.actions.act_window">
<field name="name">OpenERP Report Designer</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base_report_designer.installer</field>
<field name="view_id" ref="view_report_designer_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 parent="base.menu_reporting_config" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="1"/>
</data>
<data>
<record id="view_report_designer_installer" model="ir.ui.view">
<field name="name">Form View: OpenERP Report Designer Installation</field>
<field name="model">base_report_designer.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">OpenERP Report Designer Configuration</attribute>
</form>
<separator string="title" position="before">
<label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
</separator>
<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='Cancel']" position="replace">
<button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
</xpath>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" height="450" width="750">
<field name="name" invisible="1"/>
<field name="plugin_file" filename="name"/>
<separator string="Installation and Configuration Steps" colspan="4"/>
<field name="description" nolabel="1" colspan="8"/>
</group>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">OpenERP Report Designer</attribute>
</separator>
</data>
</field>
</record>
<record id="action_report_designer_installer" model="ir.actions.act_window">
<field name="name">OpenERP Report Designer Installation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base_report_designer.installer</field>
<field name="view_id" ref="view_report_designer_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="report_designer_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_designer_installer"/>
<field name="category_id" ref="base.category_tools_customization_config"/>
<field name="sequence">3</field>
<field name="type">automatic</field>
</record>
<record id="action_report_designer_wizard" model="ir.actions.act_window">
<field name="name">OpenERP Report Designer</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base_report_designer.installer</field>
<field name="view_id" ref="view_report_designer_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 parent="base.menu_reporting_config" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="1"/>
</data>
</openerp>
addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+1 -3
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="hr_contract_form_l10n_be_inherit" model="ir.ui.view">
<field name="name">hr.contract.form.inherit</field>
<field name="model">hr.contract</field>
@@ -10,7 +9,7 @@
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//page[@name='information']/group/group[@name='right_column']/field[@name='advantages']" position="after">
<xpath expr="//page[@name='information']/group/group[@name='right_column']" position="before">
<field name="travel_reimbursement_amount"/>
<field name="car_company_amount"/>
<field name="misc_onss_deduction"/>
@@ -68,6 +67,5 @@
</data>
</field>
</record>
</data>
</openerp>
addons/plugin_outlook/plugin_outlook.xml
+1
View File
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_outlook_installer" model="ir.ui.view">
addons/plugin_thunderbird/plugin_thunderbird.xml
+65 -67
View File
@@ -1,74 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data>
<record id="view_thunderbird_installer" model="ir.ui.view">
<field name="name">plugin_thunderbird.installer.view</field>
<field name="model">plugin_thunderbird.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">Install Thunderbird Plug-In</attribute>
</form>
<separator string="title" position="before">
<label 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."/>
</separator>
<xpath expr="//button[@string='Install Modules']" position="replace">
<button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
</xpath>
<xpath expr="//button[@string='Cancel']" position="replace"></xpath>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" height="450" width="750">
<field name="thunderbird" invisible="1"/>
<field name="name" invisible="1"/>
<field name="pdf_name" invisible="1"/>
<newline/>
<field name="plugin_file" filename="name" widget="url"/>
<newline/>
<field name="pdf_file" filename="pdf_name" widget="url"/>
<newline/>
<separator string="Installation and Configuration Steps" colspan="4"/>
<field name="description" nolabel="1" colspan="8"/>
</group>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute>
</separator>
</data>
</field>
</record>
<record id="view_thunderbird_installer" model="ir.ui.view">
<field name="name">plugin_thunderbird.installer.view</field>
<field name="model">plugin_thunderbird.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">Install Thunderbird Plug-In</attribute>
</form>
<separator string="title" position="before">
<label 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."/>
</separator>
<xpath expr="//button[@string='Install Modules']" position="replace">
<button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
</xpath>
<xpath expr="//button[@string='Cancel']" position="replace">
</xpath>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" height="450" width="750">
<field name="thunderbird" invisible="1"/>
<field name="name" invisible="1"/>
<field name="pdf_name" invisible="1"/>
<newline/>
<record id="action_thunderbird_installer" model="ir.actions.act_window">
<field name="name">Install Thunderbird Plug-In</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">plugin_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>
</record>
<field name="plugin_file" filename="name" widget="url"/>
<newline/>
<field name="pdf_file" filename="pdf_name" widget="url"/>
<newline/>
<separator string="Installation and Configuration Steps" colspan="4"/>
<field name="description" nolabel="1" colspan="8"/>
</group>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute>
</separator>
</data>
</field>
</record>
<record id="action_thunderbird_installer" model="ir.actions.act_window">
<field name="name">Install Thunderbird Plug-In</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">plugin_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>
</record>
<!-- Sales Configuration -->
<record id="view_config_thunderbird_installer" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_sale_config_settings"/>
<field name="arch" type="xml">
<field name="module_plugin_thunderbird" position="after">
<group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
<button name="%(action_thunderbird_installer)d" type="action"
string="Configure Thunderbird Plugin" icon="gtk-execute"/>
</group>
</field>
</field>
</record>
<!-- Sales Configuration -->
<record id="view_config_thunderbird_installer" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_sale_config_settings"/>
<field name="arch" type="xml">
<field name="module_plugin_thunderbird" position="after">
<group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
<button name="%(action_thunderbird_installer)d" type="action"
string="Configure Thunderbird Plugin" icon="gtk-execute"/>
</group>
</field>
</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_installer" parent="base.menu_base_config" sequence="10"/>
<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config" sequence="10"/>
</data>
</data>
</openerp>