diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index b879be02156..5f93448acfa 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -66,6 +66,7 @@ module named account_voucherss
'wizard/account_journal_select_view.xml',
'wizard/account_change_currency_view.xml',
'wizard/account_validate_move_view.xml',
+ 'wizard/account_statement_from_invoice_view.xml',
'project/wizard/project_account_analytic_line_view.xml',
'account_view.xml',
'account_end_fy.xml',
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e0a316ae2a1..b7154c2e49a 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -27,6 +27,26 @@ from tools.misc import currency
from tools.translate import _
class account_bank_statement(osv.osv):
+
+ def button_import_invoice(self, cr, uid, ids, context=None):
+ mod_obj = self.pool.get('ir.model.data')
+ if context is None:
+ context = {}
+ model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice')], context=context)
+ resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+ context.update({'statement_id': ids[0]})
+ return {
+ 'name': _('Import Invoice'),
+ 'context': context,
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.statement.from.invoice',
+ 'views': [(resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ 'nodestroy': True
+ }
+
def _default_journal_id(self, cr, uid, context={}):
if context.get('journal_id', False):
return context['journal_id']
@@ -352,7 +372,7 @@ class account_bank_statement(osv.osv):
raise osv.except_osv(_('Invalid action !'), _('Cannot delete bank statement which are already confirmed !'))
osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
return True
-
+
account_bank_statement()
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d62c2113e27..72d35dbc3ed 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -340,8 +340,9 @@
-
+
+
+
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 6302b750e89..5dfa30919d5 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -39,12 +39,12 @@
-
+
+
+
+
+
+
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index a29acadd486..5b82b06f7a9 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -52,7 +52,7 @@ import wizard_use_model
import account_state_open
-import wizard_statement_from_invoice
+import account_statement_from_invoice
import account_print_journal
import account_central_journal
import account_general_journal
diff --git a/addons/account/wizard/account_statement_from_invoice.py b/addons/account/wizard/account_statement_from_invoice.py
new file mode 100644
index 00000000000..9d9b55cb8ac
--- /dev/null
+++ b/addons/account/wizard/account_statement_from_invoice.py
@@ -0,0 +1,143 @@
+import time
+
+from osv import fields, osv
+from tools.translate import _
+
+class account_statement_from_invoice_lines(osv.osv_memory):
+ """
+ Generate Entries by Statement from Invoices
+ """
+ _name = "account.statement.from.invoice.lines"
+ _description = "Entries by Statement from Invoices"
+ _columns = {
+ 'line_ids': fields.many2many('account.move.line', 'account_move_line_relation', 'move_id', 'line_id', 'Invoices'),
+ }
+
+ def populate_statement(self, cr, uid, ids, context=None):
+
+ line_obj = self.pool.get('account.move.line')
+ statement_obj = self.pool.get('account.bank.statement')
+ statement_line_obj = self.pool.get('account.bank.statement.line')
+ currency_obj = self.pool.get('res.currency')
+ statement_reconcile_obj = self.pool.get('account.bank.statement.reconcile')
+
+ data = self.read(cr, uid, ids,context=context)[0]
+ line_ids = data['line_ids']
+ line_date = time.strftime('%Y-%m-%d')
+
+ if not line_ids:
+ return {}
+ statement_id = 'statement_id' in context and context['statement_id']
+ statement = statement_obj.browse(cr, uid, statement_id, context=context)
+ # for each selected move lines
+ for line in line_obj.browse(cr, uid, line_ids, context=context):
+ ctx = context.copy()
+ # take the date for computation of currency => use payment date
+ # if line.date_maturity:
+ # ctx['date'] = line.date_maturity
+ # else:
+ ctx['date'] = line_date
+ amount = 0.0
+ if line.amount_currency:
+ amount = currency_obj.compute(cr, uid, line.currency_id.id,
+ statement.currency.id, line.amount_currency, context=ctx)
+ else:
+ if line.debit > 0:
+ amount=line.debit
+ elif line.credit > 0:
+ amount=-line.credit
+ reconcile_id = statement_reconcile_obj.create(cr, uid, {
+ 'line_ids': [(6, 0, [line.id])]
+ }, context=context)
+ if line.journal_id.type == 'sale':
+ type = 'customer'
+ elif line.journal_id.type == 'purchase':
+ type = 'supplier'
+ else:
+ type = 'general'
+ statement_line_obj.create(cr, uid, {
+ 'name': line.name or '?',
+ 'amount': amount,
+ 'type': type,
+ 'partner_id': line.partner_id.id,
+ 'account_id': line.account_id.id,
+ 'statement_id': statement_id,
+ 'ref': line.ref,
+ 'reconcile_id': reconcile_id,
+ 'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
+ }, context=context)
+ return {}
+
+account_statement_from_invoice_lines()
+
+class account_statement_from_invoice(osv.osv_memory):
+ """
+ Generate Entries by Statement from Invoices
+ """
+ _name = "account.statement.from.invoice"
+ _description = "Entries by Statement from Invoices"
+ _columns = {
+ 'date': fields.date('Date payment',required=True),
+ 'journal_ids': fields.many2many('account.journal','account_journal_relation','account_id','journal_id','Journal'),
+ 'line_ids': fields.many2many('account.move.line','account_move_line_relation','move_id','line_id','Invoices'),
+ }
+ _defaults = {
+ 'date':lambda *a: time.strftime('%Y-%m-%d'),
+ }
+
+ def search_invoices(self, cr, uid, ids, context=None):
+
+ line_obj = self.pool.get('account.move.line')
+ statement_obj = self.pool.get('account.bank.statement')
+ journal_obj = self.pool.get('account.journal')
+ mod_obj = self.pool.get('ir.model.data')
+ statement_id = 'statement_id' in context and context['statement_id']
+
+ data = self.read(cr, uid, ids,context=context)[0]
+ statement = statement_obj.browse(cr, uid, statement_id, context=context)
+ args_move_line = []
+ repeated_move_line_ids = []
+ # Creating a group that is unique for importing move lines(move lines, once imported into statement lines, should not appear again)
+ for st_line in statement.line_ids:
+ args_move_line = []
+ args_move_line.append(('name','=', st_line.name))
+ args_move_line.append(('ref','=',st_line.ref))
+ if st_line.partner_id:
+ args_move_line.append(('partner_id','=',st_line.partner_id.id))
+ args_move_line.append(('account_id','=',st_line.account_id.id))
+
+ move_line_id = line_obj.search(cr, uid, args_move_line,context=context)
+ if move_line_id:
+ repeated_move_line_ids += move_line_id
+
+ journal_ids = data['journal_ids']
+ if journal_ids == []:
+ journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale','cash','purchase'))], context=context)
+
+ args = [
+ ('reconcile_id', '=', False),
+ ('journal_id', 'in', journal_ids),
+ ('account_id.reconcile', '=', True)]
+
+ if repeated_move_line_ids:
+ args.append(('id','not in',repeated_move_line_ids))
+
+ line_ids = line_obj.search(cr, uid, args,
+ #order='date DESC, id DESC', #doesn't work
+ context=context)
+ model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice_lines')], context=context)
+ resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+ return {
+ 'domain': "[('id','in', ["+','.join([str(x) for x in line_ids])+"])]",
+ 'name': _('Import Entries'),
+ 'context': context,
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'account.statement.from.invoice.lines',
+ 'views': [(resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+
+account_statement_from_invoice()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
new file mode 100644
index 00000000000..6f17279888c
--- /dev/null
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -0,0 +1,61 @@
+
+
+
+
+ account.statement.from.invoice.form
+ account.statement.from.invoice
+ form
+
+
+
+
+
+
+ Import Invoices in Statement
+ account.statement.from.invoice
+ form
+ tree,form
+
+ new
+
+
+
+ account.statement.from.invoice.lines.form
+ account.statement.from.invoice.lines
+ form
+
+
+
+
+
+ Import Entries
+ account.statement.from.invoice.lines
+ form
+ tree,form
+
+ new
+
+
+
+
+
diff --git a/addons/account/wizard/wizard_statement_from_invoice.py b/addons/account/wizard/wizard_statement_from_invoice.py
deleted file mode 100644
index 6e9f912380f..00000000000
--- a/addons/account/wizard/wizard_statement_from_invoice.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2008 Camptocamp SA All Rights Reserved. (JGG)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.misc import UpdateableStr
-import time
-
-FORM = UpdateableStr()
-
-FIELDS = {
- 'lines': {'string': 'Invoices', 'type': 'many2many',
- 'relation': 'account.move.line'},
-
-}
-
-START_FIELD = {
- 'date': {'string': 'Date payment', 'type': 'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
- 'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'domain': '[("type","in",["sale","purchase","cash"])]', 'help': 'This field allows you to choose the accounting journals you want for filtering the invoices. If you left this field empty, it will search on all sale, purchase and cash journals.'},
-}
-
-START_FORM = '''
-'''
-
-def _search_invoices(obj, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- line_obj = pool.get('account.move.line')
- statement_obj = pool.get('account.bank.statement')
- journal_obj = pool.get('account.journal')
-
- statement = statement_obj.browse(cr, uid, data['id'], context=context)
- args_move_line = []
- repeated_move_line_ids = []
- # Creating a group that is unique for importing move lines(move lines, once imported into statement lines, should not appear again)
- for st_line in statement.line_ids:
- args_move_line = []
- args_move_line.append(('name','=', st_line.name))
- args_move_line.append(('ref','=',st_line.ref))
- if st_line.partner_id:
- args_move_line.append(('partner_id','=',st_line.partner_id.id))
- args_move_line.append(('account_id','=',st_line.account_id.id))
-
- move_line_id = line_obj.search(cr, uid, args_move_line,context=context)
- if move_line_id:
- repeated_move_line_ids += move_line_id
-
- journal_ids = data['form']['journal_id'][0][2]
-
- if journal_ids == []:
- journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale','cash','purchase'))], context=context)
-
- args = [
- ('reconcile_id', '=', False),
- ('journal_id', 'in', journal_ids),
- ('account_id.reconcile', '=', True)]
-
- if repeated_move_line_ids:
- args.append(('id','not in',repeated_move_line_ids))
-
- line_ids = line_obj.search(cr, uid, args,
- #order='date DESC, id DESC', #doesn't work
- context=context)
-
- FORM.string = '''
-''' % (','.join([str(x) for x in line_ids]))
- return {}
-
-def _populate_statement(obj, cursor, user, data, context):
- line_ids = data['form']['lines'][0][2]
- line_date=data['form']['date']
- if not line_ids:
- return {}
-
- pool = pooler.get_pool(cursor.dbname)
- line_obj = pool.get('account.move.line')
- statement_obj = pool.get('account.bank.statement')
- statement_line_obj = pool.get('account.bank.statement.line')
- currency_obj = pool.get('res.currency')
- statement_reconcile_obj = pool.get('account.bank.statement.reconcile')
-
- statement = statement_obj.browse(cursor, user, data['id'], context=context)
- # for each selected move lines
- for line in line_obj.browse(cursor, user, line_ids, context=context):
- ctx = context.copy()
- # take the date for computation of currency => use payment date
- # if line.date_maturity:
- # ctx['date'] = line.date_maturity
- # else:
- ctx['date'] = line_date
- amount = 0.0
- if line.amount_currency:
- amount = currency_obj.compute(cursor, user, line.currency_id.id,
- statement.currency.id, line.amount_currency, context=ctx)
- else:
- if line.debit > 0:
- amount=line.debit
- elif line.credit > 0:
- amount=-line.credit
- reconcile_id = statement_reconcile_obj.create(cursor, user, {
- 'line_ids': [(6, 0, [line.id])]
- }, context=context)
- if line.journal_id.type == 'sale':
- type = 'customer'
- elif line.journal_id.type == 'purchase':
- type = 'supplier'
- else:
- type = 'general'
-
- statement_line_obj.create(cursor, user, {
- 'name': line.name or '?',
- 'amount': amount,
- 'type': type,
- 'partner_id': line.partner_id.id,
- 'account_id': line.account_id.id,
- 'statement_id': statement.id,
- 'ref': line.ref,
- 'reconcile_id': reconcile_id,
- 'date':line_date, #time.strftime('%Y-%m-%d'), #line.date_maturity or,
- }, context=context)
- return {}
-
-
-class PopulateStatementFromInv(wizard.interface):
- """
- Populate the current statement with selected invoices
- """
- states = {
- 'init': {
- 'actions': [],
- 'result': {
- 'type': 'form',
- 'arch': START_FORM,
- 'fields':START_FIELD,
- 'state': [
- ('end', '_Cancel'),
- ('go', '_Go', '', True),
- ]
- },
- },
- 'go': {
- 'actions': [_search_invoices],
- 'result': {
- 'type': 'form',
- 'arch': FORM,
- 'fields': FIELDS,
- 'state': [
- ('end', '_Cancel','', True, 'gtk-cancel'),
- ('finish', 'O_k','', True, 'gtk-ok')
- ]
- },
- },
-
- 'finish': {
- 'actions': [],
- 'result': {
- 'type': 'action',
- 'action': _populate_statement,
- 'state': 'end'
- },
- },
- }
-PopulateStatementFromInv('populate_statement_from_inv')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: