audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX+IMP] account_check_deposit: Several things:

Browse Source 
* Clean code
* Add access rules for account_check_deposit
* Change print button name
This commit is contained in:
Benoit Guillot
2013-04-11 14:32:08 +02:00
committed by ps-tubtim
parent 96c2f3a0c4
commit f2eddcf787
6 changed files with 86 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
account_check_deposit/__init__.py
View File

@@ -19,10 +19,5 @@
# #
###############################################################################
import account_deposit

8
account_check_deposit/__openerp__.py
View File

@@ -24,7 +24,7 @@
{
'name': 'account_check_deposit',
'version': '7.0',
'version': '0.1',
'category': 'Generic Modules/Others',
'license': 'AGPL-3',
'description': """This module allows you to use check deposits.
@@ -33,12 +33,16 @@
You may have to create an account for recieved checks and a journal for payment by checks.""",
'author': 'Akretion',
'website': 'http://www.akretion.com/',
'depends': ['account_accountant','report_webkit','sale_quick_payment'],
'depends': ['account_accountant',
'report_webkit',
'sale_quick_payment'
],
'init_xml': [],
'update_xml': [
'account_deposit_view.xml',
'account_deposit_sequence.xml',
'account_type_data.xml',
'security/ir.model.access.csv',
],
'demo_xml': [],
'installable': True,

93
account_check_deposit/account_deposit.py
View File

@@ -20,11 +20,11 @@
# #
###############################################################################
from openerp.osv import fields, osv
from openerp.osv.orm import Model
from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
class account_check_deposit(Model):
class account_check_deposit(orm.Model):
_name = "account.check.deposit"
_description = "Account Check Deposit"
@@ -39,25 +39,38 @@ class account_check_deposit(Model):
_columns = {
'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
'check_payment_ids': fields.many2many('account.move.line', 'account_move_line_deposit_rel',
'check_deposit_id', 'move_line_id', 'Check Payments',
readonly=True, states={'draft':[('readonly',False)]}),
'deposit_date': fields.date('Deposit Date', readonly=True, states={'draft':[('readonly',False)]}),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True,
'name': fields.char('Name', size=64, required=True, readonly=True,
tates={'draft':[('readonly',False)]}),
'check_payment_ids': fields.many2many('account.move.line',
'account_move_line_deposit_rel',
'check_deposit_id',
'move_line_id',
'Check Payments',
readonly=True,
states={'draft':[('readonly',False)]}),
'deposit_date': fields.date('Deposit Date', readonly=True,
states={'draft':[('readonly',False)]}),
'journal_id': fields.many2one('account.journal', 'Journal',
required=True, readonly=True,
states={'draft':[('readonly',False)]}),
'state': fields.selection([
('draft','Draft'),
('done','Done'),
('cancel','Cancelled')
],'Status', readonly=True),
'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True,
'move_id': fields.many2one('account.move', 'Journal Entry',
readonly=True,
states={'draft':[('readonly',False)]}),
'bank_id': fields.many2one('res.partner.bank', 'Bank', required=True, readonly=True,
domain="[('partner_id', '=', partner_id)]",
'bank_id': fields.many2one('res.partner.bank', 'Bank', required=True,
readonly=True,
domain="[('partner_id', '=', partner_id)]",
states={'draft':[('readonly',False)]}),
'partner_id':fields.related('company_id', 'partner_id', type="many2one",
relation="res.partner", string="Partner",
readonly=True),
'company_id': fields.many2one('res.company', 'Company', required=True,
change_default=True, readonly=True,
states={'draft':[('readonly',False)]}),
'partner_id':fields.related('company_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", readonly=True),
'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
'total_amount': fields.function(sum_amount, string ="total amount"),
}
@@ -87,9 +100,13 @@ class account_check_deposit(Model):
def _prepare_account_move_vals(self, cr, uid, deposit, context=None):
move_vals = {}
move_lines = [[0, 0, self._prepare_sum_move_line_vals(cr, uid, deposit, move_vals, context=context)]]
move_lines = [[0, 0, self._prepare_sum_move_line_vals(cr, uid,
deposit, move_vals,
context=context)]]
for line in deposit.check_payment_ids:
move_lines.append([0, 0, self._prepare_move_line_vals(cr, uid, line, move_vals, context=context)])
move_lines.append([0, 0, self._prepare_move_line_vals(cr, uid, line,
move_vals,
context=context)])
move_vals.update({
'journal_id': deposit.journal_id.id,
'line_id': move_lines,
@@ -97,11 +114,12 @@ class account_check_deposit(Model):
return move_vals
def _prepare_move_line_vals(self, cr, uid, line, move_vals, context=None):
move_line_vals = self.pool.get('account.move.line').default_get(cr, uid,
['centralisation', 'date','date_created',
'currency_id', 'journal_id', 'amount_currency',
'account_id', 'period_id', 'company_id'],
context=context)
move_line_vals = self.pool.get('account.move.line').default_get(
cr, uid,
['centralisation', 'date','date_created', 'currency_id',
'journal_id', 'amount_currency', 'account_id', 'period_id',
'company_id'],
context=context)
move_line_vals.update({
'name': line.name,
'credit': line.debit,
@@ -112,11 +130,12 @@ class account_check_deposit(Model):
return move_line_vals
def _prepare_sum_move_line_vals(self, cr, uid, deposit, move_vals, context=None):
move_line_vals = self.pool.get('account.move.line').default_get(cr, uid,
['centralisation', 'date','date_created',
'currency_id', 'journal_id', 'amount_currency',
'account_id', 'period_id', 'company_id', 'state'],
context=context)
move_line_vals = self.pool.get('account.move.line').default_get(
cr, uid,
['centralisation', 'date','date_created', 'currency_id',
'journal_id', 'amount_currency', 'account_id', 'period_id',
'company_id', 'state'],
context=context)
debit = 0.0
for line in deposit.check_payment_ids:
@@ -132,11 +151,15 @@ class account_check_deposit(Model):
def _reconcile_checks(self, cr, uid, deposit, move_id, context=None):
move_line_obj = self.pool.get('account.move.line')
for line in deposit.check_payment_ids:
move_line_ids = move_line_obj.search(cr, uid, [('move_id', '=', move_id),
('credit', '=', line.debit),
('name', '=', line.ref)], context=context)
move_line_ids = move_line_obj.search(cr, uid,
[('move_id', '=', move_id),
('credit', '=', line.debit),
('name', '=', line.ref)],
context=context)
if move_line_ids:
move_line_obj.reconcile(cr, uid, [line.id, move_line_ids[0]], context=context)
move_line_obj.reconcile(cr, uid,
[line.id, move_line_ids[0]],
context=context)
return True
@@ -157,7 +180,6 @@ class account_check_deposit(Model):
for deposit in self.browse(cr, uid, ids, context=context):
context['journal_id'] = deposit.journal_id.id
move_vals = self._prepare_account_move_vals(cr, uid, deposit, context=context)
print "move_vals ====>", move_vals
move_id = move_obj.create(cr, uid, move_vals, context=context)
move_obj.post(cr, uid, [move_id], context=context)
self._reconcile_checks(cr, uid, deposit, move_id, context=context)
@@ -165,10 +187,13 @@ class account_check_deposit(Model):
return True
class account_move_line(Model):
class account_move_line(orm.Model):
_inherit = "account.move.line"
_columns = {
'check_deposit_id': fields.many2many('account.check.deposit', 'account_move_line_deposit_rel',
'check_deposit_id', 'move_line_id', 'Check Deposit'),
'check_deposit_id': fields.many2many('account.check.deposit',
'account_move_line_deposit_rel',
'check_deposit_id',
'move_line_id',
'Check Deposit'),
}

23
account_check_deposit/account_deposit_view.xml
View File

@@ -15,7 +15,7 @@
model="account.check.deposit"
name="check.deposit.webkit"
report_type="webkit"
string="WebKit Checks Deposit"/>
string="Print Checks Deposit"/>
<!-- INHERITED VIEW FOR THE OBJECT : account_check_deposit -->
@@ -26,10 +26,13 @@
<field name="arch" type="xml">
<form string="Checks Deposit" version="7.0">
<header>
<button name="validate_deposit" states="draft" string="Validate Deposit"
<button name="validate_deposit" states="draft"
string="Validate Deposit"
type="object" class="oe_highlight"/>
<button name="cancel" states="done" string="Cancel" type="object" />
<field name="state" widget="statusbar" statusbar_visible="draft,done"
<button name="cancel" states="done"
string="Cancel" type="object" />
<field name="state" widget="statusbar"
statusbar_visible="draft,done"
statusbar_colors='{"draft":"blue"}'/>
</header>
<sheet>
@@ -41,12 +44,14 @@
<field name="deposit_date" />
<field name="journal_id" />
<field name="move_id" />
<field name="company_id" on_change="onchange_company_id(company_id, context)"/>
<field name="company_id"
on_change="onchange_company_id(company_id, context)"/>
<field name="partner_id" invisible="1"/>
<field name="bank_id"/>
</group>
<separator string="Check Payments"/>
<field name="check_payment_ids" nolabel="1" colspan="4" widget="many2many"
<field name="check_payment_ids" nolabel="1"
colspan="4" widget="many2many"
domain="[('reconcile_id','=',False),
('account_id.user_type.code','=','recieved_check')]">
<tree string="Check Payment">
@@ -108,7 +113,11 @@
<field name="help" type="html"></field>
</record>
<menuitem string="Checks Deposit" action="action_check_deposit_tree" id="menu_check_deposit_tree" parent="account.menu_finance_bank_and_cash" sequence="20"/>
<menuitem string="Checks Deposit"
action="action_check_deposit_tree"
id="menu_check_deposit_tree"
parent="account.menu_finance_bank_and_cash"
sequence="20"/>
</data>
</openerp>

4
account_check_deposit/i18n/fr.po
View File

@@ -34,8 +34,8 @@ msgstr "Regrouper par..."
#. module: account_check_deposit
#: model:ir.actions.report.xml,name:account_check_deposit.check_deposit_webkit
msgid "WebKit Checks Deposit"
msgstr "WebKit pour Remise de Chèques"
msgid "Print Checks Deposit"
msgstr "Imprimer Remise de Chèques"
#. module: account_check_deposit
#: report:addons/account_check_deposit/report/check_deposit.mako:79

3
account_check_deposit/security/ir.model.access.csv Normal file
View File

@@ -0,0 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_account_check_deposit_account_check_deposit_group_manager","account_check_deposit_account_check_deposit_group_manager","model_account_check_deposit","base.group_system",1,1,1,1
"access_account_check_deposit_account_check_deposit_group_user","account_check_deposit_account_check_deposit_group_user","model_account_check_deposit","base.group_user",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_account_check_deposit_account_check_deposit_group_manager account_check_deposit_account_check_deposit_group_manager model_account_check_deposit base.group_system 1 1 1 1
3 access_account_check_deposit_account_check_deposit_group_user account_check_deposit_account_check_deposit_group_user model_account_check_deposit base.group_user 1 0 0 0