From c2e928e7940363563239ea5fb9a1948af0d8c62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Faure-Lacroix?= Date: Tue, 17 Mar 2015 16:38:52 +0300 Subject: [PATCH] Removed traces of npg in account_banking_make_deposit --- account_banking_make_deposit/__init__.py | 4 +-- account_banking_make_deposit/__openerp__.py | 21 ++++++++-------- ...sit.py => account_banking_make_deposit.py} | 4 +-- .../account_move_line.py | 2 -- .../deposit_ticket_report.xml | 2 +- .../account_banking_make_deposit_security.xml | 25 +++++++++++++++++++ .../npg_account_make_deposit_security.xml | 25 ------------------- 7 files changed, 39 insertions(+), 44 deletions(-) rename account_banking_make_deposit/{npg_account_make_deposit.py => account_banking_make_deposit.py} (98%) create mode 100644 account_banking_make_deposit/security/account_banking_make_deposit_security.xml delete mode 100644 account_banking_make_deposit/security/npg_account_make_deposit_security.xml diff --git a/account_banking_make_deposit/__init__.py b/account_banking_make_deposit/__init__.py index 379aa020a..6a05c7422 100644 --- a/account_banking_make_deposit/__init__.py +++ b/account_banking_make_deposit/__init__.py @@ -21,7 +21,5 @@ ############################################################################## import wizard import report -import npg_account_make_deposit +import account_banking_make_deposit import account_move_line - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_banking_make_deposit/__openerp__.py b/account_banking_make_deposit/__openerp__.py index 7c7453e2c..1b7eb18f1 100644 --- a/account_banking_make_deposit/__openerp__.py +++ b/account_banking_make_deposit/__openerp__.py @@ -41,18 +41,19 @@ This module is seen as a prerequisite to support efficient Bank Account Statemen 'website': 'www.novapointgroup.com', 'depends': ['account_cancel', 'report_webkit'], 'init_xml': [], - 'update_xml': ['security/npg_account_make_deposit_security.xml', - 'security/ir.model.access.csv', - 'wizard/add_deposit_items_view.xml', - 'npg_account_make_deposit_view.xml', - 'account_move_line_view.xml', - 'deposit_ticket_report.xml', - ], - 'demo_xml': ['demo/npg_account_make_deposit_demo.xml'], + 'update_xml': [ + 'security/account_banking_make_deposit_security.xml', + 'security/ir.model.access.csv', + 'wizard/add_deposit_items_view.xml', + 'account_banking_make_deposit_view.xml', + 'account_move_line_view.xml', + 'deposit_ticket_report.xml', + ], + 'demo_xml': [ + 'demo/account_banking_make_deposit_demo.xml' + ], 'test': [], 'active': False, 'installable': True, 'certificate':'' } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_banking_make_deposit/npg_account_make_deposit.py b/account_banking_make_deposit/account_banking_make_deposit.py similarity index 98% rename from account_banking_make_deposit/npg_account_make_deposit.py rename to account_banking_make_deposit/account_banking_make_deposit.py index 633b10118..a05126717 100644 --- a/account_banking_make_deposit/npg_account_make_deposit.py +++ b/account_banking_make_deposit/account_banking_make_deposit.py @@ -46,7 +46,7 @@ class deposit_ticket(osv.osv): NOTE: DONE Deposit Tickets are only allowed to be deleted by a Make Deposits Verifier.""" model_data_obj = self.pool.get('ir.model.data') res_groups_obj = self.pool.get('res.groups') - group_verifier_id = model_data_obj._get_id(cr, uid, 'npg_account_make_deposit', 'group_make_deposits_verifier') + group_verifier_id = model_data_obj._get_id(cr, uid, 'account_banking__make_deposit', 'group_make_deposits_verifier') for deposit in self.browse(cr, uid, ids, context=context): if group_verifier_id: res_id = model_data_obj.read(cr, uid, [group_verifier_id], ['res_id'])[0]['res_id'] @@ -287,5 +287,3 @@ class deposit_ticket_line(osv.osv): return super(deposit_ticket_line, self).unlink(cr, uid, ids, context=context) deposit_ticket_line() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_banking_make_deposit/account_move_line.py b/account_banking_make_deposit/account_move_line.py index cf20f8ac3..c14b7d0f4 100644 --- a/account_banking_make_deposit/account_move_line.py +++ b/account_banking_make_deposit/account_move_line.py @@ -30,5 +30,3 @@ class account_move_line(osv.osv): } account_move_line() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_banking_make_deposit/deposit_ticket_report.xml b/account_banking_make_deposit/deposit_ticket_report.xml index f6a871167..5e3349b47 100644 --- a/account_banking_make_deposit/deposit_ticket_report.xml +++ b/account_banking_make_deposit/deposit_ticket_report.xml @@ -6,7 +6,7 @@ model="deposit.ticket" auto="False" name="deposit.ticket" - file="npg_account_make_deposit/report/deposit_ticket.mako" + file="account_banking_make_deposit/report/deposit_ticket.mako" string="Internal Deposit Ticket" report_type="webkit" /> diff --git a/account_banking_make_deposit/security/account_banking_make_deposit_security.xml b/account_banking_make_deposit/security/account_banking_make_deposit_security.xml new file mode 100644 index 000000000..cdd05c0d8 --- /dev/null +++ b/account_banking_make_deposit/security/account_banking_make_deposit_security.xml @@ -0,0 +1,25 @@ + + + + + + + + Make Deposits Preparer + + + + Make Deposits Verifier + + + + + + Deposit Tickets + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + diff --git a/account_banking_make_deposit/security/npg_account_make_deposit_security.xml b/account_banking_make_deposit/security/npg_account_make_deposit_security.xml deleted file mode 100644 index de21bb7d9..000000000 --- a/account_banking_make_deposit/security/npg_account_make_deposit_security.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Make Deposits Preparer - - - - Make Deposits Verifier - - - - - - Deposit Tickets - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - - - - \ No newline at end of file