← Back to branch summary

~therp-nl/banking-addons/6.1-dev-fixes_from_testing_iteration_1

« back to all changes in this revision

Viewing changes to account_banking_uk_hsbc/wizard/export_hsbc.py

  • Committer: Stefan Rijnhart
  • Date: 2012-04-14 09:16:54 UTC
  • mfrom: (121.1.4 6.1-dev)
  • Revision ID: stefan@therp.nl-20120414091654-aw92jhhhijl69nok
[MRG] Merged with main development branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
account_banking_uk_hsbc/wizard/export_hsbc.py
139
139
        return super(banking_export_hsbc_wizard, self).create(
140
140
            cursor, uid, wizard_data, context)
141
141
 
142
 
    def _create_account(self, oe_account):
 
142
    def _create_account(self, oe_account, origin_country=None, is_origin_account=False):
143
143
        currency = None # let the receiving bank select the currency from the batch
144
144
        holder = oe_account.owner_name or oe_account.partner_id.name
145
145
        self.logger.info('Create account %s' % (holder))
191
191
                currency=currency,
192
192
                swiftcode=oe_account.bank.bic,
193
193
                country=oe_account.country_id.code,
194
 
                #origin_country=origin_country
 
194
                origin_country=origin_country,
 
195
                is_origin_account=is_origin_account
195
196
            )
196
197
            transaction_kwargs = {
197
198
                'charges': paymul.CHARGES_PAYEE,
237
238
            )
238
239
        
239
240
        self.logger.info('====')
240
 
        dest_account, transaction_kwargs = self._create_account(line.bank_id)
 
241
        dest_account, transaction_kwargs = self._create_account(line.bank_id, line.order_id.mode.bank_id.country_id.code)
241
242
 
242
243
        means = {'ACH or EZONE': paymul.MEANS_ACH_OR_EZONE,
243
244
                 'Faster Payment': paymul.MEANS_FASTER_PAYMENT,
278
279
        try:
279
280
            self.logger.info('Source - %s (%s) %s' % (payment_orders[0].mode.bank_id.partner_id.name, payment_orders[0].mode.bank_id.acc_number, payment_orders[0].mode.bank_id.country_id.code))
280
281
            src_account = self._create_account(
281
 
                payment_orders[0].mode.bank_id,
 
282
                payment_orders[0].mode.bank_id, payment_orders[0].mode.bank_id.country_id.code, is_origin_account=True
282
283
            )[0]
283
284
        except ValueError as exc:
284
285
            raise osv.except_osv(