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

[MERGE]: Merge work improvements by ksa for new wizards

Browse Source 
bzr revid: rpa@tinyerp.com-20110414113049-pab7k30n2p8syfpa
This commit is contained in:
Rucha (Open ERP)
2011-04-14 17:00:49 +05:30
parent f76166d4da 681183863c
commit 58fbb04ecb
11 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_plans/account_analytic_plans_installer_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<record id="account_analytic_plan_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="account_analytic_plan_form_action_installer"/>
<field name="sequence">15</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
</data>
addons/crm/crm_installer_view.xml
+2 -2
View File
@@ -77,7 +77,7 @@
<record id="crm_case_section_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="crm_case_section_view_form_installer"/>
<field name="sequence">10</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
<record model="ir.actions.act_window" id="crm_case_stage_form_installer">
@@ -92,7 +92,7 @@
<record id="crm_case_stage_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="crm_case_stage_form_installer"/>
<field name="sequence">10</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
</data>
addons/fetchmail/fetchmail_installer_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<record id="view_email_server_form_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="view_email_server_form_installer"/>
<field name="sequence">4</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
</data>
</openerp>
addons/hr/hr_installer.xml
+1 -1
View File
@@ -67,7 +67,7 @@
<record id="view_employee_form_todo" model="ir.actions.todo">
<field name="action_id" ref="view_employee_form_installer"/>
<field name="sequence">3</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
addons/hr_evaluation/hr_evaluation_installer_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<record id="view_department_form_todo" model="ir.actions.todo">
<field name="action_id" ref="view_department_form_installer"/>
<field name="sequence">3</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
</data>
</openerp>
addons/hr_expense/__openerp__.py
+1 -1
View File
@@ -46,6 +46,7 @@ re-invoice your customer's expenses if your work by project.
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
'hr_expense_data.xml',
'hr_expense_sequence.xml',
'hr_expense_workflow.xml',
'hr_expense_view.xml',
@@ -56,7 +57,6 @@ re-invoice your customer's expenses if your work by project.
'board_hr_expense_view.xml',
'board_hr_expense_manager_view.xml',
'hr_expense_installer_view.xml',
'hr_expense_data.xml'
],
'demo_xml': [
'hr_expense_demo.xml',
addons/hr_expense/hr_expense_installer_view.xml
+2 -1
View File
@@ -7,13 +7,14 @@
<field name="res_model">product.product</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':False,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
<field name="view_id" ref="product.product_normal_form_view"/>
</record>
<record id="product_normal_form_view_todo" model="ir.actions.todo">
<field name="action_id" ref="product_normal_form_view_installer"/>
<field name="sequence">3</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
</data>
</openerp>
addons/hr_recruitment/hr_recruitment_installer_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<record id="hr_recruitment_stage_form_todo" model="ir.actions.todo">
<field name="action_id" ref="hr_recruitment_stage_form_installer"/>
<field name="sequence">3</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
</data>
</openerp>
addons/hr_timesheet_invoice/hr_timesheet_invoice_installer.py
+1 -1
View File
@@ -56,7 +56,7 @@ class hr_timesheet_invoice_wizard(osv.osv_memory):
context = {}
res = super(hr_timesheet_invoice_wizard, self).default_get(cr, uid, fields, context=context)
emp_obj = self.pool.get('hr.employee')
emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
emp_id = emp_obj.search(cr, uid, [], context=context)
result = []
data = {}
for emp in emp_obj.browse(cr, uid, emp_id, context=context):
addons/hr_timesheet_invoice/hr_timesheet_invoice_installer_view.xml
+1 -1
View File
@@ -40,7 +40,7 @@
<record id="hr_timesheet_invoice_todo" model="ir.actions.todo">
<field name="action_id" ref="action_hr_timesheet_invoice_wizard"/>
<field name="sequence">3</field>
<field name="restart">never</field>
<field name="type">normal</field>
</record>
</data>
addons/lunch/lunch_installer_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<record id="view_lunch_product_form_todo" model="ir.actions.todo">
<field name="action_id" ref="view_lunch_product_form_installer"/>
<field name="sequence">50</field>
<field name="restart">always</field>
<field name="type">normal_recurring</field>
</record>
</data>
</openerp>