From 6f7db33e10da3c7b1998756ad2b1eb6718f6de1f Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 28 Oct 2008 14:23:01 +0100 Subject: [PATCH 1/5] fix and complete access rights bzr revid: christophe@tinyerp.com-20081028132301-nad47nrol98q69r8 --- addons/account/security/ir.model.access.csv | 2 ++ addons/sale_journal/security/ir.model.access.csv | 1 + addons/stock/security/ir.model.access.csv | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index d231315c175..96ab19de3a3 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -75,6 +75,8 @@ "access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0 "access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0 "access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1 +"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1 "access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1 "access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0 +"access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0 diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv index e199ad1e30b..f958ecb8420 100644 --- a/addons/sale_journal/security/ir.model.access.csv +++ b/addons/sale_journal/security/ir.model.access.csv @@ -2,6 +2,7 @@ "access_sale_journal_invoice_type_stats","sale_journal.invoice.type.stats","model_sale_journal_invoice_type_stats","sale.group_sale_user",1,0,0,0 "access_sale_journal_picking_stats","sale_journal.picking.stats","model_sale_journal_picking_stats","sale.group_sale_user",1,0,0,0 "access_sale_journal_invoice_type","sale_journal.invoice.type","model_sale_journal_invoice_type","sale.group_sale_user",1,0,0,0 +"access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,0,0,0 "access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0 "access_sale_journal_sale_journal","sale_journal.sale.journal","model_sale_journal_sale_journal","sale.group_sale_user",1,0,0,0 "access_sale_journal_picking_journal","sale_journal.picking.journal","model_sale_journal_picking_journal","sale.group_sale_user",1,0,0,0 diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index 80c3013adfc..85843c5823f 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -3,8 +3,7 @@ "access_stock_warehouse_manager","stock.warehouse.manager","model_stock_warehouse","stock.group_stock_manager",1,1,1,1 "access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0 "access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1 -"access_stock_location_user","stock.location.user","model_stock_location","stock.group_stock_user",1,0,0,0 -"access_stock_location_partner_manager","stock.location partner manager","model_stock_location","base.group_partner_manager",1,0,0,0 +"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0 "access_stock_picking_move_wizard","stock.picking.move.wizard","model_stock_picking_move_wizard","stock.group_stock_user",1,1,1,1 "access_stock_tracking","stock.tracking","model_stock_tracking","stock.group_stock_user",1,1,1,0 "access_stock_picking","stock.picking","model_stock_picking","stock.group_stock_user",1,1,1,1 From 18f6e15b564e326849e6b313bec84f1aed540f64 Mon Sep 17 00:00:00 2001 From: Najlaa Date: Tue, 28 Oct 2008 16:40:32 +0100 Subject: [PATCH 2/5] cahnges in profiling bzr revid: nel@silver-20081028154032-q0q5zp61os6omhod --- addons/account/report/account_balance.py | 2 ++ addons/account/report/account_balance.rml | 36 +++++++++---------- addons/account/report/general_ledger.rml | 8 ++--- addons/account/report/invoice.rml | 6 ++-- addons/crm_configuration/__terp__.py | 2 +- addons/crm_configuration/crm_config.py | 1 + addons/crm_configuration/crm_config_view.xml | 1 + .../hr_attendance/report/attendance_errors.py | 2 +- .../profile_accounting/profile_accounting.py | 3 ++ .../profile_accounting/profile_accounting.xml | 1 + addons/profile_association/__terp__.py | 2 +- .../profile_association.py | 3 +- .../profile_association.xml | 2 ++ .../profile_manufacturing.py | 5 ++- .../profile_manufacturing.xml | 1 + addons/profile_service/profile_service.py | 2 ++ addons/profile_service/profile_service.xml | 2 +- addons/purchase/purchase.py | 1 + addons/purchase/report/order.rml | 20 +++++------ addons/purchase/report/request_quotation.rml | 2 +- addons/sale/report/order.rml | 6 ++-- addons/stock/stock.py | 1 + 22 files changed, 64 insertions(+), 45 deletions(-) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 1f3440c1357..65f8aae76db 100755 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -119,6 +119,7 @@ class account_balance(report_sxw.rml_parse): self.date_lst.sort() def lines(self, form, ids={}, done=None, level=1): + print "DS LINES", ids if not ids: ids = self.ids if not ids: @@ -194,6 +195,7 @@ class account_balance(report_sxw.rml_parse): else: result_acc.append(res) res1 = self.moveline(form, account.id,res['level']) + print "NNN",res1, res if res1: for r in res1: result_acc.append(r) diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 8178d8fa399..d42e96710c6 100755 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -50,7 +50,7 @@ - + @@ -174,33 +174,33 @@ + fontSize="8.0" leading="7"/> + fontSize="8.0" leading="7"/> + fontSize="8.0" leading="7"/> + fontSize="8.0" leading="7"/> + fontSize="8.0" leading="7"/> + fontSize="8.0" leading="7"/> @@ -277,24 +277,24 @@ [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ a['code'] or removeParentNode('tr') ]] [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] - [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] - [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) or '0.00' ]] - [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] - [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) or '0.00' ]] - [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] - [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) or '0.00' ]] [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]] [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]] [[ setTag('tr','tr',{'style':('TrLevel_Name'+str(a['level']))}) ]][ref: [[ a['ref'] or removeParentNode('font') ]] ] [[ a['lname'] ]] - [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] - [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] - [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) or '0.00']] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) or '0.00']] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) or '0.00' ]] diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 17b9adccd4f..83589f5f497 100755 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -123,9 +123,9 @@ [[ line['ref'] or '']] [[ line['move'] or '']] [[ line['name'] or '' ]] - [[ line['debit'] and line['debit'] or '0.0' ]] - [[ line['credit'] and line['credit'] or '0.0' ]] - [[ line['progress'] and line['progress'] or '0.0' ]] + [[ line['debit'] or '0.0' ]] + [[ line['credit'] or '0.0' ]] + [[ line['progress'] or '0.0' ]] @@ -175,4 +175,4 @@ - \ No newline at end of file + diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 37b6872dece..717f9a14c2e 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -203,7 +203,7 @@ - + @@ -276,7 +276,7 @@ Invoice Date - Partner Ref. + Partner Code @@ -314,7 +314,7 @@ Disc. (%) - Price + Price diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py index 0f6ccf2cabf..ba9f560644e 100644 --- a/addons/crm_configuration/__terp__.py +++ b/addons/crm_configuration/__terp__.py @@ -9,7 +9,7 @@ people to intelligently and efficiently manage tasks, issues, and requests. It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification.""", - "depends" : ["crm","report_crm", "process", "account"], + "depends" : ["crm","report_crm", "process", "account", "board_document"], "init_xml" : [ "crm_config_view.xml", "crm_bugs_view.xml", diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py index fe57488dd6f..db7a2a2040d 100644 --- a/addons/crm_configuration/crm_config.py +++ b/addons/crm_configuration/crm_config.py @@ -86,6 +86,7 @@ class crm_menu_config_wizard(osv.osv_memory): 'lead' : fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests, the very first contact with a customer request."), 'opportunity' : fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."), 'jobs' : fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."), + 'board_document':fields.boolean('Document Management', help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."), 'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"), 'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), 'helpdesk' : fields.boolean('Help Desk Operations', help="This may help your Help Desk."), diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml index f283c2478f5..c5f3bf2c561 100644 --- a/addons/crm_configuration/crm_config_view.xml +++ b/addons/crm_configuration/crm_config_view.xml @@ -20,6 +20,7 @@ +