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

rename "ir.module.module.configuration.step" with "ir.actions.todo" and also rename "ir.module.module.configuration.wizard" with "ir.actions.configuration.wizard" 

bzr revid: hmo@tinyerp.com-20080929084912-obuk8hsjkzuwyceu
This commit is contained in:
Harshad Modi 2008-09-29 14:19:12 +05:30
parent 1949b8bd99
commit 342ee38674
17 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/account/account.py
View File

@ -141,9 +141,9 @@ class account_account(osv.osv):
if context is None:
context = {}
pos = 0
while pos<len(args):
if args[pos][0]=='code' and args[pos][1] in ('like','ilike') and args[pos][2]:
args[pos] = ('code', '=like', str(args[pos][2].replace('%',''))+'%')
if args[pos][0]=='journal_id':
@ -159,7 +159,7 @@ class account_account(osv.osv):
ids1 += map(lambda x: x.id, jour.account_control_ids)
args[pos] = ('id','in',ids1)
pos+=1
return super(account_account,self).search(cr, uid, args, offset, limit,
order, context=context, count=count)
@ -1544,7 +1544,7 @@ class account_config_wizard(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
@ -1593,7 +1593,7 @@ class account_config_wizard(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
@ -2065,7 +2065,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
@ -2073,7 +2073,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}

2
addons/account/account_view.xml
View File

@ -1368,7 +1368,7 @@
<!-- register configuration wizard -->
<record id="config_fiscalyear" model="ir.module.module.configuration.step">
<record id="config_fiscalyear" model="ir.actions.todo">
<field name="name">Account Configure Wizard</field>
<field name="note">Define Fiscal Years and Select Charts of Account</field>
<field name="action_id" ref="action_account_config_wizard_form"/>

2
addons/base_setup/wizard/wizard_base_setup.py
View File

@ -264,7 +264,7 @@ class wizard_base_setup(wizard.interface):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'context':{'menu':True},
'target':'new',

8
addons/crm_configuration/crm_config.py
View File

@ -106,11 +106,11 @@ class crm_menu_config_wizard(osv.osv_memory):
tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_configuration',file_name )), {}, 'init', *args)
except Exception, e:
raise osv.except_osv('Error !', e)
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
@ -118,11 +118,11 @@ class crm_menu_config_wizard(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
crm_menu_config_wizard()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/crm_configuration/crm_config_view.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- configartion view -->
<record id="view_config_crm_menu" model="ir.ui.view">
@ -38,7 +38,7 @@
</record>
<!-- register configuration wizard -->
<record id="config_wizard_step_case_section_menu" model="ir.module.module.configuration.step">
<record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
<field name="name">Create Menu for CRM Case Section</field>
<field name="note">This Configuration step use to create Menu for Case Sections</field>
<field name="action_id" ref="action_view_config_crm_menu"/>

2
addons/l10n_be/l10n_be_wizard.xml
View File

@ -24,7 +24,7 @@
type="wizard"
id="account_wizard_vat_declaration"/>
<record id="config_call_account_template" model="ir.module.module.configuration.step">
<record id="config_call_account_template" model="ir.actions.todo">
<field name="name">Generate Chart of Accounts from a Chart Template</field>
<field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
This is the same wizard that runs from Financial Managament/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>

16
addons/profile_accounting/profile_accounting.py
View File

@ -44,31 +44,31 @@ class profile_accounting_config_install_modules_wizard(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
def action_install(self, cr, uid, ids, context=None):
result=self.read(cr,uid,ids)
result=self.read(cr,uid,ids)
mod_obj = self.pool.get('ir.module.module')
for res in result:
for r in res:
if r<>'id' and res[r]:
ids += mod_obj.search(cr, uid, [('name', '=', r)])
mod_obj.action_install(cr, uid, ids, context=context)
mod_obj.action_install(cr, uid, ids, context=context)
cr.commit()
db, pool = pooler.restart_pool(cr.dbname,force_demo=True, update_module=True)
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
profile_accounting_config_install_modules_wizard()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/profile_accounting/profile_accounting.xml
View File

@ -10,7 +10,7 @@
<separator string="Accounting Management" colspan="4"/>
<field name="account_analytic_analysis"/>
<field name="account_analytic_plans"/>
<field name="account_payment"/>
<field name="account_payment"/>
<separator string="Resources Management" colspan="4"/>
<field name="account_budget_crossover"/>
<field name="account_asset"/>
@ -35,7 +35,7 @@
<field name="target">new</field>
</record>
<record model="ir.module.module.configuration.step"
<record model="ir.actions.todo"
id="profile_accounting.config_install_wizard">
<field name="name">Accounting Profile : Install Extra modules</field>
<field name="note">Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements.</field>

14
addons/profile_association/profile_association.py
View File

@ -43,14 +43,14 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
def action_install(self, cr, uid, ids, context=None):
result=self.read(cr,uid,ids)
result=self.read(cr,uid,ids)
mod_obj = self.pool.get('ir.module.module')
for res in result:
for r in res:
@ -62,12 +62,12 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
profile_association_config_install_modules_wizard()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/profile_association/profile_association.xml
View File

@ -34,7 +34,7 @@
<field name="target">new</field>
</record>
<record model="ir.module.module.configuration.step"
<record model="ir.actions.todo"
id="config_install_module">
<field name="name">Association Profile : Install Extra modules</field>
<field name="note">Install more modules. A few modules are proposed according to the association profile you selected. You will be able to install them based on our requirements.</field>

6
addons/profile_manufacturing/profile_manufacturing.py
View File

@ -75,12 +75,12 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
def action_install(self, cr, uid, ids, context=None):
result=self.read(cr,uid,ids)
result=self.read(cr,uid,ids)
mod_obj = self.pool.get('ir.module.module')
for res in result:
for r in res:
@ -92,7 +92,7 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}

8
addons/profile_manufacturing/profile_manufacturing.xml
View File

@ -11,13 +11,13 @@
<field name="stock_location"/>
<field name="mrp_jit"/>
<field name="mrp_operation"/>
<separator string="Sales Management" colspan="4"/>
<separator string="Sales Management" colspan="4"/>
<field name="point_of_sale"/>
<field name="sale_journal"/>
<field name="sale_margin"/>
<separator string="Relationship Management" colspan="4"/>
<separator string="Relationship Management" colspan="4"/>
<field name="crm_configuration"/>
<separator string="Portal Management" colspan="4"/>
<separator string="Portal Management" colspan="4"/>
<field name="portal"/>
<separator string="" colspan="4"/>
<label string="" colspan="2"/>
@ -38,7 +38,7 @@
<field name="target">new</field>
</record>
<record model="ir.module.module.configuration.step"
<record model="ir.actions.todo"
id="config_install_module">
<field name="name">Manufacturing Profile : Install Extra modules</field>
<field name="note">Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements.</field>

12
addons/profile_service/profile_service.py
View File

@ -50,24 +50,24 @@ class profile_service_config_install_modules_wizard(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
def action_install(self, cr, uid, ids, context=None):
result=self.read(cr,uid,ids)
result=self.read(cr,uid,ids)
mod_obj = self.pool.get('ir.module.module')
for res in result:
for r in res:
if r<>'id' and res[r]:
ids = mod_obj.search(cr, uid, [('name', '=', r)])
mod_obj.action_install(cr,uid,ids,context=context)
if r<>'id' and res[r]:
ids = mod_obj.search(cr, uid, [('name', '=', r)])
mod_obj.action_install(cr,uid,ids,context=context)
cr.commit()
db, pool = pooler.restart_pool(cr.dbname,force_demo=True, update_module=True)
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}

4
addons/profile_service/profile_service.xml
View File

@ -21,7 +21,7 @@
<separator string="Relationship Management" colspan="4"/>
<field name="crm_configuration"/>
<field name="base_contact"/>
<separator string="Portal Management" colspan="4"/>
<separator string="Portal Management" colspan="4"/>
<field name="portal"/>
<separator string="" colspan="4"/>
<label string="" colspan="2"/>
@ -42,7 +42,7 @@
<field name="target">new</field>
</record>
<record model="ir.module.module.configuration.step"
<record model="ir.actions.todo"
id="config_install_module">
<field name="name">Service Profile : Install Extra modules</field>
<field name="note">A few modules are proposed according to the 'service profile' you selected. You will be able to install them or more modules later through the Administration menu.</field>

14
addons/sale/sale.py
View File

@ -812,7 +812,7 @@ class sale_order_line(osv.osv):
'message': warn_msg
}
result['product_uom_qty'] = qty
if uom:
uom2 = product_uom_obj.browse(cr, uid, uom)
if product_obj.uom_id.category_id.id <> uom2.category_id.id:
@ -839,7 +839,7 @@ class sale_order_line(osv.osv):
taxep_id = self.pool.get('res.partner').property_get(cr, uid,
partner_id,property_pref=['property_account_tax']).get('property_account_tax',False)
if taxep_id:
taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id)
taxep=self.pool.get('account.tax').browse(cr, uid,taxep_id)
if not taxep or not taxep.id:
result['tax_id'] = [x.id for x in product_obj.taxes_id]
else:
@ -884,7 +884,7 @@ class sale_order_line(osv.osv):
# Round the quantity up
# get unit price
if not pricelist:
warning={
'title':'No Pricelist !',
@ -904,9 +904,9 @@ class sale_order_line(osv.osv):
'message':
"Couldn't find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
}
}
else:
result.update({'price_unit': price})
result.update({'price_unit': price})
return {'value': result, 'domain': domain,'warning':warning}
def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
@ -962,7 +962,7 @@ class sale_config_picking_policy(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}
@ -970,7 +970,7 @@ class sale_config_picking_policy(osv.osv_memory):
return {
'view_type': 'form',
"view_mode": 'form',
'res_model': 'ir.module.module.configuration.wizard',
'res_model': 'ir.actions.configuration.wizard',
'type': 'ir.actions.act_window',
'target':'new',
}

22
addons/sale/sale_view.xml
View File

@ -44,7 +44,7 @@
</record>
<menuitem id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
<menuitem action="action_shop_form" id="menu_action_shop_form" parent="sale.menu_shop_configuration"/>
<record id="view_sale_order_calendar" model="ir.ui.view">
<field name="name">sale.order.calendar</field>
<field name="model">sale.order</field>
@ -116,20 +116,20 @@
<separator colspan="4" string="Automatic Declaration"/>
<field colspan="4"
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
name="product_id"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging)"
name="product_id"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging)"
select="1"/>
<field
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
name="product_uom_qty"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging)"
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
name="product_uom_qty"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging)"
select="1"/>
<field name="product_uom"
<field name="product_uom"
on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
<field
name="product_packaging"
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging)"
name="product_packaging"
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging)"
domain="[('product_id','=',product_id)]"
groups="base.group_extended"/>
<separator colspan="4" string="Manual Description"/>
@ -479,7 +479,7 @@
</record>
<!-- register configuration wizard -->
<record id="config_wizard_step_sale_picking_policy" model="ir.module.module.configuration.step">
<record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
<field name="name">Select the default picking policy for Sale Order</field>
<field name="note">This Configuration step use to set default picking policy when make sale order</field>
<field name="action_id" ref="action_config_picking_policy"/>

2
addons/sale_journal/sale_journal_view.xml
View File

@ -285,7 +285,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="property_product_pricelist" position="after"/>
<field name="property_product_pricelist" position="after">
<field name="property_invoice_type"/>
</field>
</field>