From 8463fba8bc05eb3a4c5af10638dd31ce81a6fddc Mon Sep 17 00:00:00 2001
From: "MTR(OpenERP)" <>
Date: Tue, 10 Aug 2010 18:42:32 +0530
Subject: [PATCH 1/8] [Fix] sale : Add the product_uos in order line
bzr revid: sbh@tinyerp.com-20100810131232-hx0fyeptxsft9off
---
addons/sale/sale_view.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e138f718333..bb32cfc8f83 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -133,6 +133,7 @@
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, parent.fiscal_position, True)"
/>
+
Date: Tue, 10 Aug 2010 19:00:50 +0530
Subject: [PATCH 2/8] [IMP] stock: set move_stock_return_history blank in copy
method
bzr revid: sbh@tinyerp.com-20100810133050-rf3pvcptnqvber21
---
addons/stock/stock.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 812cd0fb492..fc37f1590e0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1430,6 +1430,7 @@ class stock_move(osv.osv):
if default is None:
default = {}
default = default.copy()
+ default['move_stock_return_history'] = []
return super(stock_move, self).copy(cr, uid, id, default, context=context)
def _auto_init(self, cursor, context=None):
From 2ac64a0850a6502c6a1271f44ad9105c08117b90 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)"
Date: Tue, 10 Aug 2010 19:07:05 +0530
Subject: [PATCH 3/8] [IMP] stock : Remove the comment code
bzr revid: sbh@tinyerp.com-20100810133705-jg005axz6bz86e3p
---
addons/stock/wizard/stock_return_picking_view.xml | 12 ------------
addons/stock/wizard/stock_ups.py | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index d6c832d646f..36a7c23a66f 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -1,18 +1,6 @@
-
-
-
Date: Tue, 10 Aug 2010 19:15:29 +0530
Subject: [PATCH 4/8] [IMP]
crm,hr_*,auction,knowledge,mrp,product,project,sale,survey : access rights
improvements
bzr revid: vir@tinyerp.com-20100810134529-wyqlh5d3zabd25gv
---
addons/association/profile_association.xml | 2 +-
addons/auction/auction_view.xml | 2 +-
addons/crm/crm_view.xml | 1 +
addons/crm/security/crm_security.xml | 4 ----
addons/crm/security/ir.model.access.csv | 5 +++++
addons/hr/hr_view.xml | 2 +-
addons/hr/security/hr_security.xml | 4 ++++
addons/hr_attendance/hr_attendance_view.xml | 2 +-
addons/hr_attendance/security/hr_security.xml | 2 +-
.../hr_attendance/security/ir.model.access.csv | 12 ++++++------
.../wizard/hr_attendance_sign_in_out_view.xml | 2 +-
addons/hr_timesheet/test/test_hr_timesheet.yml | 2 +-
.../hr_timesheet_sheet_view.xml | 16 ++++++++--------
addons/knowledge/knowledge_view.xml | 2 +-
.../knowledge/security/knowledge_security.xml | 5 +++++
addons/marketing/marketing_view.xml | 2 +-
addons/mrp/board_manufacturing_view.xml | 2 +-
addons/mrp/mrp_view.xml | 6 +++---
addons/mrp/report/mrp_report_view.xml | 2 +-
addons/mrp/security/ir.model.access.csv | 4 ++++
addons/mrp/security/mrp_security.xml | 2 +-
addons/product/product_view.xml | 5 +++--
addons/project/security/ir.model.access.csv | 2 ++
addons/project/security/project_security.xml | 4 ++++
addons/purchase/purchase_view.xml | 2 +-
addons/sale/security/ir.model.access.csv | 18 ++++++++++++++----
addons/survey/survey_view.xml | 2 +-
27 files changed, 73 insertions(+), 41 deletions(-)
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 630b02790b8..88a8c2940d0 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -63,7 +63,7 @@
-
+
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 9f1ba5b8769..20b6dede1f6 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index ba5c8edab77..d641f012297 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -4,6 +4,7 @@
+
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index b679ef791ba..9c63e611e93 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -14,9 +14,5 @@
-
-
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 5f8cbe9719c..f9ffc78d50d 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -62,3 +62,8 @@
"access_base_res_partner_canal_system","base.res.partner.canal system","base.model_res_partner_canal","base.group_system",1,1,1,1
"access_res_partner_category_system","res.partner.category system","base.model_res_partner_category","base.group_system",1,1,1,1
"access_res_partner_title_system","res.partner.title system","base.model_res_partner_title","base.group_system",1,1,1,1
+"access_crm_lead_system","crm.lead.system","model_crm_lead","base.group_system",1,0,0,0
+"access_crm_meeting_system","crm.meeting.system","model_crm_meeting","base.group_system",1,0,0,0
+"access_calendar_attendee_system","calendar.attendee.system","model_calendar_attendee","base.group_system",1,0,0,0
+"access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
+"access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 7d8c7b62644..0b95ca073ef 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 4f7691f03e9..366744f22ff 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -10,5 +10,9 @@
Human Resources / User
+
+ Human Resources / Attendances User
+
+
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 2b8d1ab7a86..659d27cec9a 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -75,7 +75,7 @@
-
+
hr.action.reason.form
diff --git a/addons/hr_attendance/security/hr_security.xml b/addons/hr_attendance/security/hr_security.xml
index fd6ad2e0ccb..15c4ec2693c 100644
--- a/addons/hr_attendance/security/hr_security.xml
+++ b/addons/hr_attendance/security/hr_security.xml
@@ -2,7 +2,7 @@
-
+
Human Resources / Attendances User
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 1fb40252872..a22d252448d 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,11 +1,11 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","group_hr_attendance",1,0,0,0
+"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","base.group_hr_attendance",1,0,0,0
"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","base.group_hr_manager",1,1,1,1
"access_hr_action_reason_employee_user","hr action reason employee user","model_hr_attendance","base.group_hr_user",1,1,1,1
"access_hr_action_reason_employee_manager","hr action reason employee manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
-"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","group_hr_attendance",1,1,1,1
-"access_hr_employee_attendance","hr employee attendance sign in out","hr.model_hr_employee","group_hr_attendance",1,1,1,1
-"access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","group_hr_attendance",1,1,1,1
-"access_hr_job_attendance","hr_job_attendance","hr.model_hr_job","group_hr_attendance",1,0,0,0
-"access_hr_department_attendance","hr.department attendance","hr.model_hr_department","group_hr_attendance",1,0,0,0
+"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","base.group_hr_attendance",1,1,1,1
+"access_hr_employee_attendance","hr employee attendance sign in out","hr.model_hr_employee","base.group_hr_attendance",1,1,1,1
+"access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","base.group_hr_attendance",1,1,1,1
+"access_hr_job_attendance","hr_job_attendance","hr.model_hr_job","base.group_hr_attendance",1,0,0,0
+"access_hr_department_attendance","hr.department attendance","hr.model_hr_department","base.group_hr_attendance",1,0,0,0
"access_hr_action_reason","hr.action.reason","model_hr_action_reason","base.group_system",1,1,1,1
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 676791372d5..534d4dfb345 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -47,7 +47,7 @@
+ parent="menu_hr_time_tracking" sequence="4" groups="base.group_hr_manager,base.group_hr_user,base.group_hr_attendance"/>
hr.sign.in.out.ask.form
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index ce132a5f85a..9f561964cb2 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -21,7 +21,7 @@
context_lang: en_US
groups_id:
- base.group_hr_user
- - hr_attendance.group_hr_attendance
+ - base.group_hr_attendance
- base.group_user
- base.group_extended
- base.group_hr_manager
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 9b51343f6b6..f04e9253b7a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -13,9 +13,9 @@
-
+
-
+
@@ -116,19 +116,19 @@
-
+
-
+
-
-
+
+
@@ -164,9 +164,9 @@
-
+
-
+
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index 9739450006f..cbd1e635322 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,6 +1,6 @@
-
+
+
+
+ Knowledge / User
+
+
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 4234b65eb5f..7f679e7e1fd 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,7 +2,7 @@
-
+
marketing.installer.view
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 2c0182bb704..a3cbee71e36 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -42,6 +42,6 @@
icon="terp-graph"
id="menu_board_manufacturing"
parent="menus_dash_mrp"
- sequence="1" groups="mrp.group_mrp_manager"/>
+ sequence="1" groups="mrp.group_mrp_manager,mrp.group_mrp_user"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8e4a2e2d0d4..b145de3b352 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 51577db1ce2..41cbb5554c8 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -87,3 +87,7 @@
"access_mrp_production_system","mrp.production system","model_mrp_production","base.group_system",1,0,0,0
"access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
+"access_procurement_order_compute_all_user","procurement.order.compute.all.user","procurement.model_procurement_order_compute_all","mrp.group_mrp_user",1,0,0,0
+"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,1,1,1
+"access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
+"access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 4d47e374e02..406371a89dd 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -6,7 +6,7 @@
Manufacturing / Manager
- Manufacturing / Worker
+ Manufacturing / User
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e50d8f81bcb..d3dec68e6bb 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -195,9 +195,10 @@
+
-
-
+
+
Products
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 22feb0fa998..2041eda3651 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -30,3 +30,5 @@
"access_account_analytic_account_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,0,0,0
"access_project_vs_hours_system","project.vs.hours.system","model_project_vs_hours","base.group_system",1,0,0,0
"mail_gateway_mailgate_message_project_user","mail_gateway.mailgate.message user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
+"access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
+"access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 8afe7de090c..f968ffc51a3 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -14,6 +14,10 @@
Project / User
+
+ Sales / User
+
+
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 6842a1ea0d9..f2917e030c0 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 6d434fa9bd6..89a2003698c 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -17,19 +17,19 @@
"access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
"access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1
"access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
-"access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,1,1,1
+"access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,0,0,0
"access_res_partner_sale_manager","res.partner.sale.user","base.model_res_partner","base.group_sale_manager",1,0,0,0
"access_res_partner_sale_system","res.partner.sale.system","base.model_res_partner","base.group_system",1,0,0,0
"access_report_stock_move_sales","report.stock.move.sale","stock.model_report_stock_move","base.group_sale_manager",1,1,1,1
"access_stock_picking_sales","stock.picking.sales","stock.model_stock_picking","base.group_sale_manager",1,1,1,1
-"access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,1,1,1
-"access_product_product_sale_user","product.product sale use","product.model_product_product","base.group_sale_salesman",1,1,1,1
+"access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,0,0,0
+"access_product_product_sale_user","product.product sale use","product.model_product_product","base.group_sale_salesman",1,0,0,0
"access_product_template_sale","product.template sale manager","product.model_product_template","base.group_sale_manager",1,0,0,0
"access_product_product_sale","product.product sale manager","product.model_product_product","base.group_sale_manager",1,0,0,0
"access_sale_shop_manager","account.journal sale order.user","model_sale_shop","base.group_sale_manager",1,0,0,0
"access_account_fiscalyear_manager","account.fiscalyear.manager","account.model_account_fiscalyear","base.group_sale_manager",1,0,0,0
"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_sale_salesman",1,1,1,1
-"access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,1
+"access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,0,0,0
"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,1,1,1
"access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,1
"access_res_country_system","res.country system","base.model_res_country","base.group_system",1,1,1,1
@@ -49,3 +49,13 @@
"access_product_supplierinfo_manager","product.supplierinfo.manager","product.model_product_supplierinfo","base.group_sale_manager",1,0,0,0
"access_product_packaging_manager","product.packaging.manager","product.model_product_packaging","base.group_sale_manager",1,0,0,0
"access_stock_location_manager","stock.location.manager","stock.model_stock_location","base.group_sale_manager",1,0,0,0
+"access_stock_warehouse_user","stock.warehouse.user","stock.model_stock_warehouse","base.group_sale_salesman",1,0,0,0
+"access_res_partner_bank_type_manager","res.partner.bank.type.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
+"access_res_partner_bank_type_user","res.partner.bank.type.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
+"access_stock_location_user","stock.location.user","stock.model_stock_location","base.group_sale_salesman",1,0,0,0
+"access_res_partner_bank_type_field_user","res.partner.bank.type.field.user","base.model_res_partner_bank_type_field","base.group_sale_salesman",1,0,0,0
+"access_product_uom_user","product.uom.user","product.model_product_uom","base.group_sale_salesman",1,0,0,0
+"access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0
+"access_res_partner_bank_type_field_system","res.partner.bank.type.field.system","base.model_res_partner_bank_type_field","base.group_system",1,0,0,0
+"access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0
+"access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 32070672cbf..f45eab0bf9d 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -2,7 +2,7 @@
-
+