Merge lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-split-sale-lep into lp:banking-addons/bank-statement-reconcile-70

[Leonardo Pistone]

[mrg] split the module account_statement_base_completion to take out what depends on sale

Here I split the module account_statement_base_completion to take out what depends on sale.

[lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-split-sale-lep]

106. By Leonardo Pistone on 2013-12-03

auto_install account_statement_so_completion

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

Hi Leonardo,

Thanks for this extract, looks good to me !

Regards,

review: Approve (code review, no tests)

[lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-split-sale-lep]

107. By Leonardo Pistone on 2013-12-13

[fix] selection value

108. By Leonardo Pistone on 2013-12-13

[mrg] upstream

109. By Leonardo Pistone on 2013-12-20

[mrg] upstream

110. By Leonardo Pistone on 2013-12-20

[add] account_statement_so_completion/test

111. By Leonardo Pistone on 2013-12-20

[fix] function in the wrong place

[Leonardo Pistone (lepistone)]

Thanks Joël for your review.

I added a YAML test and fixed a bug that the test showed.

The test passes if the following two MP are merged:

* https://code.launchpad.net/~camptocamp/banking-addons/bank-statement-reconcile-7.0-fix-onchange-lep/+merge/199518
* https://code.launchpad.net/~camptocamp/banking-addons/bank-statement-reconcile-7.0-fix-yaml-related-lep/+merge/199124

They are approved already, so that should be no problem.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

in account_statement_so_completion/__openerp__.py

l169-172
Please use 'data' keyword

review: Needs Fixing (code review, no tests)

[lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-split-sale-lep]

112. By Leonardo Pistone on 2014-01-16

[imp] manifest: data

[Leonardo Pistone (lepistone)]

Fixed, thanks

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks

review: Approve (code review, no tests)

=== modified file 'account_statement_base_completion/__openerp__.py'
--- account_statement_base_completion/__openerp__.py	2013-04-05 07:52:53 +0000
+++ account_statement_base_completion/__openerp__.py	2014-01-16 10:35:50 +0000
@@ -35,7 +35,6 @@
 
  1) Match from statement line label (based on partner field 'Bank Statement Label')
  2) Match from statement line label (based on partner name)
- 3) Match from statement line reference (based on SO number)
  3) Match from statement line reference (based on Invoice number)
 
  You can easily override this module and add your own rules in your own one. The basic rules only

=== modified file 'account_statement_base_completion/data.xml'
--- account_statement_base_completion/data.xml	2013-04-24 09:30:08 +0000
+++ account_statement_base_completion/data.xml	2014-01-16 10:35:50 +0000
@@ -14,12 +14,6 @@
          <field name="function_to_call">get_from_label_and_partner_name</field>
      </record>
 
-     <record id="bank_statement_completion_rule_1" model="account.statement.completion.rule">
-          <field name="name">Match from line reference (based on SO number)</field>
-          <field name="sequence">50</field>
-          <field name="function_to_call">get_from_ref_and_so</field>
-      </record>
-
      <record id="bank_statement_completion_rule_4" model="account.statement.completion.rule">
           <field name="name">Match from line reference (based on Invoice number)</field>
           <field name="sequence">40</field>

=== modified file 'account_statement_base_completion/statement.py'
--- account_statement_base_completion/statement.py	2013-10-16 08:58:12 +0000
+++ account_statement_base_completion/statement.py	2014-01-16 10:35:50 +0000
@@ -132,7 +132,6 @@
         return [
             ('get_from_ref_and_invoice', 'From line reference (based on customer invoice number)'),
             ('get_from_ref_and_supplier_invoice', 'From line reference (based on supplier invoice number)'),
-            ('get_from_ref_and_so', 'From line reference (based on SO number)'),
             ('get_from_label_and_partner_field', 'From line label (based on partner field)'),
             ('get_from_label_and_partner_name', 'From line label (based on partner name)')]
 
@@ -233,49 +232,6 @@
         return self._from_invoice(cr, uid, line, 'customer', context=context)
 
     # Should be private but data are initialised with no update XML
-    def get_from_ref_and_so(self, cr, uid, st_line, context=None):
-        """
-        Match the partner based on the SO number and the reference of the statement
-        line. Then, call the generic get_values_for_line method to complete other values.
-        If more than one partner matched, raise the ErrorTooManyPartner error.
-
-        :param int/long st_line: read of the concerned account.bank.statement.line
-        :return:
-            A dict of value that can be passed directly to the write method of
-            the statement line or {}
-           {'partner_id': value,
-            'account_id': value,
-
-            ...}
-        """
-        st_obj = self.pool.get('account.bank.statement.line')
-        res = {}
-        if st_line:
-            so_obj = self.pool.get('sale.order')
-            so_id = so_obj.search(cr,
-                                  uid,
-                                  [('name', '=', st_line['ref'])],
-                                  context=context)
-            if so_id:
-                if so_id and len(so_id) == 1:
-                    so = so_obj.browse(cr, uid, so_id[0], context=context)
-                    res['partner_id'] = so.partner_id.id
-                elif so_id and len(so_id) > 1:
-                    raise ErrorTooManyPartner(_('Line named "%s" (Ref:%s) was matched by more '
-                                                'than one partner while looking on SO by ref.') %
-                                              (st_line['name'], st_line['ref']))
-                st_vals = st_obj.get_values_for_line(cr,
-                                                     uid,
-                                                     profile_id=st_line['profile_id'],
-                                                     master_account_id=st_line['master_account_id'],
-                                                     partner_id=res.get('partner_id', False),
-                                                     line_type='customer',
-                                                     amount=st_line['amount'] if st_line['amount'] else 0.0,
-                                                     context=context)
-                res.update(st_vals)
-        return res
-
-    # Should be private but data are initialised with no update XML
     def get_from_label_and_partner_field(self, cr, uid, st_line, context=None):
         """
         Match the partner based on the label field of the statement line

=== added directory 'account_statement_so_completion'
=== added file 'account_statement_so_completion/__init__.py'
--- account_statement_so_completion/__init__.py	1970-01-01 00:00:00 +0000
+++ account_statement_so_completion/__init__.py	2014-01-16 10:35:50 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#                                                                             #
+#   Author: Joel Grand-Guillaume
+#   Copyright 2011-2012 Camptocamp SA
+#                                                                             #
+#   Author: Leonardo Pistone <[e-mail]>                #
+#   Copyright 2013 Camptocamp SA                                              #
+#                                                                             #
+#   This program is free software: you can redistribute it and/or modify      #
+#   it under the terms of the GNU Affero General Public License as            #
+#   published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.                       #
+#                                                                             #
+#   You should have received a copy of the GNU Affero General Public License  #
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.     #
+#                                                                             #
+###############################################################################
+
+from . import statement

=== added file 'account_statement_so_completion/__openerp__.py'
--- account_statement_so_completion/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_statement_so_completion/__openerp__.py	2014-01-16 10:35:50 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#                                                                             #
+#   Author: Joel Grand-Guillaume
+#   Copyright 2011-2012 Camptocamp SA
+#                                                                             #
+#   Author: Leonardo Pistone <[e-mail]>                #
+#   Copyright 2013 Camptocamp SA                                              #
+#                                                                             #
+#   This program is free software: you can redistribute it and/or modify      #
+#   it under the terms of the GNU Affero General Public License as            #
+#   published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.                       #
+#                                                                             #
+#   You should have received a copy of the GNU Affero General Public License  #
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.     #
+#                                                                             #
+###############################################################################
+
+{'name': "Bank statement Sale Order completion",
+ 'version': '0.1',
+ 'author': 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'category': 'Finance',
+ 'complexity': 'easy',
+ 'depends': ['account_statement_base_completion', 'sale'],
+ 'description': """
+ This module improve the module account_statement_base_completion to add
+ support for completion rules based on Sale Orders. This was initially part of
+ the module account_statement_base_completion, but is now separate to keep
+ dependencies separate.
+
+ This module provides the following rule:
+
+  1) Match from statement line reference (based on SO number)
+""",
+ 'website': 'http://www.camptocamp.com',
+ 'data': [
+     'data.xml',
+ ],
+ 'test': [
+     'test/completion_so_test.yml'],
+ 'installable': True,
+ 'images': [],
+ 'auto_install': True,
+ 'license': 'AGPL-3',
+ }

=== added file 'account_statement_so_completion/data.xml'
--- account_statement_so_completion/data.xml	1970-01-01 00:00:00 +0000
+++ account_statement_so_completion/data.xml	2014-01-16 10:35:50 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="bank_statement_completion_rule_1" model="account.statement.completion.rule">
+            <field name="name">Match from line reference (based on SO number)</field>
+            <field name="sequence">50</field>
+            <field name="function_to_call">get_from_ref_and_so</field>
+        </record>
+
+    </data>
+</openerp>

=== added file 'account_statement_so_completion/statement.py'
--- account_statement_so_completion/statement.py	1970-01-01 00:00:00 +0000
+++ account_statement_so_completion/statement.py	2014-01-16 10:35:50 +0000
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#                                                                             #
+#   Author: Joel Grand-Guillaume                                              #
+#   Copyright 2011-2012 Camptocamp SA                                         #
+#                                                                             #
+#   Author: Leonardo Pistone <[e-mail]>                #
+#   Copyright 2013 Camptocamp SA                                              #
+#                                                                             #
+#   This program is free software: you can redistribute it and/or modify      #
+#   it under the terms of the GNU Affero General Public License as            #
+#   published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.                       #
+#                                                                             #
+#   You should have received a copy of the GNU Affero General Public License  #
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.     #
+#                                                                             #
+###############################################################################
+
+from openerp.osv import fields, orm
+from tools.translate import _
+
+from openerp.addons.account_statement_base_completion.statement import ErrorTooManyPartner
+
+
+class account_statement_completion_rule(orm.Model):
+
+    _name = "account.statement.completion.rule"
+    _inherit = "account.statement.completion.rule"
+
+    def _get_functions(self, cr, uid, context=None):
+        res = super(account_statement_completion_rule, self)._get_functions(
+            cr, uid, context=context)
+        res.append(
+            ('get_from_ref_and_so', 'From line reference (based on SO number)')
+        )
+        return res
+
+    # Should be private but data are initialised with no update XML
+    def get_from_ref_and_so(self, cr, uid, st_line, context=None):
+        """
+        Match the partner based on the SO number and the reference of the
+        statement line. Then, call the generic get_values_for_line method to
+        complete other values. If more than one partner matched, raise the
+        ErrorTooManyPartner error.
+
+        :param int/long st_line: read of the concerned
+        account.bank.statement.line
+
+        :return:
+            A dict of value that can be passed directly to the write method of
+            the statement line or {}
+           {'partner_id': value,
+            'account_id': value,
+
+            ...}
+        """
+        st_obj = self.pool.get('account.bank.statement.line')
+        res = {}
+        if st_line:
+            so_obj = self.pool.get('sale.order')
+            so_id = so_obj.search(cr,
+                                  uid,
+                                  [('name', '=', st_line['ref'])],
+                                  context=context)
+            if so_id:
+                if so_id and len(so_id) == 1:
+                    so = so_obj.browse(cr, uid, so_id[0], context=context)
+                    res['partner_id'] = so.partner_id.id
+                elif so_id and len(so_id) > 1:
+                    raise ErrorTooManyPartner(
+                        _('Line named "%s" (Ref:%s) was matched by more '
+                          'than one partner while looking on SO by ref.') %
+                        (st_line['name'], st_line['ref']))
+                st_vals = st_obj.get_values_for_line(
+                    cr,
+                    uid,
+                    profile_id=st_line['profile_id'],
+                    master_account_id=st_line['master_account_id'],
+                    partner_id=res.get('partner_id', False),
+                    line_type='customer',
+                    amount=st_line['amount'] if st_line['amount'] else 0.0,
+                    context=context)
+                res.update(st_vals)
+        return res
+
+    _columns = {
+        'function_to_call': fields.selection(_get_functions, 'Method'),
+    }

=== added directory 'account_statement_so_completion/test'
=== added file 'account_statement_so_completion/test/completion_so_test.yml'
--- account_statement_so_completion/test/completion_so_test.yml	1970-01-01 00:00:00 +0000
+++ account_statement_so_completion/test/completion_so_test.yml	2014-01-16 10:35:50 +0000
@@ -0,0 +1,44 @@
+-
+  In order to test the banking framework for Sale Orders, I first need to
+  create a profile
+-
+  !record {model: account.statement.profile, id: profile_test_so}:
+    name: Bank EUR Profile for SO
+    journal_id: account.bank_journal
+    commission_account_id: account.a_expense
+    company_id: base.main_company
+    balance_check: True
+    rule_ids:
+      - account_statement_base_completion.bank_statement_completion_rule_4
+      - account_statement_base_completion.bank_statement_completion_rule_5
+      - account_statement_base_completion.bank_statement_completion_rule_2
+      - account_statement_base_completion.bank_statement_completion_rule_3
+      - bank_statement_completion_rule_1
+-
+  Now I create a statement. I create statment lines separately because I need
+  to find each one by XML id
+-
+  !record {model: account.bank.statement, id: statement_test_sale1}:
+    name: Statement for SO
+    profile_id: profile_test_so
+    company_id: base.main_company
+-
+  I create a statement line for a SO
+-
+  !record {model: account.bank.statement.line, id: statement_line_so}:
+    name: Test autocompletion based on Sale Order Number
+    statement_id: statement_test_sale1
+    ref: SO007
+    date: '2013-12-20'
+    amount: 14981.0
+-
+  I run the auto complete
+-
+  !python {model: account.bank.statement}: |
+    result = self.button_auto_completion(cr, uid, [ref("statement_test_sale1")])
+-
+  Now I can check that all is nice and shiny, line 1. I expect the Sale Order
+  Number to be recognised.
+-
+  !assert {model: account.bank.statement.line, id: statement_line_so, string: Check completion by SO number}:
+    - partner_id.name == u'Luminous Technologies'