[IMP] remove cancel button from wizard and improved view.
bzr revid: tpa@tinyerp.com-20120619092606-5w7p50l7vnn3sv0w
This commit is contained in:
parent
34b298f52d
commit
8b3c05a373
|
@ -8,8 +8,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Create Menu" version="7.0">
|
||||
<header>
|
||||
<button name="menu_create" string="Create _Menu" type="object"/>
|
||||
<button special="cancel" string="_Cancel"/>
|
||||
<button name="menu_create" string="Create _Menu" type="object" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
|
|
|
@ -7,7 +7,10 @@
|
|||
<field name="model">base.language.export</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Export Translations">
|
||||
<form string="Export Translations" version="7.0">
|
||||
<header>
|
||||
<button icon="gtk-ok" name="act_getfile" string="_Export" type="object" states="choose" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<group col="8">
|
||||
<group colspan="3">
|
||||
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
|
||||
|
@ -35,17 +38,6 @@
|
|||
<field height="80" name="advice" nolabel="1" colspan="4"/>
|
||||
</group>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="choose">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="6" width="220"/>
|
||||
<button icon="gtk-cancel" name="act_cancel" special="cancel" string="_Close" type="object"/>
|
||||
<button icon="gtk-ok" name="act_getfile" string="_Export" type="object"/>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="get">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="7" width="220"/>
|
||||
<button icon="gtk-close" name="act_destroy" special="cancel" string="_Close" type="object"/>
|
||||
</group>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
@ -9,16 +9,17 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Import Translation" version="7.0">
|
||||
<header>
|
||||
<button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
|
||||
<button special="cancel" string="_Close" icon="gtk-cancel"/>
|
||||
<button name="import_lang" string="_Import" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<separator string="Import Translation" colspan="2"/>
|
||||
<label nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="data"/>
|
||||
<field name="overwrite"/>
|
||||
<group>
|
||||
<separator string="Import Translation" colspan="2"/>
|
||||
<label nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="data"/>
|
||||
<field name="overwrite"/>
|
||||
</group>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
@ -7,7 +7,10 @@
|
|||
<field name="model">base.language.install</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Load Official Translation">
|
||||
<form string="Load Official Translation" version="7.0">
|
||||
<header>
|
||||
<button name="lang_install" string="Load" type="object" icon="gtk-ok" states="init" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<group colspan="4" col="8">
|
||||
<group colspan="1">
|
||||
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
|
||||
|
@ -30,17 +33,6 @@ You must change the preferences of the user and open a new menu to view the chan
|
|||
</group>
|
||||
</group>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="init">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="6" width="220"/>
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
|
||||
<button name="lang_install" string="Load" type="object" icon="gtk-ok" colspan="1"/>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="done">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="7" width="220"/>
|
||||
<button special="cancel" string="Close" icon="gtk-ok"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -8,9 +8,6 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="System Configuration Done" version="7.0">
|
||||
<header>
|
||||
<button special="cancel" string="_Ok"/>
|
||||
</header>
|
||||
<label string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."/>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
@ -7,7 +7,11 @@
|
|||
<field name="model">base.module.import</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Import module">
|
||||
<form string="Import module" version="7.0">
|
||||
<header>
|
||||
<button name="importzip" string="Import module" type="object" icon="gtk-apply" states="init" class="oe_form_button_active_flow"/>
|
||||
<button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward" states="done" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<group col="8">
|
||||
<group colspan="3" col="1">
|
||||
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
|
||||
|
@ -29,18 +33,6 @@ After importing a new module you can install it by clicking on the button "Insta
|
|||
<label string="Module file successfully imported!" colspan="4"/>
|
||||
</group>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="init">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="6" width="220"/>
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="importzip" string="Import module" type="object" icon="gtk-apply"/>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="done">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="6" width="220"/>
|
||||
<button special="cancel" string="Close" icon="gtk-ok"/>
|
||||
<button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
|
||||
</group>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
@ -9,8 +9,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Scan for new modules" version="7.0">
|
||||
<header>
|
||||
<button name="watch_dir" string="Check new modules" type="object" icon="gtk-ok"/>
|
||||
<button special="cancel" string="Close" icon="gtk-cancel"/>
|
||||
<button name="watch_dir" string="Check new modules" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
|
||||
</form>
|
||||
|
|
|
@ -7,7 +7,11 @@
|
|||
<field name="model">base.module.update</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Update Module List">
|
||||
<form string="Update Module List" version="7.0">
|
||||
<header>
|
||||
<button name="update_module" string="Update" type="object" icon="gtk-ok" states="init" class="oe_form_button_active_flow"/>
|
||||
<button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward" states="done" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<group col="8">
|
||||
<group colspan="3">
|
||||
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
|
||||
|
@ -28,18 +32,6 @@
|
|||
<field name="add" colspan="4"/>
|
||||
</group>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="init">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="6" width="220"/>
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="update_module" string="Update" type="object" icon="gtk-ok"/>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="done">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="6" width="220"/>
|
||||
<button special="cancel" string="Close" icon="gtk-ok"/>
|
||||
<button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
|
||||
</group>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
@ -48,12 +48,13 @@ class base_module_upgrade(osv.osv_memory):
|
|||
if not ids:
|
||||
res['arch'] = '''<form string="Apply Scheduled Upgrades" version="7.0">
|
||||
<header>
|
||||
<button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
|
||||
<button special="cancel" string="Close" icon="gtk-cancel"/>
|
||||
<button name="config" string="Start configuration" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<separator string="System update completed" colspan="4"/>
|
||||
<label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
|
||||
<label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
|
||||
<group>
|
||||
<separator string="System update completed" colspan="4"/>
|
||||
<label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
|
||||
<label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
|
||||
</group>
|
||||
</form>'''
|
||||
|
||||
return res
|
||||
|
@ -80,14 +81,14 @@ class base_module_upgrade(osv.osv_memory):
|
|||
JOIN ir_module_module_dependency d ON (m.id = d.module_id)
|
||||
LEFT JOIN ir_module_module m2 ON (d.name = m2.name)
|
||||
WHERE m.id in %s and (m2.state IS NULL or m2.state IN %s)""",
|
||||
(tuple(ids), ('uninstalled',)))
|
||||
(tuple(ids), ('uninstalled',)))
|
||||
unmet_packages = [x[0] for x in cr.fetchall()]
|
||||
if unmet_packages:
|
||||
raise osv.except_osv(_('Unmet dependency !'),
|
||||
_('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages)))
|
||||
|
||||
ir_module.download(cr, uid, ids, context=context)
|
||||
cr.commit() # save before re-creating cursor below
|
||||
cr.commit() # save before re-creating cursor below
|
||||
|
||||
pooler.restart_pool(cr.dbname, update_module=True)
|
||||
|
||||
|
|
|
@ -9,13 +9,14 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="System Update" version="7.0">
|
||||
<header>
|
||||
<button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward"/>
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<label string="Your system will be updated."/>
|
||||
<label string="Note that this operation might take a few minutes."/>
|
||||
<separator string="Modules to Update"/>
|
||||
<field name="module_info"/>
|
||||
<group>
|
||||
<label string="Your system will be updated."/>
|
||||
<label string="Note that this operation might take a few minutes."/>
|
||||
<separator string="Modules to Update"/>
|
||||
<field name="module_info"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -45,11 +46,12 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Apply Scheduled Upgrades" version="7.0">
|
||||
<header>
|
||||
<button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="config" string="Start configuration" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<label string="The selected modules have been updated / installed !"/>
|
||||
<label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/>
|
||||
<group>
|
||||
<label string="The selected modules have been updated / installed !"/>
|
||||
<label string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -6,7 +6,10 @@
|
|||
<field name="model">base.update.translations</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Synchronize Terms">
|
||||
<form string="Synchronize Terms" version="7.0">
|
||||
<header>
|
||||
<button icon="gtk-ok" name="act_update" string="Update" type="object" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<group col="8">
|
||||
<group colspan="3">
|
||||
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
|
||||
|
@ -18,12 +21,6 @@
|
|||
<separator string="Synchronize Translation" colspan="4"/>
|
||||
<field name="lang" colspan="4"/>
|
||||
</group>
|
||||
<group colspan="8" col="8">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="6" width="220"/>
|
||||
<button icon="gtk-cancel" name="act_cancel" special="cancel" string="Cancel" type="object"/>
|
||||
<button icon="gtk-ok" name="act_update" string="Update" type="object"/>
|
||||
</group>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -92,7 +92,10 @@
|
|||
<field name="model">publisher_warranty.contract.wizard</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Register a Contract">
|
||||
<form string="Register a Contract" version="7.0">
|
||||
<header>
|
||||
<button name="action_validate" string="Register" type="object" icon="gtk-apply" states="draft" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<group colspan="4" col="8">
|
||||
<group colspan="1">
|
||||
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
|
||||
|
@ -114,17 +117,6 @@
|
|||
</group>
|
||||
</group>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="draft">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="6" width="220"/>
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
|
||||
<button name="action_validate" string="Register" type="object" icon="gtk-apply" colspan="1"/>
|
||||
</group>
|
||||
<group colspan="8" col="8" states="finished">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="7" width="220"/>
|
||||
<button special="cancel" string="Close" icon="gtk-ok"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<button name="action_skip" icon="gtk-jump-to" special="cancel"
|
||||
type="object" string="Cancel" colspan="1"/>
|
||||
<button name="action_next" icon="gtk-go-forward"
|
||||
type="object" string="Apply" colspan="1"/>
|
||||
type="object" string="Apply" colspan="1" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<group string="res_config_contents" col="4"/>
|
||||
</form>
|
||||
|
@ -24,10 +24,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Next Configuration Step" version="7.0">
|
||||
<header>
|
||||
<button name="action_next" icon="gtk-go-forward"
|
||||
type="object" string="Continue"/>
|
||||
<button name="action_next" icon="gtk-go-forward" type="object" string="Continue" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<field name="note"/>
|
||||
<group>
|
||||
<field name="note"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -39,12 +40,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<form version="7.0">
|
||||
<header>
|
||||
<button name="action_skip" icon="gtk-jump-to" special="cancel"
|
||||
type="object" string="Cancel" colspan="1"/>
|
||||
<button name="action_next" icon="gtk-go-forward"
|
||||
type="object" string="Install Modules" colspan="1"/>
|
||||
<button name="action_next" icon="gtk-go-forward" type="object" string="Install Modules" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<separator string="title" colspan="4"/>
|
||||
<group>
|
||||
<separator string="title" colspan="4"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
<field name="search_view_id" ref="view_res_widget_search"/>
|
||||
</record>
|
||||
<menuitem action="res_widget_act_window" id="menu_res_widget_act_window" parent="base.next_id_2" />
|
||||
|
||||
|
||||
<record id="res_widget_user_tree" model="ir.ui.view">
|
||||
<field name="name">res.widget.user.tree</field>
|
||||
<field name="model">res.widget.user</field>
|
||||
|
@ -70,7 +70,7 @@
|
|||
<field name="user_id"/>
|
||||
<field name="sequence"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -89,10 +89,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Widget Wizard" col="4" version="7.0">
|
||||
<header>
|
||||
<button name="res_widget_add" string="Add" type="object"/>
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel" />
|
||||
<button name="res_widget_add" string="Add" type="object" class="oe_form_button_active_flow"/>
|
||||
</header>
|
||||
<field name="widgets_list"/>
|
||||
<group>
|
||||
<field name="widgets_list"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -38,11 +38,6 @@
|
|||
<button name="generate_undefined" string="Undefined" type="object" icon="gtk-ok" colspan="1"/>
|
||||
<label string="Server error-traceback"/>
|
||||
</group>
|
||||
<group colspan="8" col="8">
|
||||
<separator string="" colspan="8"/>
|
||||
<label colspan="6" width="220"/>
|
||||
<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue