diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index d5a5baab946..7b9ddb4ebc3 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -54,7 +54,6 @@ - diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv index 5458e6c2ac3..94c9c1f83aa 100644 --- a/addons/auction/security/ir.model.access.csv +++ b/addons/auction/security/ir.model.access.csv @@ -1,11 +1,13 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_auction_artists","auction.artists","model_auction_artists","group_auction_manager",1,1,1,1 +"access_auction_dates_user","auction.dates user","model_auction_dates","group_auction_user",1,0,0,0 "access_auction_dates_manager","auction.dates manager","model_auction_dates","group_auction_manager",1,1,1,1 "access_auction_deposit_manager","auction.deposit manager","model_auction_deposit","group_auction_manager",1,1,1,1 +"access_auction_deposit_user","auction.deposit user","model_auction_deposit","group_auction_user",1,0,0,0 "access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","group_auction_manager",1,1,1,1 "access_auction_lot_category","auction.lot.category","model_auction_lot_category","group_auction_user",1,0,0,0 "access_auction_lot_category_manager","auction.lot.category manager","model_auction_lot_category","group_auction_manager",1,1,1,1 -"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,1 +"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,0 "access_auction_lots_manager","auction.lots manager","model_auction_lots","group_auction_manager",1,0,0,0 "access_auction_bid","auction.bid","model_auction_bid","group_auction_user",1,1,1,1 "access_auction_bid_manager","auction.bid manager","model_auction_bid","group_auction_manager",1,0,0,0 @@ -18,6 +20,7 @@ "access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1 "access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1 "access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1 +"access_auction_account_tax_user","account.tax user","account.model_account_tax","group_auction_user",1,0,0,0 "access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0 "access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0 "access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0 diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv index 6ba022b2535..fb110ba70d1 100644 --- a/addons/crm_profiling/security/ir.model.access.csv +++ b/addons/crm_profiling/security/ir.model.access.csv @@ -3,3 +3,5 @@ "access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","base.group_sale_manager",1,0,0,0 "access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0 "access_crm_profiling_question_user","crm_profiling.question user","model_crm_profiling_question","base.group_sale_manager",1,0,0,0 +"access_crm_profiling_questionnarie_user","crm_profiling.questionnarie user","model_crm_profiling_questionnaire","base.group_sale_salesman",1,0,0,0 +"access_crm_profiling_questionnarie_manager","crm_profiling.questionnarie manager","model_crm_profiling_questionnaire","base.group_sale_manager",1,1,1,1 diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv index 9ee5ae7ec80..a2e4b55bed5 100644 --- a/addons/event/security/ir.model.access.csv +++ b/addons/event/security/ir.model.access.csv @@ -13,3 +13,4 @@ "access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0 "access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0 "access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0 +"access_event_registration_sale_user","event.registration.sale.user","model_event_registration","base.group_sale_salesman",1,0,0,0 diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py index 9da1394382a..563f1b52bc1 100644 --- a/addons/hr_payroll_account/__openerp__.py +++ b/addons/hr_payroll_account/__openerp__.py @@ -38,6 +38,7 @@ 'init_xml': [ ], 'update_xml': [ + "security/ir.model.access.csv", "hr_payroll_account_view.xml", ], 'demo_xml': [ @@ -47,4 +48,4 @@ 'active': False, } -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_payroll_account/security/ir.model.access.csv b/addons/hr_payroll_account/security/ir.model.access.csv new file mode 100644 index 00000000000..d71b8404a12 --- /dev/null +++ b/addons/hr_payroll_account/security/ir.model.access.csv @@ -0,0 +1,2 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_hr_payslip_account_move_user","access.hr.payslip.account.move.user","model_hr_payslip_account_move","base.group_user",1,0,0,0 diff --git a/addons/sale/sale.py b/addons/sale/sale.py index caee07d4aff..7b7f098ffd9 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -940,9 +940,10 @@ class sale_order_line(osv.osv): 'for this product: "%s" (id:%d)') % \ (line.product_id.name, line.product_id.id,)) else: - a = self.pool.get('ir.property').get(cr, uid, + prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', - context=context).id + context=context) + a = prop and prop.id or False uosqty = _get_line_qty(line) uos_id = _get_line_uom(line) pu = 0.0 diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index b9eabcaa02e..3431c911a97 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -292,6 +292,7 @@ form tree,form,calendar,graph + {"search_default_user_id":uid} Sales Orders helps you manage quotations and orders done with your customers. OpenERP suggests that you to start by creating a quotation. Once the order is confirmed, the quotation is converted into a Sale Order. OpenERP can handle several types of products so that a sales order can trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sale order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer. diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 36a8fc15118..27852979773 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -31,6 +31,19 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Personal Orders + + ['|',('user_id','=',user.id),('user_id','=',False)] + + + + + Personal Order Lines + + ['|',('order_id.user_id','=',user.id),('order_id.user_id','=',False)] + + diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 4f2eafb4e52..21b63fd3bc1 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -43,7 +43,6 @@ 'website': 'http://www.openerp.com', 'data': [ 'security/share_security.xml', - 'security/ir.model.access.csv', 'share_view.xml', 'res_users_view.xml', 'wizard/share_wizard_view.xml' diff --git a/addons/share/security/ir.model.access.csv b/addons/share/security/ir.model.access.csv deleted file mode 100644 index a8f37d300c6..00000000000 --- a/addons/share/security/ir.model.access.csv +++ /dev/null @@ -1,2 +0,0 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_share_wizard_user","access_share_wizard_user","model_share_wizard","share.group_share_user",1,1,1,1 \ No newline at end of file