Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-improve_hr_module-han into
lp:~openerp-dev/openobject-addons/trunk-usability.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-improve_hr_module-han/+merge/67528
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-improve_hr_module-han/+merge/67528
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'account/security/ir.model.access.csv'
--- account/security/ir.model.access.csv 2011-06-01 09:11:16 +0000
+++ account/security/ir.model.access.csv 2011-07-11 11:31:22 +0000
@@ -37,6 +37,7 @@
"access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_account_user",1,0,0,0
+"access_account_analytic_journal_user","account.analytic.journal","model_account_analytic_journal","base.group_user",1,1,1,0
"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2011-06-30 13:30:09 +0000
+++ hr/hr_view.xml 2011-07-11 11:31:22 +0000
@@ -29,7 +29,7 @@
<field name="company_id" widget="selection" groups="base.group_multi_company,base.group_extended" on_change="onchange_company(company_id)"/>
<field name="active" groups="base.group_extended"/>
<newline/>
- <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)" />
+ <field name="department_id" on_change="onchange_department_id(department_id)" />
<field name="parent_id" />
</group>
<group colspan="2" col="1">
=== modified file 'hr/images/photo.png'
Binary files hr/images/photo.png 2011-01-14 00:11:01 +0000 and hr/images/photo.png 2011-07-11 11:31:22 +0000 differ
=== modified file 'hr_timesheet/hr_timesheet_data.xml'
--- hr_timesheet/hr_timesheet_data.xml 2011-01-14 00:11:01 +0000
+++ hr_timesheet/hr_timesheet_data.xml 2011-07-11 11:31:22 +0000
@@ -1,6 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
+
+ <record id="product_consultant" model="product.product">
+ <field name="list_price">75.0</field>
+ <field name="standard_price">30.0</field>
+ <field name="uom_id" ref="product.uom_hour"/>
+ <field name="uom_po_id" ref="product.uom_hour"/>
+ <field name="name">Service on Timesheet</field>
+ <field name="categ_id" ref="product.cat0"/>
+ <field name="type">service</field>
+ <field eval="False" name="purchase_ok"/>
+ </record>
+
<record id="analytic_journal" model="account.analytic.journal">
<field name="code">TS</field>
<field name="name">Timesheet Journal</field>
=== modified file 'hr_timesheet/hr_timesheet_demo.xml'
--- hr_timesheet/hr_timesheet_demo.xml 2011-06-30 13:30:09 +0000
+++ hr_timesheet/hr_timesheet_demo.xml 2011-07-11 11:31:22 +0000
@@ -2,6 +2,7 @@
<openerp>
<data noupdate="1">
+<<<<<<< TREE
<record id="product_consultant" model="product.product">
<field name="list_price">75.0</field>
<field name="standard_price">30.0</field>
@@ -13,6 +14,8 @@
<field eval="False" name="purchase_ok"/>
</record>
+=======
+>>>>>>> MERGE-SOURCE
<record id="hr.employee" model="hr.employee">
<field name="product_id" ref="product_consultant"/>
<field name="journal_id" ref="analytic_journal"/>
=== modified file 'hr_timesheet/security/ir.model.access.csv'
--- hr_timesheet/security/ir.model.access.csv 2011-04-11 07:00:35 +0000
+++ hr_timesheet/security/ir.model.access.csv 2011-07-11 11:31:22 +0000
@@ -1,7 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_hr_user",1,1,1,1
+"access_hr_analytic_timesheet_employee","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_user",1,1,1,0
"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
-"access_hr_account_analytic_line_employee","account.account.analytic.line employee","account.model_account_analytic_line","base.group_user",1,0,0,0
+"access_hr_account_analytic_line_employee","account.account.analytic.line employee","account.model_account_analytic_line","base.group_user",1,1,1,0
"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,1,1,1
"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,1,1,1
@@ -9,4 +10,4 @@
"access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
-"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
\ No newline at end of file
+"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
=== modified file 'hr_timesheet_invoice/security/ir.model.access.csv'
--- hr_timesheet_invoice/security/ir.model.access.csv 2011-01-14 00:11:01 +0000
+++ hr_timesheet_invoice/security/ir.model.access.csv 2011-07-11 11:31:22 +0000
@@ -1,5 +1,6 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,1,1,1
+"access_hr_timesheet_invoice_factor_employee","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_user",1,1,1,1
"access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
"access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0
"access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0
@@ -12,3 +13,5 @@
"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
"access_account_invoice_tax_hr_manager","account.invoice.tax.hr.manager","account.model_account_invoice_tax","base.group_hr_manager",1,1,1,1
"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_hr_user",1,1,1,1
+"access_report_timesheet_line_employee_user","report.timesheet.line","model_report_timesheet_line","base.group_user",1,1,1,0
+
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2011-04-07 09:27:30 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2011-07-11 11:31:22 +0000
@@ -146,7 +146,7 @@
<field name="state"/>
<button name="button_confirm" states="draft" string="Submit to Manager" type="object" icon="terp-check"/>
<button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
- <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
+ <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_user"/>
<button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
</group>
</form>
=== modified file 'hr_timesheet_sheet/hr_timesheet_workflow.xml'
--- hr_timesheet_sheet/hr_timesheet_workflow.xml 2011-01-14 00:11:01 +0000
+++ hr_timesheet_sheet/hr_timesheet_workflow.xml 2011-07-11 11:31:22 +0000
@@ -40,13 +40,13 @@
<record id="t0" model="workflow.transition">
<field name="act_from" ref="act_new"/>
<field name="act_to" ref="act_draft"/>
- <field name="group_id" ref="base.group_hr_user"/>
+ <field name="group_id" ref="base.group_user"/>
</record>
<record id="t1" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_confirm"/>
<field name="signal">confirm</field>
- <field name="group_id" ref="base.group_hr_user"/>
+ <field name="group_id" ref="base.group_user"/>
</record>
<record id="t2" model="workflow.transition">
<field name="act_from" ref="act_confirm"/>
=== modified file 'hr_timesheet_sheet/security/ir.model.access.csv'
--- hr_timesheet_sheet/security/ir.model.access.csv 2011-01-14 00:11:01 +0000
+++ hr_timesheet_sheet/security/ir.model.access.csv 2011-07-11 11:31:22 +0000
@@ -1,9 +1,9 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,1
-"access_hr_timesheet_sheet_sheet_system_employee","hr_timesheet_sheet.sheet.system.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_system_employee","hr_timesheet_sheet.sheet.system.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,0
"access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
-"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,1,1,0
"access_timesheet_report","timesheet.report","model_timesheet_report","base.group_hr_manager",1,1,1,1
_______________________________________________
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
