Removed traces of npg in account_banking_make_deposit

This commit is contained in:
Loïc Faure-Lacroix
2015-03-17 16:38:52 +03:00
committed by Sandy Carter
parent a6eafebea8
commit c2e928e794
7 changed files with 39 additions and 44 deletions

View File

@@ -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:

View File

@@ -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:

View File

@@ -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:

View File

@@ -30,5 +30,3 @@ class account_move_line(osv.osv):
}
account_move_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@@ -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" />

View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Groups - Make Deposits Preparer , Make Deposits Verifier -->
<record id="group_make_deposits_preparer" model="res.groups">
<field name="name">Make Deposits Preparer</field>
</record>
<record id="group_make_deposits_verifier" model="res.groups">
<field name="name">Make Deposits Verifier</field>
</record>
<!-- Security Rule for Deposit Tickets -->
<record id="account_banking_make_deposits_comp_rule" model="ir.rule">
<field name="name">Deposit Tickets</field>
<field ref="model_deposit_ticket" name="model_id"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
</data>
</openerp>

View File

@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Groups - Make Deposits Preparer , Make Deposits Verifier -->
<record id="group_make_deposits_preparer" model="res.groups">
<field name="name">Make Deposits Preparer</field>
</record>
<record id="group_make_deposits_verifier" model="res.groups">
<field name="name">Make Deposits Verifier</field>
</record>
<!-- Security Rule for Deposit Tickets -->
<record id="npg_account_make_deposits_comp_rule" model="ir.rule">
<field name="name">Deposit Tickets</field>
<field ref="model_deposit_ticket" name="model_id"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
</data>
</openerp>