Merge lp:~akretion-team/banking-addons/bank-statement-reconcile-70-multi-statement into lp:banking-addons/bank-statement-reconcile-70

[Sébastien BEAU - http://www.akretion.com]

Hi,
In some case like the CFONB norme (French norme) many bank statement can be extracted from the same file.
So I need to change the signature in order to always work with a list of id, than in my can I am able to inherit everything and process all of my bank statement (http://bazaar.launchpad.net/~akretion-team/+junk/account_statement_cfonb/view/head:/account_statement_cfonb/statement.py)

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

Thanks for the contribs !

My opinion on that one is that I prefer letting this method "def statement_import" as it is. His purpose is to import one single statement.

Why not simply adding a new method called "def multi_statement_import" that call the first one for each instance ?

This way, you reduce the risk of breaking others work by returning a dict instead of a int/long.

For this reason, I mark it as need fixing.

Regards,

Joël

review: Needs Fixing (code review, no tests)

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Ok it's ok for me. We will propose a new solution using def multi_statement_import

[lp:~akretion-team/banking-addons/bank-statement-reconcile-70-multi-statement]

104. By Florian da Costa on 2013-12-18

[FIX] Permit to handle multi statement with other module whithout changing the function import_statement

105. By Florian da Costa on 2013-12-19

[FIX] Call multi_statement_import in importation wizard

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

LGTM. It's ok for me. We do not change anymore the original API.

review: Approve (no test, code review)

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

Thanks for the changes, that looks good now !

Regards,

Joël

review: Approve (code review, no tests)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Why do you pass the context in the parser?

    result_row_list = parser.parse(file_stream, context=context)

review: Needs Information

[Florian da Costa (florian-dacosta)]

The context can be useful for custom parsers.
It is for example used for the cfonb parser to handle the fact that a file can contain more than one bank statement.

http://bazaar.launchpad.net/~akretion-team/+junk/account_statement_cfonb/view/head:/account_statement_cfonb/parser/cfonb_parser.py

http://bazaar.launchpad.net/~akretion-team/+junk/account_statement_cfonb/view/head:/account_statement_cfonb/statement.py

[lp:~akretion-team/banking-addons/bank-statement-reconcile-70-multi-statement]

106. By Florian da Costa on 2014-02-12

[FIX] Fix file type when calling the statement_import function

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

There are conflicts please resubmit

review: Needs Resubmitting

Unmerged revisions

106. By Florian da Costa on 2014-02-12

[FIX] Fix file type when calling the statement_import function

105. By Florian da Costa on 2013-12-19

[FIX] Call multi_statement_import in importation wizard

104. By Florian da Costa on 2013-12-18

[FIX] Permit to handle multi statement with other module whithout changing the function import_statement

103. By Sébastien BEAU - http://www.akretion.com on 2013-12-04

[IMP] give the possibility to return various bank statement. Indeed in some special case a file can containe various bank statement, like CFONB file which are the french standard for bank statement

=== modified file 'account_statement_base_import/statement.py'
--- account_statement_base_import/statement.py	2014-01-21 16:46:36 +0000
+++ account_statement_base_import/statement.py	2014-02-12 09:42:23 +0000
@@ -126,6 +126,7 @@
         values['type'] = 'general'
         return values
 
+<<<<<<< TREE
     def prepare_statement_vals(self, cr, uid, profile_id, result_row_list, parser, context):
         """
         Hook to build the values of the statement from the parser and
@@ -135,6 +136,16 @@
         vals.update(parser.get_st_vals())
         return vals
 
+=======
+
+    def multi_statement_import(self, cr, uid, ids, profile_id, file_stream,
+                               ftype="csv", context=None):
+        statement_id = self.statement_import(cr, uid, ids, profile_id, file_stream,
+                                             ftype=ftype, context=context)
+        return [statement_id]
+
+
+>>>>>>> MERGE-SOURCE
     def statement_import(self, cr, uid, ids, profile_id, file_stream, ftype="csv", context=None):
         """
         Create a bank statement with the given profile and parser. It will fullfill the bank statement
@@ -154,9 +165,8 @@
             raise osv.except_osv(_("No Profile!"),
                                  _("You must provide a valid profile to import a bank statement!"))
         prof = prof_obj.browse(cr, uid, profile_id, context=context)
-
         parser = new_bank_statement_parser(prof.import_type, ftype=ftype)
-        result_row_list = parser.parse(file_stream)
+        result_row_list = parser.parse(file_stream, context=context)
         # Check all key are present in account.bank.statement.line!!
         if not result_row_list:
             raise osv.except_osv(_("Nothing to import"),

=== modified file 'account_statement_base_import/wizard/import_statement.py'
--- account_statement_base_import/wizard/import_statement.py	2013-12-04 14:10:49 +0000
+++ account_statement_base_import/wizard/import_statement.py	2014-02-12 09:42:23 +0000
@@ -99,7 +99,7 @@
         ftype = self._check_extension(importer.file_name)
         context['file_name'] = importer.file_name
         sid = self.pool.get(
-                'account.statement.profile').statement_import(
+                'account.statement.profile').multi_statement_import(
                                             cr,
                                             uid,
                                             False,
@@ -112,5 +112,5 @@
         action_obj = self.pool.get('ir.actions.act_window')
         action_id = model_obj.get_object_reference(cr, uid, 'account', 'action_bank_statement_tree')[1]
         res = action_obj.read(cr, uid, action_id)
-        res['domain'] = res['domain'][:-1] + ",('id', '=', %d)]" % sid
+        res['domain'] = res['domain'][:-1] + ",('id', 'in', %s)]" % sid
         return res