Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-reporting-imp-pna into
lp:~openerp-dev/openobject-addons/trunk-reporting-imp-kjo.
Requested reviews:
Kuldeep Joshi(OpenERP) (kjo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-reporting-imp-pna/+merge/112492
Hello,
I improved the Reporting: checker wizards and menus.
Thanks,
pna
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-reporting-imp-pna/+merge/112492
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-reporting-imp-kjo.
=== modified file 'hr_evaluation/report/hr_evaluation_report_view.xml'
--- hr_evaluation/report/hr_evaluation_report_view.xml 2012-06-18 07:02:39 +0000
+++ hr_evaluation/report/hr_evaluation_report_view.xml 2012-06-28 05:32:21 +0000
@@ -90,7 +90,7 @@
<field name="search_view_id" ref="view_evaluation_report_search"/>
</record>
- <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3" groups="base.group_hr_manager"/>
+ <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="2" groups="base.group_hr_manager"/>
</data>
</openerp>
=== modified file 'hr_expense/report/hr_expense_report_view.xml'
--- hr_expense/report/hr_expense_report_view.xml 2012-06-18 07:02:39 +0000
+++ hr_expense/report/hr_expense_report_view.xml 2012-06-28 05:32:21 +0000
@@ -97,7 +97,7 @@
</record>
<record id="action_hr_expense_report_all" model="ir.actions.act_window">
- <field name="name">Expenses Analysis</field>
+ <field name="name">Expense Analysis</field>
<field name="res_model">hr.expense.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
@@ -105,7 +105,7 @@
<field name="search_view_id" ref="view_hr_expense_report_search"/>
</record>
- <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
+ <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
</data>
</openerp>
=== modified file 'hr_holidays/__openerp__.py'
--- hr_holidays/__openerp__.py 2012-06-06 08:58:25 +0000
+++ hr_holidays/__openerp__.py 2012-06-28 05:32:21 +0000
@@ -58,7 +58,6 @@
'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',
=== removed file 'hr_holidays/hr_holidays_wizard.xml'
--- hr_holidays/hr_holidays_wizard.xml 2011-11-09 18:12:56 +0000
+++ hr_holidays/hr_holidays_wizard.xml 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
- <data>
- <menuitem
- id="menu_hr_reporting_holidays"
- name="Leaves"
- parent="hr.menu_hr_reporting"
- sequence="6"/>
- </data>
-</openerp>
=== added file 'hr_holidays/hr_holidays_workflow.xml'
--- hr_holidays/hr_holidays_workflow.xml 1970-01-01 00:00:00 +0000
+++ hr_holidays/hr_holidays_workflow.xml 2012-06-28 05:32:21 +0000
@@ -0,0 +1,98 @@
+<?xml version="1.0" ?>
+<openerp>
+<data>
+
+ <!-- Workflow definition -->
+
+ <record model="workflow" id="wkf_holidays">
+ <field name="name">hr.wkf.holidays</field>
+ <field name="osv">hr.holidays</field>
+ <field name="on_create">True</field>
+ </record>
+
+ <record model="workflow.activity" id="act_draft">
+ <field name="wkf_id" ref="wkf_holidays" />
+ <field name="flow_start">True</field>
+ <field name="name">draft</field>
+ </record>
+
+ <record model="workflow.activity" id="act_confirm">
+ <field name="wkf_id" ref="wkf_holidays" />
+ <field name="name">confirm</field>
+ <field name="kind">function</field>
+ <field name="action">holidays_confirm()</field>
+ <field name="split_mode">OR</field>
+ </record>
+
+ <record model="workflow.activity" id="act_validate">
+ <field name="wkf_id" ref="wkf_holidays" />
+ <field name="name">validate</field>
+ <field name="kind">function</field>
+ <field name="action">holidays_validate()</field>
+ </record>
+
+ <record model="workflow.activity" id="act_validate1">
+ <field name="wkf_id" ref="wkf_holidays" />
+ <field name="name">second_validate</field>
+ <field name="kind">function</field>
+ <field name="action">holidays_validate2()</field>
+ </record>
+
+
+ <record model="workflow.activity" id="act_refuse">
+ <field name="wkf_id" ref="wkf_holidays" />
+ <field name="name">refuse</field>
+ <field name="flow_stop">True</field>
+ <field name="kind">stopall</field>
+ </record>
+
+ <!--
+ workflow transition
+ -->
+
+ <record model="workflow.transition" id="t1">
+ <field name="act_from" ref="act_draft" />
+ <field name="act_to" ref="act_confirm" />
+ <field name="signal">confirm</field>
+ </record>
+
+ <record model="workflow.transition" id="t2">
+ <field name="act_from" ref="act_confirm" />
+ <field name="act_to" ref="act_validate" />
+ <field name="signal">validate</field>
+ <field name="condition">True</field>
+ <field name="group_id" ref="base.group_hr_user"/>
+ </record>
+
+ <record model="workflow.transition" id="t3">
+ <field name="act_from" ref="act_confirm" />
+ <field name="act_to" ref="act_refuse" />
+ <field name="signal">refuse</field>
+ <field name="condition">holidays_refuse('first_approval')</field>
+ <field name="group_id" ref="base.group_hr_user"/>
+ </record>
+
+ <record model="workflow.transition" id="t4">
+ <field name="act_from" ref="act_validate" />
+ <field name="act_to" ref="act_refuse" />
+ <field name="signal">refuse</field>
+ <field name="condition">holidays_refuse('second_approval')</field>
+ <field name="group_id" ref="base.group_hr_user"/>
+ </record>
+
+ <record model="workflow.transition" id="t8">
+ <field name="act_from" ref="act_validate" />
+ <field name="act_to" ref="act_validate1" />
+ <field name="signal">second_validate</field>
+ <field name="group_id" ref="base.group_hr_manager" />
+ </record>
+
+ <record model="workflow.transition" id="t11">
+ <field name="act_from" ref="act_validate" />
+ <field name="act_to" ref="act_validate1" />
+ <field name="condition">not holiday_status_id.double_validation</field>
+ <field name="signal" eval="False"/>
+ </record>
+
+</data>
+</openerp>
=== removed file 'hr_holidays/hr_holidays_workflow.xml'
--- hr_holidays/hr_holidays_workflow.xml 2011-11-03 15:12:46 +0000
+++ hr_holidays/hr_holidays_workflow.xml 1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-<data>
-
- <!-- Workflow definition -->
-
- <record model="workflow" id="wkf_holidays">
- <field name="name">hr.wkf.holidays</field>
- <field name="osv">hr.holidays</field>
- <field name="on_create">True</field>
- </record>
-
- <record model="workflow.activity" id="act_draft">
- <field name="wkf_id" ref="wkf_holidays" />
- <field name="flow_start">True</field>
- <field name="name">draft</field>
- </record>
-
- <record model="workflow.activity" id="act_confirm">
- <field name="wkf_id" ref="wkf_holidays" />
- <field name="name">confirm</field>
- <field name="kind">function</field>
- <field name="action">holidays_confirm()</field>
- <field name="split_mode">OR</field>
- </record>
-
- <record model="workflow.activity" id="act_validate">
- <field name="wkf_id" ref="wkf_holidays" />
- <field name="name">validate</field>
- <field name="kind">function</field>
- <field name="action">holidays_validate()</field>
- </record>
-
- <record model="workflow.activity" id="act_validate1">
- <field name="wkf_id" ref="wkf_holidays" />
- <field name="name">second_validate</field>
- <field name="kind">function</field>
- <field name="action">holidays_validate2()</field>
- </record>
-
-
- <record model="workflow.activity" id="act_refuse">
- <field name="wkf_id" ref="wkf_holidays" />
- <field name="name">refuse</field>
- <field name="flow_stop">True</field>
- <field name="kind">stopall</field>
- </record>
-
- <!--
- workflow transition
- -->
-
- <record model="workflow.transition" id="t1">
- <field name="act_from" ref="act_draft" />
- <field name="act_to" ref="act_confirm" />
- <field name="signal">confirm</field>
- </record>
-
- <record model="workflow.transition" id="t2">
- <field name="act_from" ref="act_confirm" />
- <field name="act_to" ref="act_validate" />
- <field name="signal">validate</field>
- <field name="condition">True</field>
- <field name="group_id" ref="base.group_hr_user"/>
- </record>
-
- <record model="workflow.transition" id="t3">
- <field name="act_from" ref="act_confirm" />
- <field name="act_to" ref="act_refuse" />
- <field name="signal">refuse</field>
- <field name="condition">holidays_refuse('first_approval')</field>
- <field name="group_id" ref="base.group_hr_user"/>
- </record>
-
- <record model="workflow.transition" id="t4">
- <field name="act_from" ref="act_validate" />
- <field name="act_to" ref="act_refuse" />
- <field name="signal">refuse</field>
- <field name="condition">holidays_refuse('second_approval')</field>
- <field name="group_id" ref="base.group_hr_user"/>
- </record>
-
- <record model="workflow.transition" id="t8">
- <field name="act_from" ref="act_validate" />
- <field name="act_to" ref="act_validate1" />
- <field name="signal">second_validate</field>
- <field name="group_id" ref="base.group_hr_manager" />
- </record>
-
- <record model="workflow.transition" id="t11">
- <field name="act_from" ref="act_validate" />
- <field name="act_to" ref="act_validate1" />
- <field name="condition">not holiday_status_id.double_validation</field>
- <field name="signal" eval="False"/>
- </record>
-
-</data>
-</openerp>
=== modified file 'hr_holidays/report/available_holidays_view.xml'
--- hr_holidays/report/available_holidays_view.xml 2012-02-13 15:27:55 +0000
+++ hr_holidays/report/available_holidays_view.xml 2012-06-28 05:32:21 +0000
@@ -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" />
</data>
=== modified file 'hr_holidays/wizard/hr_holidays_summary_department_view.xml'
--- hr_holidays/wizard/hr_holidays_summary_department_view.xml 2012-06-13 14:26:05 +0000
+++ hr_holidays/wizard/hr_holidays_summary_department_view.xml 2012-06-28 05:32:21 +0000
@@ -32,7 +32,7 @@
<menuitem
name="Leaves by Department"
- parent="menu_hr_reporting_holidays"
+ parent="hr_timesheet.menu_hr_reporting_timesheet"
action="action_hr_holidays_summary_dept"
id="menu_account_central_journal"
icon="STOCK_PRINT"/>
=== modified file 'hr_recruitment/report/hr_recruitment_report_view.xml'
--- hr_recruitment/report/hr_recruitment_report_view.xml 2012-06-18 07:02:39 +0000
+++ hr_recruitment/report/hr_recruitment_report_view.xml 2012-06-28 05:32:21 +0000
@@ -114,7 +114,7 @@
<field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
</record>
- <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
+ <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
</data>
</openerp>
=== modified file 'hr_timesheet/hr_timesheet_report.xml'
--- hr_timesheet/hr_timesheet_report.xml 2012-02-02 10:27:13 +0000
+++ hr_timesheet/hr_timesheet_report.xml 2012-06-28 05:32:21 +0000
@@ -3,9 +3,9 @@
<data>
<menuitem
id="menu_hr_reporting_timesheet"
- name="Timesheet"
+ name="Reports"
parent="hr.menu_hr_reporting"
- sequence="5" />
+ sequence="6" />
<report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
<report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
=== modified file 'hr_timesheet/wizard/hr_timesheet_print_employee_view.xml'
--- hr_timesheet/wizard/hr_timesheet_print_employee_view.xml 2012-05-30 06:31:10 +0000
+++ hr_timesheet/wizard/hr_timesheet_print_employee_view.xml 2012-06-28 05:32:21 +0000
@@ -2,43 +2,7 @@
<openerp>
<data>
- <!-- Print Employee Timesheet -->
- <record id="view_hr_timesheet_employee" model="ir.ui.view">
- <field name="name">hr.analytical.timesheet.employee.form</field>
- <field name="model">hr.analytical.timesheet.employee</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Monthly Employee Timesheet">
- <group colspan="4">
- <field name="month"/>
- <field name="year"/>
- <field name="employee_id" colspan="3"/>
- </group>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="gtk-print" string="Print" name="print_report" type="object"/>
- </group>
- </form>
- </field>
- </record>
-
- <record id="action_hr_timesheet_employee" model="ir.actions.act_window">
- <field name="name">Employee Timesheet</field>
- <field name="res_model">hr.analytical.timesheet.employee</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="view_hr_timesheet_employee"/>
- <field name="target">new</field>
- </record>
-
- <menuitem action="action_hr_timesheet_employee"
- id="menu_hr_timesheet_employee"
- parent="menu_hr_reporting_timesheet"
- sequence="2" icon="STOCK_PRINT"/>
-
-
- <!-- Print My Timesheet -->
+ <!-- Print My Timesheet -->
<record id="view_hr_timesheet_my" model="ir.ui.view">
<field name="name">hr.analytical.timesheet.my.form</field>
<field name="model">hr.analytical.timesheet.employee</field>
=== modified file 'hr_timesheet/wizard/hr_timesheet_print_users_view.xml'
--- hr_timesheet/wizard/hr_timesheet_print_users_view.xml 2012-05-15 11:45:38 +0000
+++ hr_timesheet/wizard/hr_timesheet_print_users_view.xml 2012-06-28 05:32:21 +0000
@@ -8,20 +8,25 @@
<field name="model">hr.analytical.timesheet.users</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Monthly Employees Timesheet">
- <group height="260" width="460">
- <group colspan="4">
- <field name="month"/>
- <field name="year"/>
- <separator string="Employees" colspan="4"/>
- <field name="employee_ids" colspan="4" nolabel="1"/>
- </group>
- <separator colspan="4"/>
- <group colspan="4">
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="gtk-print" string="Print" name="print_report" type="object"/>
- </group>
- </group>
+ <form string="Monthly Employees Timesheet" version="7.0">
+ <header>
+ <button icon="gtk-print" string="Print" name="print_report" type="object"/> or
+ <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+ </header>
+ <sheet>
+ <group><label for="month" string="Period" />
+ <div>
+ <field name="month" nolabel="1" class="oe_inline"/>
+ <field name="year" nolabel="1" class="oe_inline"/>
+ </div>
+ </group>
+ <group>
+ <div>
+ <separator string="Employees" colspan="4"/>
+ <field name="employee_ids" colspan="4" nolabel="1"/>
+ </div>
+ </group>
+ </sheet>
</form>
</field>
</record>
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml'
--- hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml 2012-05-30 06:31:10 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml 2012-06-28 05:32:21 +0000
@@ -7,23 +7,26 @@
<field name="model">hr.timesheet.analytic.profit</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Timesheet Profit">
- <group height="420" width="370">
- <group col="4" colspan="4">
- <field name="date_from"/>
- <field name="date_to"/>
- <separator string="Journals" colspan="4"/>
- <field name="journal_ids" colspan="4" nolabel="1"/>
- <separator string="Users" colspan="4"/>
- <field name="employee_ids" colspan="4" nolabel="1"/>
- </group>
- <separator colspan="4"/>
- <group col="2" colspan="4">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
- </group>
- </group>
- </form>
+ <form string="Timesheet Profit" version="7.0">
+ <header>
+ <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> or
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ </header>
+ <sheet>
+ <group> <label for="date_from" string="Duration" />
+ <div>
+ <field name="date_from" nolabel="1" class="oe_inline" />
+ - <field name="date_to" nolabel="1" class="oe_inline"/>
+ </div>
+ </group>
+ <group>
+ <separator string="Journals" colspan="4"/>
+ <field name="journal_ids" colspan="4" nolabel="1"/>
+ <separator string="Users" colspan="4"/>
+ <field name="employee_ids" colspan="4" nolabel="1"/>
+ </group>
+ </sheet>
+ </form>
</field>
</record>
=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report_view.xml'
--- hr_timesheet_sheet/report/hr_timesheet_report_view.xml 2012-06-15 12:57:50 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report_view.xml 2012-06-28 05:32:21 +0000
@@ -82,6 +82,6 @@
<menuitem
action="action_hr_timesheet_report_stat_all"
id="menu_hr_timesheet_report_all"
- parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="0"/>
+ parent="hr.menu_hr_reporting" sequence="3"/>
</data>
</openerp>
=== modified file 'hr_timesheet_sheet/report/timesheet_report_view.xml'
--- hr_timesheet_sheet/report/timesheet_report_view.xml 2012-06-15 12:57:50 +0000
+++ hr_timesheet_sheet/report/timesheet_report_view.xml 2012-06-28 05:32:21 +0000
@@ -110,6 +110,6 @@
<field name="search_view_id" ref="view_timesheet_report_search"/>
</record>
<menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
- parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
+ parent="hr.menu_hr_reporting" sequence="4" groups="base.group_hr_manager"/>
</data>
</openerp>
=== modified file 'project/report/project_cumulative.xml'
--- project/report/project_cumulative.xml 2012-06-22 13:05:06 +0000
+++ project/report/project_cumulative.xml 2012-06-28 05:32:21 +0000
@@ -83,7 +83,7 @@
</record>
<menuitem action="action_view_task_history_cumulative"
id="menu_action_view_task_history_cumulative"
- parent="project_report_task" />
+ parent="base.menu_project_report" />
<!--<record id="action_view_task_history_burndown" model="ir.actions.act_window">-->
=== modified file 'project/report/project_report_view.xml'
--- project/report/project_report_view.xml 2012-06-22 05:52:30 +0000
+++ project/report/project_report_view.xml 2012-06-28 05:32:21 +0000
@@ -5,8 +5,6 @@
<menuitem id="base.menu_project_report" name="Project"
groups="project.group_project_manager"
parent="base.menu_reporting" sequence="25"/>
- <menuitem id="project_report_task" name="Tasks Analysis"
- parent="base.menu_project_report"/>
<record id="view_task_project_user_tree" model="ir.ui.view">
<field name="name">report.project.task.user.tree</field>
@@ -135,7 +133,7 @@
<field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
</record>
- <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="project_report_task"/>
+ <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
</data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
