diff --git a/account_check_deposit/__init__.py b/account_check_deposit/__init__.py index d0334331b..91e61fc83 100644 --- a/account_check_deposit/__init__.py +++ b/account_check_deposit/__init__.py @@ -19,10 +19,5 @@ # # ############################################################################### - - import account_deposit - - - diff --git a/account_check_deposit/__openerp__.py b/account_check_deposit/__openerp__.py index 5fdfa4610..c63a46b29 100644 --- a/account_check_deposit/__openerp__.py +++ b/account_check_deposit/__openerp__.py @@ -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, diff --git a/account_check_deposit/account_deposit.py b/account_check_deposit/account_deposit.py index 81dfdb72e..ac8b5c2ea 100644 --- a/account_check_deposit/account_deposit.py +++ b/account_check_deposit/account_deposit.py @@ -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'), } diff --git a/account_check_deposit/account_deposit_view.xml b/account_check_deposit/account_deposit_view.xml index 856dbbd5b..2a74daef0 100644 --- a/account_check_deposit/account_deposit_view.xml +++ b/account_check_deposit/account_deposit_view.xml @@ -15,7 +15,7 @@ model="account.check.deposit" name="check.deposit.webkit" report_type="webkit" - string="WebKit Checks Deposit"/> + string="Print Checks Deposit"/> @@ -26,10 +26,13 @@
-
@@ -41,12 +44,14 @@ - + - @@ -108,7 +113,11 @@ - + diff --git a/account_check_deposit/i18n/fr.po b/account_check_deposit/i18n/fr.po index 5df143428..0b869dbdf 100644 --- a/account_check_deposit/i18n/fr.po +++ b/account_check_deposit/i18n/fr.po @@ -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 diff --git a/account_check_deposit/security/ir.model.access.csv b/account_check_deposit/security/ir.model.access.csv new file mode 100644 index 000000000..8f26e463a --- /dev/null +++ b/account_check_deposit/security/ir.model.access.csv @@ -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