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

modifs

Browse Source 
bzr revid: fp@tinyerp.com-20101006161652-7uftzxuoxu5zcmxu
This commit is contained in:
Fabien Pinckaers
2010-10-06 18:16:52 +02:00
parent 43fe238c96
commit 9e1d2deb5d
19 changed files with 67 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/association/profile_association.xml
+3 -2
View File
@@ -48,8 +48,9 @@
<record model="ir.actions.todo"
id="config_install_module">
<field name="action_id" ref="action_config_install_module"/>
<field name="sequence">3</field>
<field name="action_id" ref="action_config_install_module"/>
<field name="sequence">3</field>
<field name="restart">always</field>
</record>
<menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" groups="base.group_extended"/>
addons/base_report_designer/base_report_designer_installer.xml
+8 -9
View File
@@ -19,7 +19,7 @@
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="replace">
<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)"/>
@@ -29,10 +29,10 @@
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>
</xpath>
<group colspan="8" position="replace">
<attribute name='string'></attribute>
<attribute name='rowspan'>15</attribute>
</xpath>
<group colspan="8" position="replace">
<group colspan="8" height="450" width="750">
<field name="name" invisible="1"/>
<field name="plugin_file" filename="name"/>
@@ -55,12 +55,11 @@
</record>
<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="action_id" ref="action_report_designer_installer"/>
<field name="sequence">3</field>
<field name="restart">always</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>
addons/base_setup/base_setup_installer.xml
+1
View File
@@ -54,6 +54,7 @@
<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>
</record>
</data>
</openerp>
addons/base_setup/base_setup_todo.xml
+1 -1
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">3</field>
<field name="restart">onskip</field>
<field name="restart">always</field>
</record>
</data>
</openerp>
addons/crm/crm_installer_view.xml
+22 -21
View File
@@ -25,24 +25,24 @@
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
<group colspan="8">
<group colspan="4" col="4" groups="base.group_extended" name="other">
<field name="crm_claim" />
<field name="crm_helpdesk" />
<field name="crm_fundraising" />
<field name="wiki_sale_faq"/>
<field name="sale_crm" invisible="1"/>
</group>
<group colspan="2" col="2">
<separator string="Synchronization" colspan="4" />
<field name="crm_caldav" />
<field name="fetchmail" />
</group>
<group colspan="2" col="2">
<separator string="Plug-In" colspan="4" />
<field name="thunderbird" />
<field name="outlook" />
</group>
<group colspan="8">
<group colspan="4" col="4" groups="base.group_extended" name="other">
<field name="crm_claim" />
<field name="crm_helpdesk" />
<field name="crm_fundraising" />
<field name="wiki_sale_faq"/>
<field name="sale_crm" invisible="1"/>
</group>
<group colspan="2" col="2">
<separator string="Synchronization" colspan="4" />
<field name="crm_caldav" />
<field name="fetchmail" />
</group>
<group colspan="2" col="2">
<separator string="Plug-In" colspan="4" />
<field name="thunderbird" />
<field name="outlook" />
</group>
</group>
</data>
</field>
@@ -59,9 +59,10 @@
</record>
<record id="crm_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_crm_installer"/>
<field name="sequence">3</field>
<field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
<field name="action_id" ref="action_crm_installer"/>
<field name="sequence">3</field>
<field name="restart">always</field>
<field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
</record>
</data>
</openerp>
addons/document_ics/document_ics_config_wizard.xml
+1
View File
@@ -54,6 +54,7 @@
register configuration wizard
<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>
</record>
</data>
</openerp>
addons/hr/hr_installer.xml
+1
View File
@@ -52,6 +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">always</field>
</record>
</data>
addons/knowledge/knowledge_installer.xml
+1
View File
@@ -53,6 +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">always</field>
</record>
</data>
addons/marketing/marketing_view.xml
+1
View File
@@ -50,6 +50,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>
</record>
</data>
addons/mrp/mrp_installer.xml
+1
View File
@@ -48,6 +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">always</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>
addons/profile_tools/misc_tools_installer.xml
+1
View File
@@ -46,6 +46,7 @@
<record id="misc_tools_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_misc_tools_installer"/>
<field name="restart">always</field>
<field name="sequence">3</field>
</record>
</data>
addons/project/board_project_manager_view.xml
+4 -35
View File
@@ -10,43 +10,12 @@
Board for project managers
-->
<act_window
domain="[('manager', '=', uid)]"
id="act_my_project" name="My projects"
res_model="project.project" view_mode="tree,form"
view_type="form"/>
domain="[('manager', '=', uid)]"
id="act_my_project" name="My projects"
res_model="project.project" view_mode="tree,form"
view_type="form"/>
<act_window domain="[('user_id','=',uid),('state','&lt;&gt;','close')]" id="act_my_account" name="My accounts to invoice" res_model="account.analytic.account" view_id="view_account_analytic_simplified" view_mode="tree,form" view_type="form"/>
<record id="board_project_manager_form" model="ir.ui.view">
<field name="name">board.project.manager.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Project manager board">
<hpaned>
<child1>
<!-- <action colspan="4" height="220" name="%(act_my_project)d" string="My projects" width="510"/>-->
<action colspan="4" height="150" name="%(act_my_account)d" string="My accounts to invoice" width="510"/>
</child1>
<child2>
<button colspan="4" icon="terp-partner" name="%(open_board_project)d" string="My tasks board" type="action"/>
</child2>
</hpaned>
</form>
</field>
</record>
<record id="open_board_project_manager" model="ir.actions.act_window">
<field name="name">Project Manager Dashboard</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="usage">menu</field>
<field name="view_id" ref="board_project_manager_form"/>
</record>
<menuitem action="open_board_project_manager" icon="terp-graph" id="menu_board_project_manager" parent="project.next_id_86" sequence="1" groups="project.group_project_user"/>
</data>
</openerp>
addons/project/project_installer.xml
+3 -2
View File
@@ -49,8 +49,9 @@
</record>
<record id="project_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_project_installer"/>
<field name="sequence">3</field>
<field name="action_id" ref="action_project_installer"/>
<field name="restart">always</field>
<field name="sequence">3</field>
</record>
</data>
addons/report_designer/report_designer_installer.xml
+1
View File
@@ -46,6 +46,7 @@
<record id="report_designer_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_report_designer_installer"/>
<field name="restart">always</field>
<field name="sequence">3</field>
</record>
</data>
addons/sale/sale_installer.py
+4 -4
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',
help="Helps you to manage analytic distribution and sales orders."),
'delivery': fields.boolean('Delivery Costs',
help="Allows you to compute delivery costs on your quotations."),
'sale_journal': fields.boolean('Sales and deliveries by journal',
help="Allows you to categorise your "
"sales and deliveries (picking lists) between different journals. "
@@ -40,8 +40,8 @@ class sale_installer(osv.osv_memory):
"the difference between Unit Price and Cost Price."),
'sale_order_dates': fields.boolean('Sales Order Dates',
help="Adds commitment, requested and effective dates on Sales Orders."),
}
}
sale_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/sale/sale_installer.xml
+2 -1
View File
@@ -25,7 +25,7 @@
<attribute name="string">Configure</attribute>
</xpath>
<group colspan="8">
<field name="sale_analytic_plans"/>
<field name="delivery"/>
<field name="sale_journal"/>
<field name="sale_layout"/>
<field name="sale_margin"/>
@@ -47,6 +47,7 @@
<record id="sale_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_sale_installer"/>
<field name="restart">always</field>
<field name="sequence">3</field>
<field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>
addons/sale/sale_view.xml
+1
View File
@@ -567,6 +567,7 @@ to your configuration: from the sales order, from the pickings, etc.
<!-- 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="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
</record>
addons/sale/wizard/sale_line_invoice.xml
+8 -8
View File
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_sale_order_line_make_invoice" model="ir.ui.view">
<record id="view_sale_order_line_make_invoice" model="ir.ui.view">
<field name="name">Sale OrderLine Make Invoice</field>
<field name="model">sale.order.line.make.invoice</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create invoices">
<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
</form>
<separator colspan="4" string="Do you really want to create the invoice(s) ?" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
</form>
</field>
</record>
</record>
<record id="action_view_sale_order_line_make_invoice" model="ir.actions.act_window">
<record id="action_view_sale_order_line_make_invoice" model="ir.actions.act_window">
<field name="name">Make Invoices</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order.line.make.invoice</field>
@@ -34,4 +34,4 @@
<field name="model">sale.order.line</field>
</record>
</data>
</openerp>
</openerp>
addons/thunderbird/thunderbird_installer.xml
+3 -2
View File
@@ -60,8 +60,9 @@
</record>
<record id="thunderbird_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_thunderbird_installer"/>
<field name="sequence">3</field>
<field name="action_id" ref="action_thunderbird_installer"/>
<field name="restart">always</field>
<field name="sequence">3</field>
</record>