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

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

Hi
I just add some function in order to be able to fill the balance, the name and the date of the bank statement based on the data of the file parsed.

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

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

[REF] add a prepare method for custom for creating the bank statement

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

Hi Sebastien,

Thanks for the contribs ! Just a little remark on lines 45 to 57, you should review and adpat your comment.

Otherwise LGTM.

Regards,

Joël

review: Approve (code review, no tests)

[Frederic Clementi - Camptocamp (frederic-clementi)]

Ok for me

review: Approve (functionnal)

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

107. By Florian da Costa on 2013-12-11

[FIX] Change some methods description

[Pedro Manuel Baeza (pedro.baeza)]

I also approved the changes. There is one similar MP from Laurent Mignon of Acsone that I have redirected to here:

https://code.launchpad.net/~acsone-openerp/banking-addons/bank-statement-reconcile-70-import-statement-hook/+merge/201732

I proceed with the merge now, and if anyone discover any problem or improvement, can comment here or in another MP.

Regards.

review: Approve

[Laurent Mignon (Acsone) (lmi)]

Hi,

The proposal covers an identical need that the one I've proposed. I'm not comfortable with your approach. Values available from the parser for the statement are 'hard coded' in the parser and the profile call one by one each method defined on the parser to fill the dictionary used for the statement creation. I've the feeling that it's the responsibility of the parser to fill this dictionary. The profile is just there to do the glue between the parser and the importation logic.
With your proposal, if I have a parser able to provide more info than the four now available via the new API, I need to override the parser AND the profile.
What do you think of my proposal? https://code.launchpad.net/~acsone-openerp/banking-addons/bank-statement-reconcile-70-import-statement-hook/+merge/201732

Regards,

lmi

[Stéphane Bidoul (Acsone) (sbi)]

Hi,

Note to self: look into existing MP before contributing.

That said, I looked at both proposals, and I believe Laurent's approach is indeed more extensible. It also mirrors closely the approach for statement lines (get_st_line_vals) with the same approch for the statement (get_st_vals).

Best regards,

-sbi

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

@Pedro Wasn't it a bit expeditive to merge it without waiting for Acsone eyes to see it?

@Laurent & Stéphane To sum up do we need to revert and set it to Need Fixing to try to converge both MP?
Or are you willing to improve this in an other MP?

Cheers

[Pedro Manuel Baeza (pedro.baeza)]

Sorry if I bother you, but my intention was to close this MP (because it already had two approvals) and then make another one if there is improvement, as we can see that there is room for this. Tonight, I'm going to propose a new MP with Laurent's remarks, because reverting things is a little odd.

Regards.

[Laurent Mignon (Acsone) (lmi)]

@Pedro, no stress. contribution is not competition. Contribution is a nice way to improve our experience and get better quality and functionalities.

@Yannick. No need to revert. I'll improve my merge proposal and I'll include your needs. Just a little question. At line 70 you doesn't use the statement_date from the parser for the statement date but you use it at line 114 for the commission line. Is this an oversight?

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

I'm not in Sébastien's head so I let him answer to the question :)

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

Laurent
Yes your right it have been lost during the merge proposal.

You fix it with your next merge proposal? Or I propose a small merge for adding it?

Thanks

[Laurent Mignon (Acsone) (lmi)]

I'll fix it ;)

On Tue, Jan 21, 2014 at 1:53 PM, Sébastien BEAU - http://www.akretion.com <
<email address hidden>> wrote:

> Laurent
> Yes your right it have been lost during the merge proposal.
>
> You fix it with your next merge proposal? Or I propose a small merge for
> adding it?
>
> Thanks
>
> --
>
> https://code.launchpad.net/~akretion-team/banking-addons/bank-statement-reconcile-70-improve-import/+merge/197759
> You are subscribed to branch
> lp:banking-addons/bank-statement-reconcile-7.0.
>

--
*Laurent Mignon*
*Senior Software Engineer*

*Tel : [phone]*
*Fax : [phone]*
*Gsm : [phone]*
*Email: <email address hidden> <email address hidden>*

*Acsone SA, Succursale de Luxembourg*
*22, Zone industrielle*
*L-8287 Kehlen, Luxembourg*
*www.acsone.eu <http://www.acsone.eu>*

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Laurent, how is the state of this MP?

Regards.

=== modified file 'account_statement_base_import/parser/parser.py'
--- account_statement_base_import/parser/parser.py	2013-05-03 19:57:26 +0000
+++ account_statement_base_import/parser/parser.py	2013-12-11 19:12:22 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 import base64
 import csv
+from datetime import datetime
 
 
 def UnicodeDictReader(utf8_data, **kwargs):
@@ -49,6 +50,10 @@
         self.result_row_list = None
         # The file buffer on which to work on
         self.filebuffer = None
+        self.balance_start = None
+        self.balance_end = None
+        self.statement_name = None
+        self.statement_date = None
 
     @classmethod
     def parser_for(cls, parser_name):
@@ -150,6 +155,37 @@
         self._post(*args, **kwargs)
         return self.result_row_list
 
+    def get_start_balance(self, *args, **kwargs):
+        """
+        This is called by the importation method to set the balance start
+        amount in the bank statement.
+            return: float of the balance start (self.balance_start)
+        """
+        return self.balance_start
+
+    def get_end_balance(self, *args, **kwargs):
+        """
+        This is called by the importation method to set the balance end
+        amount in the bank statement.
+            return: float of the balance end (self.balance_end)
+        """
+        return self.balance_end
+
+    def get_statement_name(self, *args, **kwargs):
+        """
+        This is called by the importation method to set the statement
+        name in the bank statement.
+            return: string of the statement name (self.statement_name)
+        """
+        return self.statement_name or '/'
+
+    def get_statement_date(self, *args, **kwargs):
+        """
+        This is called by the importation method to set the statement
+        date in the bank statement.
+            return: datetime of the statement date (self.statement_date)
+        """
+        return self.statement_date or datetime.now()
 
 def itersubclasses(cls, _seen=None):
     """

=== modified file 'account_statement_base_import/statement.py'
--- account_statement_base_import/statement.py	2013-09-12 09:05:01 +0000
+++ account_statement_base_import/statement.py	2013-12-11 19:12:22 +0000
@@ -126,6 +126,15 @@
         values['type'] = 'general'
         return values
 
+
+    def _prepare_statement_vals(self, cr, uid, prof, parser, context=None):
+        return {
+            'profile_id': prof.id,
+            'name': parser.get_statement_name(),
+            'balance_start': parser.get_start_balance(),
+            'balance_end_real': parser.get_end_balance(),
+        }
+
     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
@@ -159,9 +168,8 @@
                                      _("Column %s you try to import is not "
                                        "present in the bank statement line!") % col)
 
-        statement_id = statement_obj.create(cr, uid,
-                                            {'profile_id': prof.id},
-                                            context=context)
+        st_vals = self._prepare_statement_vals(cr, uid, prof, parser, context=context) 
+        statement_id = statement_obj.create(cr, uid, st_vals, context=context)
         if prof.receivable_account_id:
             account_receivable = account_payable = prof.receivable_account_id.id
         else:

=== modified file 'account_statement_base_import/wizard/import_statement.py'
--- account_statement_base_import/wizard/import_statement.py	2013-07-08 18:03:34 +0000
+++ account_statement_base_import/wizard/import_statement.py	2013-12-11 19:12:22 +0000
@@ -97,6 +97,7 @@
             req_id = req_id[0]
         importer = self.browse(cr, uid, req_id, context)
         ftype = self._check_extension(importer.file_name)
+        context['file_name'] = importer.file_name
         sid = self.pool.get(
                 'account.statement.profile').statement_import(
                                             cr,

=== modified file 'account_statement_commission/commission.py'
--- account_statement_commission/commission.py	2013-07-08 18:03:34 +0000
+++ account_statement_commission/commission.py	2013-12-11 19:12:22 +0000
@@ -22,7 +22,7 @@
         commission_analytic_id = profile.commission_analytic_id and profile.commission_analytic_id.id or False
         comm_values = {
             'name': 'IN ' + _('Commission line'),
-            'date': datetime.datetime.now().date(),
+            'date': parser.get_statement_date(),
             'amount': global_commission_amount,
             'partner_id': partner_id,
             'type': 'general',
@@ -65,4 +65,4 @@
                 c.commission_account_id and c.commission_account_id.id or False
             res['value']['commission_a'] = \
                 c.commission_analytic_id and c.commission_analytic_id.id or False
-        return res
\ No newline at end of file
+        return res