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

Imrpovement in wizards

Browse Source 
bzr revid: fp@tinyerp.com-60cd6fa546623497dc251ac5ac0b68a87826740d
This commit is contained in:
Fabien Pinckaers
2008-07-09 17:55:23 +00:00
parent ba9f3dc8b2
commit 8ccdb3c75e
5 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+3 -2
View File
@@ -1548,10 +1548,11 @@ class account_config_fiscalyear(osv.osv_memory):
_columns = {
'name':fields.char('Name', required=True,size=64),
'code':fields.char('Code', required=True,size=64),
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
'date1': fields.date('Starting Date', required=True),
'date2': fields.date('Ending Date', required=True),
}
_defaults = {
'code': lambda *a: time.strftime('%Y'),
'date1': lambda *a: time.strftime('%Y-01-01'),
'date2': lambda *a: time.strftime('%Y-12-31'),
}
addons/account/account_view.xml
+5 -4
View File
@@ -1401,15 +1401,16 @@
<field name="model">account.config.fiscalyear</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Fiscal Year">
<separator col="4" colspan="4" string="Configure Fiscal Year"/>
<newline/>
<form string="Configure Your Fiscal Year">
<separator col="4" colspan="4" string="Configure Your Fiscal Year"/>
<field name="name"/>
<field name="code"/>
<field name="date1"/>
<field name="date2"/>
<separator string="" colspan="4"/>
<label string="" colspan="2"/>
<group col="4" colspan="4">
<button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Don't Create" name="action_cancel" type="object"/>
<button icon="gtk-ok" name="action_create" string="Create" type="object"/>
</group>
</form>
addons/base_setup/wizard/wizard_base_setup.py
+5 -5
View File
@@ -105,9 +105,9 @@ view_form_finish = """<?xml version="1.0"?>
<form string="Setup">
<image name="gtk-dialog-info" colspan="2"/>
<group colspan="2" col="4">
<separator colspan="4" string="Installation done"/>
<separator colspan="4" string="Installation Done"/>
<label align="0.0" colspan="4" string="Your new database is now fully installed."/>
<label align="0.0" colspan="4" string="You can start using the system or continue the configuration using the menu Administration\Configuration"/>
<label align="0.0" colspan="4" string="You can start configuring the system or connect directly to the database using the default setup."/>
</group>
</form>
"""
@@ -431,8 +431,8 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
'actions': [_update],
'result': {'type': 'form', 'arch': view_form_finish, 'fields': {},
'state': [
('menu', 'Ok', 'gtk-ok', True),
('config', 'Start configuration', 'gtk-ok', True)
('menu', 'Use Directly'),
('config', 'Start Configuration', 'gtk-ok', True)
]
}
},
@@ -449,4 +449,4 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
},
}
wizard_base_setup('base_setup.base_setup')
wizard_base_setup('base_setup.base_setup')
addons/profile_service/profile_service.py
+3 -3
View File
@@ -87,8 +87,8 @@ class config_install_extra_modules(osv.osv_memory):
_name='config.install_extra_modules'
_columns = {
'name':fields.char('Name', size=64),
'timesheets_module':fields.boolean('Timesheets module'),
'holidays_module':fields.boolean('Holidays module'),
'timesheets_module':fields.boolean('Timesheets Management'),
'holidays_module':fields.boolean('Hollidays Management'),
}
def action_cancel(self,cr,uid,ids,conect=None):
@@ -120,4 +120,4 @@ class config_install_extra_modules(osv.osv_memory):
'target':'new',
}
config_install_extra_modules()
config_install_extra_modules()
addons/profile_service/profile_service.xml
+7 -16
View File
@@ -7,21 +7,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Install Extra Module">
<separator col="4" colspan="4" string="Install Extra Module"/>
<newline/>
<separator colspan="4" string="Install More Modules"/>
<field name="timesheets_module"/>
<field name="holidays_module"/>
<!--<field name="module_ids" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
<form string="Module Lines">
<field name="install"/>
<field name="module_id"/>
</form>
<tree string="Module Lines">
<field name="install"/>
<field name="module_id"/>
</tree>
</field>-->
<group col="4" colspan="4">
<separator string="" colspan="4"/>
<label string="" colspan="2"/>
<group col="4" colspan="2">
<button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
<button name="action_install" string="Install" icon='gtk-ok' type="object"/>
</group>
@@ -30,7 +21,7 @@
</record>
<record id="action_config_install_module" model="ir.actions.act_window">
<field name="name">Install extra modules</field>
<field name="name">Install Extra Modules</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">config.install_extra_modules</field>
<field name="view_type">form</field>
@@ -41,11 +32,11 @@
<record model="ir.module.module.configuration.step"
id="config_install_module">
<field name="name">Install Extra modules</field>
<field name="note">Install Extra modules</field>
<field name="note">Install more modules. A few modules are proposed according to the service profile you selected. You will be able to install them based on our requirements.</field>
<field name="action_id" ref="action_config_install_module"/>
<field name="state">open</field>
</record>
</data>
</terp>
</terp>