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

[MERGE]:Merge with trunk-configuration-rework 

bzr revid: ksa@tinyerp.co.in-20110411131208-q930q31zpxg9y7fn
This commit is contained in:
ksa (Open ERP) 2011-04-11 18:42:08 +05:30
parent 357a421542 a899e684ae
commit 32ce4e3fae
35 changed files with 227 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account_installer.xml
View File

@ -101,13 +101,13 @@
<record id="account_configuration_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_configuration_installer"/>
<field name="sequence">3</field>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
<record id="account_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_installer"/>
<field name="sequence">5</field>
<field name="restart">on_trigger</field>
<field name="type">special</field>
<field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
</record>

2
addons/account/configurable_account_chart.xml
View File

@ -617,7 +617,7 @@
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="state">open</field>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>

2
addons/account_sequence/account_sequence_installer_view.xml
View File

@ -50,7 +50,7 @@
<record id="account_seq_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_seq_installer"/>
<field name="sequence">3</field>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/association/profile_association.xml
View File

@ -50,7 +50,7 @@
id="config_install_module">
<field name="action_id" ref="action_config_install_module"/>
<field name="sequence">3</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
<menuitem

2
addons/base_report_designer/base_report_designer_installer.xml
View File

@ -57,7 +57,7 @@
<record id="report_designer_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_designer_installer"/>
<field name="sequence">3</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
<record id="action_report_designer_wizard" model="ir.actions.act_window">

103
addons/base_setup/base_setup_installer.xml
View File

@ -1,5 +1,6 @@
<openerp>
<data>
<record id="view_base_setup_installer" model="ir.ui.view">
<field name="name">base.setup.installer.view</field>
<field name="model">base.setup.installer</field>
@ -61,7 +62,107 @@
<record id="base_setup_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_base_setup_installer"/>
<field name="sequence">2</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
<!-- Migrate data from another application Conf Wiz-->
<record id="view_migrade_application_installer_modules" model="ir.ui.view">
<field name="name">migrade.application.installer.modules.form</field>
<field name="model">migrade.application.installer.modules</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">Migrate data from another application</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Migrate data from another application</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">Import data from other applications. Following the selected application, you can import more or less type of data matching to OpenERP objects. Choose the application and then the data you want to import in OpenERP</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>
</xpath>
<group colspan="8">
<field name="import_saleforce"/>
<field name="import_sugarcrm"/>
<field name="sync_google_contact"/>
<field name="quickbooks_ippids"/>
</group>
</data>
</field>
</record>
<record id="action_migrade_application_installer_modules" model="ir.actions.act_window">
<field name="name">Migrate data from another application</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">migrade.application.installer.modules</field>
<field name="view_id" ref="view_migrade_application_installer_modules"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="migrade_application_installer_modules_todo" model="ir.actions.todo">
<field name="action_id" ref="action_migrade_application_installer_modules"/>
<field name="type">normal_recurring</field>
</record>
<!-- Import or create customers configartion view -->
<record id="view_import_create_installer" model="ir.ui.view">
<field name="name">Import or create customers </field>
<field name="model">product.installer</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Import or create customers </attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Import or create customers </attribute>
</separator>
<xpath expr="//label[@string='description']"
position="attributes">
<attribute name="string">Create some customers, suppliers and their contacts manually or import a CSV spreadsheet by clicking on the import link</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='rowspan'>15</attribute>
<attribute name='string'></attribute>
</xpath>
<group string="res_config_contents" position="replace">
<group colspan="4">
<field colspan="4" name="customers" width="200"/>
</group>
</group>
</data>
</field>
</record>
<record id="action_import_create_installer" model="ir.actions.act_window">
<field name="name">Import or create customers </field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">product.installer</field>
<field name="view_id" ref="view_import_create_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<!-- register configuration wizard -->
<record id="config_wizard_res_product_installer" model="ir.actions.todo">
<field name="action_id" ref="action_import_create_installer"/>
<field name="type">normal</field>
<field name="state">skip</field>
</record>
</data>
</openerp>

2
addons/base_setup/base_setup_todo.xml
View File

@ -67,7 +67,7 @@
<record id="base_setup_company_todo" model="ir.actions.todo">
<field name="action_id" ref="action_base_setup_company"/>
<field name="sequence">1</field>
<field name="restart">never</field>
<field name="type">normal</field>
<field name="state">skip</field>
</record>
</data>

57
addons/base_setup/installer.py
View File

@ -145,7 +145,62 @@ class base_setup_installer(osv.osv_memory):
elif i.state == 'installed':
if modules_selected:
for instl in modules_selected:
cr.execute("update ir_actions_todo set restart='on_trigger' , state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model = 'ir.actions.todo' and data.module like '%"+instl+"%'")
cr.execute("update ir_actions_todo set state='open' from ir_model_data as data where data.res_id = ir_actions_todo.id and data.model = 'ir.actions.todo' and data.module like '%"+instl+"%'")
return
base_setup_installer()
#Migrate data from another application Conf wiz
class migrade_application_installer_modules(osv.osv_memory):
_name = 'migrade.application.installer.modules'
_inherit = 'res.config.installer'
_columns = {
'import_saleforce': fields.boolean('Import Saleforce',
help="For Import Saleforce"),
'import_sugarcrm': fields.boolean('Import Sugarcrm',
help="For Import Sugarcrm"),
'sync_google_contact': fields.boolean('Sync Google Contact',
help="For Sync Google Contact"),
'quickbooks_ippids': fields.boolean('Quickbooks Ippids',
help="For Quickbooks Ippids"),
}
migrade_application_installer_modules()
class product_installer(osv.osv_memory):
_name = 'product.installer'
_inherit = 'res.config'
_columns = {
'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
}
_defaults = {
'customers': 'create',
}
def execute(self, cr, uid, ids, context=None):
if context is None:
context = {}
data_obj = self.pool.get('ir.model.data')
val = self.browse(cr, uid, ids, context=context)[0]
if val.customers == 'create':
id2 = data_obj._get_id(cr, uid, 'base', 'view_partner_form')
if id2:
id2 = data_obj.browse(cr, uid, id2, context=context).res_id
return {
'view_type': 'form',
'view_mode': 'form',
'res_model': 'res.partner',
'views': [(id2, 'form')],
'type': 'ir.actions.act_window',
'target': 'current',
'nodestroy':False,
}
if val.customers == 'import':
return {'type': 'ir.actions.act_window'}
product_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/crm/crm_installer_view.xml
View File

@ -61,7 +61,7 @@
<record id="crm_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_crm_installer"/>
<field name="sequence">3</field>
<field name="restart">on_trigger</field>
<field name="type">special</field>
<field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
</record>

2
addons/document/wizard/document_configuration_view.xml
View File

@ -46,7 +46,7 @@
<field name="action_id" ref="action_config_auto_directory"/>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
<field name="state" eval="'skip'" />
<field name="restart" eval="'on_trigger'" />
<field name="type" eval="'special'" />
</record>
</data>
</openerp>

2
addons/document_ics/document_ics_config_wizard.xml
View File

@ -55,7 +55,7 @@
<record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
<field name="action_id" ref="action_view_document_ics_config_directories"/>
<field name="restart">always</field>
<field name="type">special</field>
</record>
</data>
</openerp>

2
addons/hr/hr_installer.xml
View File

@ -52,7 +52,7 @@
<record id="hr_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_hr_installer"/>
<field name="sequence">3</field>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
<record model="ir.actions.act_window" id="view_employee_form_installer">

2
addons/knowledge/knowledge_installer.xml
View File

@ -53,7 +53,7 @@
<field name="action_id" ref="action_knowledge_installer"/>
<field name="sequence">3</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/l10n_be/l10n_be_wizard.xml
View File

@ -4,7 +4,7 @@
<record id="config_call_account_template" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/l10n_br/data/l10n_br_account_chart_template.xml
View File

@ -19,7 +19,7 @@
This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="state">open</field>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/l10n_cr/l10n_wizard.xml
View File

@ -4,7 +4,7 @@
<record id="config_call_account_template" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/l10n_es/l10n_es_wizard.xml
View File

@ -4,7 +4,7 @@
<record id="config_call_account_template" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/l10n_fr/l10n_fr_wizard.xml
View File

@ -4,7 +4,7 @@
<record id="config_call_account_template_fr" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/l10n_lu/l10n_lu_wizard.xml
View File

@ -4,7 +4,7 @@
<record id="config_call_account_template_lu" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/l10n_ma/l10n_ma_wizard.xml
View File

@ -4,7 +4,7 @@
<record id="config_call_account_template_ma" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/l10n_uk/l10n_uk_wizard.xml
View File

@ -8,7 +8,7 @@
This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="state">open</field>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/marketing/marketing_view.xml
View File

@ -58,7 +58,7 @@
<record id="marketing_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_marketing_installer"/>
<field name="sequence">3</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
</data>

2
addons/mrp/mrp_installer.xml
View File

@ -48,7 +48,7 @@
<record id="mrp_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_mrp_installer"/>
<field name="sequence">3</field>
<field name="restart">on_trigger</field>
<field name="type">special</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>

10
addons/outlook/outlook_installer.xml
View File

@ -9,10 +9,10 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Outlook Plug-In Configuration</attribute>
<attribute name="string">Load Outlook Plug-In</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Outlook Plug-In</attribute>
<attribute name="string">Load 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>
@ -49,7 +49,7 @@
</record>
<record id="action_outlook_installer" model="ir.actions.act_window">
<field name="name">Outlook Plug-In Configuration</field>
<field name="name">Load Outlook Plug-In</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">outlook.installer</field>
<field name="view_id" ref="view_outlook_installer"/>
@ -64,7 +64,7 @@
</record>
<record id="action_outlook_wizard" model="ir.actions.act_window">
<field name="name">Outlook Plug-In Configuration</field>
<field name="name">Load Outlook Plug-In</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">outlook.installer</field>
<field name="view_id" ref="view_outlook_installer"/>
@ -81,7 +81,7 @@
<menuitem id="menu_base_config_plugins_outlook"
action="action_outlook_wizard"
name="Outlook Plug-In"
name="Load Outlook Plug-In"
parent="base.menu_base_config_plugins"
sequence="10" />
</data>

3
addons/point_of_sale/point_of_sale_view.xml
View File

@ -654,7 +654,8 @@
<field name="type">form</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<field name="active" position="after">
<field name="company_id" position="after">
<separator string="Point of Sale" colspan="2"/>
<field name="income_pdt"/>
<field name="expense_pdt"/>
<field name="am_out"/>

1
addons/product/__openerp__.py
View File

@ -55,6 +55,7 @@ Print product labels with barcode.
'product_data.xml',
'product_report.xml',
'product_view.xml',
'wizard/product_installer.xml',
'product_shortcut_data.xml',
'pricelist_view.xml',
'partner_view.xml',

23
addons/product/wizard/product_installer.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="product_form_config_action" model="ir.actions.act_window">
<field name="name">Create some products</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">product.product</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="product.product_normal_form_view"/>
</record>
<!-- register configuration wizard -->
<record id="config_wizard_res_product_installer" model="ir.actions.todo">
<field name="action_id" ref="product_form_config_action"/>
<field name="target">current</field>
<field name="type">normal</field>
<field name="state">skip</field>
</record>
</data>
</openerp>

2
addons/profile_tools/misc_tools_installer.xml
View File

@ -48,7 +48,7 @@
<record id="misc_tools_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_misc_tools_installer"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
<field name="sequence">3</field>
</record>
</data>

2
addons/project/project_installer.xml
View File

@ -50,7 +50,7 @@
<record id="project_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_project_installer"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
<field name="sequence">3</field>
</record>

2
addons/purchase_double_validation/purchase_double_validation_installer.xml
View File

@ -44,7 +44,7 @@
<!-- register configuration wizard -->
<record id="config_wizard_step_purchase_limit_amount" model="ir.actions.todo">
<field name="action_id" ref="action_config_purchase_limit_amount"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
</record>
</data>

2
addons/report_designer/report_designer_installer.xml
View File

@ -45,7 +45,7 @@
<record id="report_designer_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_designer_installer"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
<field name="sequence">3</field>
</record>
</data>

8
addons/sale/sale.py
View File

@ -1177,14 +1177,10 @@ class sale_config_picking_policy(osv.osv_memory):
_columns = {
'name': fields.char('Name', size=64),
'picking_policy': fields.selection([
('direct', 'Direct Delivery'),
('one', 'All at Once')
], 'Picking Default Policy', required=True, help="The Shipping Policy is used to configure per order if you want to deliver as soon as possible when one product is available or you wait that all products are available.."),
'order_policy': fields.selection([
('manual', 'Invoice Based on Sales Orders'),
('picking', 'Invoice Based on Deliveries'),
], 'Shipping Default Policy', required=True,
], 'Invoice Method', required=True,
help="You can generate invoices based on sales orders or based on shippings."),
'step': fields.selection([
('one', 'Delivery Order Only'),
@ -1196,7 +1192,6 @@ class sale_config_picking_policy(osv.osv_memory):
"in one or two operations by the worker.")
}
_defaults = {
'picking_policy': 'direct',
'order_policy': 'manual',
'step': 'one'
}
@ -1204,7 +1199,6 @@ class sale_config_picking_policy(osv.osv_memory):
def execute(self, cr, uid, ids, context=None):
for o in self.browse(cr, uid, ids, context=context):
ir_values_obj = self.pool.get('ir.values')
ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
if o.step == 'two':
md = self.pool.get('ir.model.data')

2
addons/sale/sale_installer.xml
View File

@ -47,7 +47,7 @@
<record id="sale_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_sale_installer"/>
<field name="restart">on_trigger</field>
<field name="type">special</field>
<field name="sequence">3</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>

10
addons/sale/sale_view.xml
View File

@ -521,7 +521,7 @@
<act_window
context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
id="action_order_line_product_tree"
name="Product sales"
name="Sales order line"
res_model="sale.order.line"
src_model="product.product"
groups="base.group_sale_salesman"/>
@ -545,18 +545,16 @@
<attribute name="string">Configure Sales Order Logistics</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">Setup your sales workflow and default values.</attribute>
<attribute name="string">Define your invoice method. A services company usually invoices based on sale orders while a retailer usually invoices based on deliveries.</attribute>
</xpath>
<xpath expr='//separator[@string="vsep"]' position='attributes'>
<attribute name='rowspan'>15</attribute>
<attribute name='string'></attribute>
</xpath>
<group string="res_config_contents" position="replace">
<field name="picking_policy" groups="base.group_extended"/>
<newline/>
<field name="order_policy"/>
<newline/>
<field name="step"/>
<field name="step" groups="base.group_extended"/>
</group>
<xpath expr='//button[@name="action_skip"]' position='replace'/>
</data>
@ -576,7 +574,7 @@
<!-- register configuration wizard -->
<record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
<field name="action_id" ref="action_config_picking_policy"/>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>

12
addons/thunderbird/thunderbird_installer.xml
View File

@ -9,10 +9,10 @@
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Thunderbird Plug-In Configuration</attribute>
<attribute name="string">Load Thunderbird Plug-In</attribute>
</form>
<separator string="title" position="attributes">
<attribute name="string">Thunderbird Plug-In</attribute>
<attribute name="string">Load 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>
@ -50,7 +50,7 @@
</record>
<record id="action_thunderbird_installer" model="ir.actions.act_window">
<field name="name">Thunderbird Plug-In Configuration</field>
<field name="name">Load Thunderbird Plug-In</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">thunderbird.installer</field>
<field name="view_id" ref="view_thunderbird_installer"/>
@ -61,13 +61,13 @@
<record id="thunderbird_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_thunderbird_installer"/>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
<field name="sequence">3</field>
</record>
<record id="action_thunderbird_wizard" model="ir.actions.act_window">
<field name="name">Thunderbird Plug-In Configuration</field>
<field name="name">Load Thunderbird Plug-In</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">thunderbird.installer</field>
<field name="view_id" ref="view_thunderbird_installer"/>
@ -78,7 +78,7 @@
</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 Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Load Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
</data>
</openerp>