From 3927e5e6363940f6bbd7a2eddd22b61e06468516 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Tue, 26 Jun 2012 16:57:09 +0530 Subject: [PATCH 01/31] [IMP] bank view change bzr revid: kjo@tinyerp.com-20120626112709-t3r6ngflmnkn5a70 --- openerp/addons/base/res/res_bank_view.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml index 8857534983a..d4be11419e5 100644 --- a/openerp/addons/base/res/res_bank_view.xml +++ b/openerp/addons/base/res/res_bank_view.xml @@ -102,12 +102,17 @@ - - - - - - + From e65b5db25a8b4f072973d21e6e56c817509a0504 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Wed, 27 Jun 2012 17:26:13 +0530 Subject: [PATCH 02/31] [IMP]reporting-checker-wizards-menus bzr revid: pna@tinyerp.com-20120627115613-e6q3wh7428b217e6 --- .../report/hr_evaluation_report_view.xml | 2 +- .../report/hr_expense_report_view.xml | 4 +- addons/hr_holidays/__openerp__.py | 1 - addons/hr_holidays/hr_holidays_wizard.xml | 10 -- addons/hr_holidays/hr_holidays_workflow.xml | 98 ------------------- .../report/available_holidays_view.xml | 2 +- .../hr_holidays_summary_department_view.xml | 2 +- .../report/hr_recruitment_report_view.xml | 2 +- addons/hr_timesheet/hr_timesheet_report.xml | 4 +- .../hr_timesheet_print_employee_view.xml | 38 +------ .../wizard/hr_timesheet_print_users_view.xml | 33 ++++--- .../hr_timesheet_analytic_profit_view.xml | 37 +++---- .../report/hr_timesheet_report_view.xml | 2 +- .../report/timesheet_report_view.xml | 2 +- addons/project/report/project_cumulative.xml | 2 +- addons/project/report/project_report_view.xml | 4 +- 16 files changed, 52 insertions(+), 191 deletions(-) delete mode 100644 addons/hr_holidays/hr_holidays_wizard.xml delete mode 100644 addons/hr_holidays/hr_holidays_workflow.xml diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index b6f76777f54..1f41411409e 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -90,7 +90,7 @@ - + diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 1299f4e9ce5..346378a05ae 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -97,7 +97,7 @@ - Expenses Analysis + Expense Analysis hr.expense.report form tree,graph @@ -105,7 +105,7 @@ - + diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 09809e488ba..6f9f61afabc 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -58,7 +58,6 @@ Note that: 'hr_holidays_workflow.xml', 'hr_holidays_view.xml', 'hr_holidays_data.xml', - 'hr_holidays_wizard.xml', 'hr_holidays_report.xml', 'report/hr_holidays_report_view.xml', 'report/available_holidays_view.xml', diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml deleted file mode 100644 index 7ed381636cf..00000000000 --- a/addons/hr_holidays/hr_holidays_wizard.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml deleted file mode 100644 index 7013d62a5ed..00000000000 --- a/addons/hr_holidays/hr_holidays_workflow.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - hr.wkf.holidays - hr.holidays - True - - - - - True - draft - - - - - confirm - function - holidays_confirm() - OR - - - - - validate - function - holidays_validate() - - - - - second_validate - function - holidays_validate2() - - - - - - refuse - True - stopall - - - - - - - - confirm - - - - - - validate - True - - - - - - - refuse - holidays_refuse('first_approval') - - - - - - - refuse - holidays_refuse('second_approval') - - - - - - - second_validate - - - - - - - not holiday_status_id.double_validation - - - - - diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml index 082bf198e34..e7441060204 100644 --- a/addons/hr_holidays/report/available_holidays_view.xml +++ b/addons/hr_holidays/report/available_holidays_view.xml @@ -17,7 +17,7 @@ name="Leaves Analysis" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" - parent="menu_hr_reporting_holidays"/> + parent="hr.menu_hr_reporting" sequence="5" /> diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml index 72844a58ccb..d2518a0d7f7 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml @@ -32,7 +32,7 @@ diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 5ddbe5045ab..9d81d39f240 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -114,7 +114,7 @@ {'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]} - + diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml index d3d2d745183..ab24066b1de 100644 --- a/addons/hr_timesheet/hr_timesheet_report.xml +++ b/addons/hr_timesheet/hr_timesheet_report.xml @@ -3,9 +3,9 @@ + sequence="6" /> diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml index 1eda6de05cb..ae7de4c03c7 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml @@ -2,43 +2,7 @@ - - - hr.analytical.timesheet.employee.form - hr.analytical.timesheet.employee - form - -
- - - - - - - -