diff --git a/account_easy_reconcile/__openerp__.py b/account_easy_reconcile/__openerp__.py
index a3f22d54..a53662c5 100755
--- a/account_easy_reconcile/__openerp__.py
+++ b/account_easy_reconcile/__openerp__.py
@@ -21,7 +21,7 @@
{
"name": "Easy Reconcile",
- "version": "1.3.0",
+ "version": "1.3.1",
"depends": ["account"],
"author": "Akretion,Camptocamp",
"description": """
diff --git a/account_easy_reconcile/easy_reconcile.py b/account_easy_reconcile/easy_reconcile.py
index 7971895e..dfe74da7 100644
--- a/account_easy_reconcile/easy_reconcile.py
+++ b/account_easy_reconcile/easy_reconcile.py
@@ -22,6 +22,7 @@
from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.translate import _
class easy_reconcile_options(orm.AbstractModel):
@@ -257,6 +258,58 @@ class account_easy_reconcile(orm.Model):
_('Error'),
_('There is no history of reconciled '
'items on the task: %s.') % rec.name)
+
+ def _open_move_line_list(sefl, cr, uid, move_line_ids, name, context=None):
+ return {
+ 'name': name,
+ 'view_mode': 'tree,form',
+ 'view_id': False,
+ 'view_type': 'form',
+ 'res_model': 'account.move.line',
+ 'type': 'ir.actions.act_window',
+ 'nodestroy': True,
+ 'target': 'current',
+ 'domain': unicode([('id', 'in', move_line_ids)]),
+ }
+
+ def open_unreconcile(self, cr, uid, ids, context=None):
+ """ Open the view of move line with the unreconciled move lines
+ """
+
+ assert len(ids) == 1 , \
+ "You can only open entries from one profile at a time"
+
+ obj_move_line = self.pool.get('account.move.line')
+ res = {}
+ for task in self.browse(cr, uid, ids, context=context):
+ line_ids = obj_move_line.search(
+ cr, uid,
+ [('account_id', '=', task.account.id),
+ ('reconcile_id', '=', False),
+ ('reconcile_partial_id', '=', False)],
+ context=context)
+
+ name = _('Unreconciled items')
+ return self._open_move_line_list(cr, uid, line_ids, name, context=context)
+
+ def open_partial_reconcile(self, cr, uid, ids, context=None):
+ """ Open the view of move line with the unreconciled move lines
+ """
+
+ assert len(ids) == 1 , \
+ "You can only open entries from one profile at a time"
+
+ obj_move_line = self.pool.get('account.move.line')
+ res = {}
+ for task in self.browse(cr, uid, ids, context=context):
+ line_ids = obj_move_line.search(
+ cr, uid,
+ [('account_id', '=', task.account.id),
+ ('reconcile_id', '=', False),
+ ('reconcile_partial_id', '!=', False)],
+ context=context)
+ name = _('Partial reconciled items')
+ return self._open_move_line_list(cr, uid, line_ids, name, context=context)
def last_history_reconcile(self, cr, uid, rec_id, context=None):
""" Get the last history record for this reconciliation profile
diff --git a/account_easy_reconcile/easy_reconcile.xml b/account_easy_reconcile/easy_reconcile.xml
index 2696419a..56e12b2e 100644
--- a/account_easy_reconcile/easy_reconcile.xml
+++ b/account_easy_reconcile/easy_reconcile.xml
@@ -13,11 +13,9 @@
@@ -30,8 +28,16 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/account_statement_base_completion/__openerp__.py b/account_statement_base_completion/__openerp__.py
index ece29e6f..1b016369 100644
--- a/account_statement_base_completion/__openerp__.py
+++ b/account_statement_base_completion/__openerp__.py
@@ -20,7 +20,7 @@
##############################################################################
{'name': "Bank statement base completion",
- 'version': '1.0.1',
+ 'version': '1.0.2',
'author': 'Camptocamp',
'maintainer': 'Camptocamp',
'category': 'Finance',
diff --git a/account_statement_base_completion/statement.py b/account_statement_base_completion/statement.py
index 61e3dbde..5bb9e070 100644
--- a/account_statement_base_completion/statement.py
+++ b/account_statement_base_completion/statement.py
@@ -496,18 +496,21 @@ class AccountBankStatement(orm.Model):
"""
user_name = self.pool.get('res.users').read(cr, uid, uid,
['name'], context=context)['name']
+ statement = self.browse(cr, uid, stat_id, context=context)
+ number_line = len(statement.line_ids)
log = self.read(cr, uid, stat_id, ['completion_logs'],
context=context)['completion_logs']
log = log if log else ""
completion_date = datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)
- message = (_("%s Bank Statement ID %s has %s lines completed by %s \n%s\n%s\n") %
- (completion_date, stat_id, number_imported, user_name, error_msg, log))
+ message = (_("%s Bank Statement ID %s has %s/%s lines completed by %s \n%s\n%s\n") %
+ (completion_date, stat_id, number_imported, number_line, user_name,
+ error_msg, log))
self.write(cr, uid, [stat_id], {'completion_logs': message}, context=context)
- body = (_('Statement ID %s auto-completed for %s lines completed') %
- (stat_id, number_imported)),
+ body = (_('Statement ID %s auto-completed for %s/%s lines completed') %
+ (stat_id, number_imported, number_line)),
self.message_post(cr, uid,
[stat_id],
body=body,
diff --git a/account_statement_ext/__openerp__.py b/account_statement_ext/__openerp__.py
index 033ec8dd..0038127c 100644
--- a/account_statement_ext/__openerp__.py
+++ b/account_statement_ext/__openerp__.py
@@ -20,7 +20,7 @@
##############################################################################
{'name': "Bank statement extension and profiles",
- 'version': '1.3.4',
+ 'version': '1.3.5',
'author': 'Camptocamp',
'maintainer': 'Camptocamp',
'category': 'Finance',
@@ -74,6 +74,7 @@
""",
'website': 'http://www.camptocamp.com',
'data': ['statement_view.xml',
+ 'account_view.xml',
'report/bank_statement_webkit_header.xml',
'report.xml',
'security/ir.model.access.csv',
diff --git a/account_statement_ext/account_view.xml b/account_statement_ext/account_view.xml
new file mode 100644
index 00000000..f294484b
--- /dev/null
+++ b/account_statement_ext/account_view.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Journal Items add statement
+ account.move.line
+
+
+
+
+
+
+
+
+
+