[REV] reverted previous commit (7212) that removes footer field on res.partner.bank, because specs changed

bzr revid: qdp-launchpad@openerp.com-20120809120409-lmubwp2k7wig83hz

5 files changed, 16 insertions, 0 deletions

diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 388a8e5a64b..4b3436c8a51 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -46,6 +46,9 @@
           <p class="oe_view_nocontent_create">
             Click to setup a new bank account. 
           </p><p>
+            Configure your company's bank account and select those that must
+            appear on the report footer.
+          </p><p>
             If you use the accounting application of OpenERP, journals and
             accounts will be created automatically based on these data.
           </p>
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 8e50493b063..658f87962ff 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -43,6 +43,8 @@ class account_config_settings(osv.osv_memory):
             string='Default company currency', help="Main currency of the company."),
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
             string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
+        'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
+            string='Bank accounts on reports will display as followed', help="Bank accounts as printed in the footer of each customer  document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
 
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
         'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),
@@ -152,6 +154,7 @@ class account_config_settings(osv.osv_memory):
             'expects_chart_of_accounts': company.expects_chart_of_accounts,
             'currency_id': company.currency_id.id,
             'paypal_account': company.paypal_account,
+            'company_footer': company.rml_footer2,
             'has_chart_of_accounts': has_chart_of_accounts,
             'has_fiscal_year': bool(fiscalyear_count),
             'chart_template_id': False,
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 2cdeb8e0ea9..ebcd99a6915 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -225,6 +225,8 @@
                                     icon="gtk-go-forward"
                                     type="action"
                                     class="oe_inline oe_link"/>
+                                <label for="company_footer"/>
+                                <field name="company_footer"/>
                             </div>
                             <div>
                                 <label for="paypal_account"/>
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
index 5b6a74d7168..a980823590d 100644
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@@ -8,6 +8,7 @@
     company_id: base.main_company
     partner_id: base.main_partner
     acc_number: 123456789
+    footer: True
     bank: base.res_bank_1
     bank_name: Reserve
 -
diff --git a/addons/edi/models/res_company.py b/addons/edi/models/res_company.py
index 1a2bc0d10de..0ab6607cdad 100644
--- a/addons/edi/models/res_company.py
+++ b/addons/edi/models/res_company.py
@@ -47,6 +47,13 @@ class res_company(osv.osv):
             result['logo'] = company.logo # already base64-encoded
         if company.paypal_account:
             result['paypal_account'] = company.paypal_account
+        # bank info: include only bank account supposed to be displayed in document footers
+        res_partner_bank = self.pool.get('res.partner.bank')
+        bank_ids = res_partner_bank.search(cr, uid, [('company_id','=',company.id),('footer','=',True)], context=context)
+        if bank_ids:
+            result['bank_ids'] = res_partner.edi_m2m(cr, uid,
+                                                             res_partner_bank.browse(cr, uid, bank_ids, context=context),
+                                                             context=context)
         return result
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: