Merge lp:~therp-nl/account-banking/upgrade-6.0 into lp:account-banking

[Stefan Rijnhart (Opener)]

Hi Pieter,

this branch is a migration of account_banking to OpenERP 6.0. Below is a short description of the modifications. Given the size of the update, I suspect we will be in touch about this merge.

Regards,
Stefan.

* Account Banking

Migration to OpenERP 6.0
---
Adapt to changes in models of account and account_payment
Adapt to changes in xml view definitions
Restore payment.type functionality from version 5 as payment.mode.type
Restore launch_wizard functionality from version 5
Migrate changes from button_confirm() in v5 to create_move_from_st_line()
Store reference to reconciliation on transaction line
Make old style wizards work properly in GTK and web client
Change journal domains to type=bank

Additional changes:
- Fixes incomplete reconciliations being generated due to account.move.line "line_id" vs. "line_ids' confusion
- Fix bug where a matching invoice is "found" as many times as the number of addresses a partner has
- Fix error in German BBAN format (does not have a trailing check digit)

* Clieop module

Migration to OpenERP 6.0
---
Adapt payment.typea to payment.mode.type
Make old style wizards work properly in GTK and web client

Additional changes:
---
Payment order status now remains unchanged when a test clieop is generated
To avoid confusion between saving the clieop file and finishing the wizard,
the 'Save' button and label have been changed to 'OK/Finish'.

[Pieter J. Kersten (EduSense BV) (pieterj)]

Generic:
    I can see a lot of technical improvements for v6. However, there were
    more changes than just the technical ones. For starters, v6 introduced
    the voucher layer between account and account_payment. I'm missing
    this in your proposal. Is this code used in production? If so,
    what are the experiences? How does it coexist/cooperate with the
    payment/voucher system?

    I can see you tried to stay as close to the v5 version as possible.
    However, I'm second guessing some of the changes for v5, due to the
    semantic changes in v6. One is the move of the period_id on
    account.bank.statement to account.bank.statement.line. Thanks to
    account_voucher, it creates more trouble than its worth it. I'm planning
    to change the statement generation code to fold around the current
    limitations of v6. This would simplify ABF's dependancies greatly.

Many changes seem to me not v6 specific. I will backport these to v5. See my
remarks below.

account_banking/account_banking.py: @-890,+878:
    I will backport this modified to v5. Testing on iterator capabilities is
    more extendable IMO than testing on simple types.

account_banking/account_banking.py: @-911,+901 -922,911:
    Oops, left some lingering code. Thanks for noting.
    Backporting to v5, excluding the style change.

account_banking/account_banking.py: @-1188,+1177:
    Ok, backporting to v5.

account_banking/account_banking.py: @-1197,+1186:
    You managed to come up with yet another source. Nice.
    I'll add it to v5.

account_banking/account_banking.py: @-1218,[phone],+1231:
    Not sure if this is an improvement. I'll leave it for now.
    Won't take the style change.

account_banking/sepa/iban.py:
    This change is not conform specs. Any sources I can check for this?
    Will leave it untill more info arrives.

account_banking/sepa/online.py/BBAN_is_IBAN:
    See your point. Using slightly improved version for v5.

account_banking/wizard/bank_import/@@ -544,+545:
    This is unneeded. You don't use it anywhere. Won't take it.

account_banking/wizard/bank_import/@@ -567,+568, -730,+730 and -743,+743:
    These are just style changes. Wont take these.

account_banking/wizard/bank_import/@@ -753,+753:
    See your point. Your solution is however not always correct.
    Backporting improved version to v5.

account_banking/wizard/bank_import/@@ -795,+798:
    Can't see any value in this change. Just make sure that
        isinstance(transaction.remote_account, (str, unicode)) is True
    which must be done in the import parsers.

account_banking/wizard/bank_import/@@ -922,+918:
    Ok, see your point. Backporting to v5

account_banking/wizard/banktools/get_or_create_partner:
    Ok, backporting the unique construct to v5.
    Having some difficulties with the defensive field resolving code.
    Is this really needed? Never faced any problems with it.

account_banking/wizard/banktools/create_bank_account:
    What is the purpose of these changes?
    I can't see a semantic value for a catch-all 'UNKNOWN' bank.
    Problem is, when the bank gets known, chances are it won't be
    the same as "the other" accounts with UNKNOWN tied to it.
   ...

[Pieter J. Kersten (EduSense BV) (pieterj)]

BTW, if that wasn't obvious to you already, great job!

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Pieter,

again, thank you for your fast and perceptive response! I agree with
most of your remarks. Please find some additional comments below.

On 27-04-11 12:30, Pieter J. Kersten (EduSense BV) wrote:
> Generic:
> I can see a lot of technical improvements for v6. However, there were
> more changes than just the technical ones. For starters, v6 introduced
> the voucher layer between account and account_payment. I'm missing
> this in your proposal. Is this code used in production? If so,
> what are the experiences? How does it coexist/cooperate with the
> payment/voucher system?

This code is used in a couple of small setups. We knowingly ignored
account_voucher for this version in order to simplify verification of
the operation of the migrated code. The process of payments (through
payment orders) and bank reconciliation works fine without it, but a
logical next step would be looking at integrating account_voucher.

> account_banking/account_banking.py: @-1218,[phone],+1231:
> Not sure if this is an improvement. I'll leave it for now.
>
We felt the error was a bit too harsh on the account number, given the
poor performance of the online iban service for Dutch bank accounts. It
is a matter of taste. We will be looking at integrating a paid service
for iban/bic lookups.

> account_banking/sepa/iban.py:
> This change is not conform specs. Any sources I can check for this?
> Will leave it untill more info arrives.

This change was triggered by a real transaction. We looked to Wikipedia
for confirmation
(http://en.wikipedia.org/wiki/International_Bank_Account_Number lists
German bbank as 18n, no check digit). Ecbs has the length listed as 18!n
as well (http://www.ecbs.org/iban/germany-bank-account-number.html)

> account_banking/wizard/bank_import/@@ -544,+545:
> This is unneeded. You don't use it anywhere. Won't take it.
>
No, it is used in line 931, although I did not introduce it.

> account_banking/wizard/bank_import/@@ -795,+798:
> Can't see any value in this change. Just make sure that
> isinstance(transaction.remote_account, (str, unicode)) is True
> which must be done in the import parsers.
In the ABNAmro filter the remote owner, but not the remote_account is
retrieved in case of a payment terminal transaction. I would rather
check here than having to initialize remote_account as an empty string.

> account_banking/wizard/banktools/get_or_create_partner:
> Ok, backporting the unique construct to v5.
> Having some difficulties with the defensive field resolving code.
> Is this really needed? Never faced any problems with it.

Yes, if we take requiredness into account, some checks are superfluous.
I would suggest to just keep

     user.company_id.partner_id.country and
user.company_id.partner_id.country.id or False

> account_banking/wizard/banktools/create_bank_account:
> What is the purpose of these changes?
> I can't see a semantic value for a catch-all 'UNKNOWN' bank.
> Problem is, when the bank gets known, chances are it won't be
> the same as "the other" accounts with UNKNOWN tied to it.
> Better leave ...

[Pieter J. Kersten (EduSense BV) (pieterj)]

Hi Stefan,

Thanks for your answers. I've adapted some changes to ABF in order to
address some of your remarks.
Most notably:

1. Adapted German localized BBAN format
2. Changed model members to default to str (makes
isinstance(model.member, (str, unicode)) == True, even when untouched)
3. Reactivated apparently untested path in wizard.
4. Added more remarks to parser template regarding numbering issues
(prevent future discussions)

Can you please pull these, remove your visual/style changes and create a
new merge proposal?

One question remains: What is your definition of "poor performance"
regarding the online Dutch IBAN/BIC convertor?
BTW, I'm not sure if paying will enhance the data quality. Most paid
services simply calculate their responses.

With your new proposal, I will check ABF's cooperation with
vouchers/payments. I'm interested to see how it behaves.
I was already planning on updating ABF to face the new semantics. This
looks like a welcome jump start.
BTW, I'll start a new branch for this, in order to allow backports to v5.

TIA,
--
Pieter J. Kersten
*T:* [phone]
*KvK:* 08178777
Logo EduSense B.V. <http://www.edusense.nl>

Op 28-04-11 08:55 schreef Stefan Rijnhart (Therp):
> Hi Pieter,
>
> again, thank you for your fast and perceptive response! I agree with
> most of your remarks. Please find some additional comments below.
>
>
> On 27-04-11 12:30, Pieter J. Kersten (EduSense BV) wrote:
>> Generic:
>> I can see a lot of technical improvements for v6. However, there were
>> more changes than just the technical ones. For starters, v6 introduced
>> the voucher layer between account and account_payment. I'm missing
>> this in your proposal. Is this code used in production? If so,
>> what are the experiences? How does it coexist/cooperate with the
>> payment/voucher system?
> This code is used in a couple of small setups. We knowingly ignored
> account_voucher for this version in order to simplify verification of
> the operation of the migrated code. The process of payments (through
> payment orders) and bank reconciliation works fine without it, but a
> logical next step would be looking at integrating account_voucher.
>
>> account_banking/account_banking.py: @-1218,[phone],+1231:
>> Not sure if this is an improvement. I'll leave it for now.
>>
> We felt the error was a bit too harsh on the account number, given the
> poor performance of the online iban service for Dutch bank accounts. It
> is a matter of taste. We will be looking at integrating a paid service
> for iban/bic lookups.
>
>> account_banking/sepa/iban.py:
>> This change is not conform specs. Any sources I can check for this?
>> Will leave it untill more info arrives.
> This change was triggered by a real transaction. We looked to Wikipedia
> for confirmation
> (http://en.wikipedia.org/wiki/International_Bank_Account_Number lists
> German bbank as 18n, no check digit). Ecbs has the length listed as 18!n
> as well (http://www.ecbs.org/iban/germany-bank-account-number.html)
>
>> account_banking/wizard/bank_import/@@ -544,+545:
>> This is unneeded. You don't use it anywhere. Won't take it.
>>
> N...

[Stefan Rijnhart (Opener) (stefan-opener)]

On 28-04-11 10:13, Pieter J. Kersten (EduSense BV) wrote:
> One question remains: What is your definition of "poor performance"
> regarding the online Dutch IBAN/BIC convertor?
We encountered a number of unrecognized bank accounts, most notably the
bank account of the Chamber of Commerce in our region as well as some of
the customers' Triodos accounts. The prominence of these accounts
naturally influenced our appreciation of the online service's performance.

Regards,
Stefan.

--
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en implementatie

mail: <email address hidden>
tel: [phone]
web: http://therp.nl

[Jan Verlaan (jan-verlaan)]

Hope to see 2 versions in future, one for V5 and one for V6.
Merging only the upgrade to V6 would leave only a version for V6, while several users will stay on V5 for the next years.

[Pieter J. Kersten (EduSense BV) (pieterj)]

This will be the case.
--
Pieter J. Kersten

Op 29-04-11 15:38 schreef Jan Verlaan (Veritos):
> Hope to see 2 versions in future, one for V5 and one for V6.
> Merging only the upgrade to V6 would leave only a version for V6, while several users will stay on V5 for the next years.

[lp:~therp-nl/account-banking/upgrade-6.0]

60. By Stefan Rijnhart (Opener) on 2011-04-29

[MRG] backports from previous merge request

61. By Stefan Rijnhart (Opener) on 2011-05-01

Undo style changes and changes in error messages

62. By Stefan Rijnhart (Opener) on 2011-05-01

[FIX] Cannot use storage trigger on field 'id'

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Pieter,

Your backports have been merged in this branch.

I have kept assigning code 'UNKNOW' to unknown banks. The reference to res_bank is required for res_partner_banks in 6.0. Without this modification a multitude of unknown banks can get accumulated.

You might still want to look at the following changes for backporting to v5:

account_banking/wizard/bank_import.py @@ -801,7 +802,7 @@
account_banking/sepa/online.py @@ -134,7 +134,7 @@

Regards,
Stefan.

review: Needs Resubmitting

[Pieter J. Kersten (EduSense BV) (pieterj)]

Hi Stefan,

Thanks for the two typos I left open during v5 backport.
I've reviewed the patch for v6. There are a few issues I can see for now.

1. The domains in the forms are too restrictive in its current form. The 'suitable_bank_types' method in account_payment can return more than just 'bank'. After installing base_iban, it can also return 'iban', which is a valid bank account type for ABF too. There can be more. So instead of using a hard coded domain, I suggest extending the form with suitable bank types (hidden? context?) and setting the domain to this list ('type','in',types_list)

2. I can see how changing state on payment orders during testing of ClieOp can mess things up, but not being able to save it at all is a bit too restrictive for me. Preventing switching states when saving test batches should do just fine.

3. Instead of using a catch all bank, I prefer to have an optional relationship between res_partner_bank and res_bank. This way you can relax requirements. The current layout of res_bank is too biased for Belgian and German usage anyway - a bank code is required, which is not even known in some countries, including the Netherlands. You could add a constraint to require a valid bank when code is filled in order to prevent regression for bankcode-users.

BTW, I've reserved trunk for v6.0 development from now on.

review: Needs Fixing

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Pieter,

Thank you for your comments. I hope you will accept the clarifications
below.

On 05-05-11 17:11, Pieter J. Kersten (EduSense BV) wrote:
> 1. The domains in the forms are too restrictive in its current form. The 'suitable_bank_types' method in account_payment can return more than just 'bank'. After installing base_iban, it can also return 'iban', which is a valid bank account type for ABF too. There can be more. So instead of using a hard coded domain, I suggest extending the form with suitable bank types (hidden? context?) and setting the domain to this list ('type','in',types_list)
My notion here is that you may be mislead by the domains for journals
which I have modified. OpenERP 6 separated cash and bank journals by
introducing a new type 'bank' in addition to 'cash'. I have modified the
code accordingly.

As for suitable bank types, I took a shortcut and had done away with
them at all as I was trying to find out the current status of the
payment_order module. It seemed to be blocking all payment orders
because its method suitable_bank_types() returned no bank types at all
under any condition. I modified it to always return all bank types,
which seemed to solve the problem that no bank account was ever selected
for the payment order lines. Having another look now, the real cause
appears to be the pretty awful implementation of line2bank() in the
original payment_order module which initializes all keys in the
dictionary to False and then only provides a meaningful value if a key
is not in the dictionary.

That insight gives me with the key to implement the notion of suitable
bank types in this branch after all. I will have a go at that in the
next couple of weeks.

> 2. I can see how changing state on payment orders during testing of ClieOp can mess things up, but not being able to save it at all is a bit too restrictive for me. Preventing switching states when saving test batches should do just fine.

That was exactly my intent, and if I am not mistaken the code does just
that. Files are available for download in the wizard and afterwards in
the list of generated clieop files.

> 3. Instead of using a catch all bank, I prefer to have an optional relationship between res_partner_bank and res_bank. This way you can relax requirements. The current layout of res_bank is too biased for Belgian and German usage anyway - a bank code is required, which is not even known in some countries, including the Netherlands. You could add a constraint to require a valid bank when code is filled in order to prevent regression for bankcode-users.

As the res.bank on res.partner.bank is required in the base module, it
is reasonable for developers to expect this field to be defined on the
object. Such code already lives in the module l10n_ch. I would hate to
introduce instability by creating resources of type res.partner.bank
without a res.bank. Note that, in a previous mail, we ourselves agreed
to apply defensive object browsing only to complement requiredness of
fields. As such, I would rather not follow your suggestion.

Kind regards,
Stefan.

--
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en imple...

[lp:~therp-nl/account-banking/upgrade-6.0]

63. By Stefan Rijnhart (Opener) on 2011-05-20

[MRG] fixes from parent branch already included in this branch

64. By Stefan Rijnhart (Opener) on 2011-05-23

[IMP] Restores suitable bank types functionality similar to V5

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Pieter,

the branch has been updated with functionality for suitable bank type matching when filling payment orders. Support for this in account_payment is derelict, so I had to include some adaptations to the code in this module.

Cheers,
Stefan.

review: Needs Resubmitting

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Pieter,

it has been a month since my last resubmit. Have you had a chance to review?

Cheers,
Stefan.

[lp:~therp-nl/account-banking/upgrade-6.0]

65. By Stefan Rijnhart (Opener) on 2011-07-14

[REF] Import wizard is now a new style (osv_memory) wizard

66. By Stefan Rijnhart (Opener) on 2011-07-21

[REF] Payment wizards are now new style (osv_memory) wizards
[FIX] Allow for ClieOp export with empty reference

67. By Stefan Rijnhart (Opener) on 2011-07-24

[IMP] Provide upgrade path for the previously pushed revision
[FIX] Layout change in the Triodos CSV format (account numbers)

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Pieter,

the wizards have now been migrated to osv_memory. As a side effect, this makes dynamically selecting the payment wizard much more transparent.

An upgrade path for early adopters of this branch is provided (in nl_clieop/migrations/0.63). You can leave it in, it is harmless for new users but the revision number of the clieop module (and as a consequence, the name of the migrations subfolder) is a guess of course and should be changed when you merge the branch.

Regards,
Stefan.

review: Needs Resubmitting

[Stefan Rijnhart (Opener) (stefan-opener)]

Forgot to mention that a small functional change has been made in the latest revisions: the field 'payment_order_ids' on banking.export.clieop is now a proper many2many, and a tab has been added to its view with this field.

[lp:~therp-nl/account-banking/upgrade-6.0]

68. By Stefan Rijnhart (Opener) on 2011-08-19

[FIX] Take moves from new refund journal types into account when matching transactions

[Chris Halls (halls)]

credativ is working on porting this to 6.1. I have already been in contact with Stefan to check we are not duplicating existing work.

[Erwin van der Linde (erwin-7)]

> credativ is working on porting this to 6.1. I have already been in contact
> with Stefan to check we are not duplicating existing work.

Dear Chris / Stefan,

Is there any update info on the porting matter?

Thanks in advance!

Cheers,

Erwin

[Chris Halls (halls)]

> Is there any update info on the porting matter?

Hi Erwin

We've had to revert back to 6.0 because of the delayed 6.1 release, but we do already have a number of changes. As far as I remember, we haven't yet completely sorted out how to specify bank accounts using the new combined account number + IBAN format. Would you like us to put the changes we have so far somewhere for you to look at?

Chris

[Stefanr (stefan-stefanlinux)]

On 10/25/2011 11:09 AM, Chris Halls (credativ) wrote:
>> Is there any update info on the porting matter?
> Hi Erwin
>
> We've had to revert back to 6.0 because of the delayed 6.1 release, but we do already have a number of changes. As far as I remember, we haven't yet completely sorted out how to specify bank accounts using the new combined account number + IBAN format. Would you like us to put the changes we have so far somewhere for you to look at?
>

Hi Chris,

it would be a good idea to put your changes on Launchpad.

Cheers,
Stefan.

[lp:~therp-nl/account-banking/upgrade-6.0]

69. By Stefan Rijnhart (Opener) on 2011-11-01

[FIX] iban read method to accept a single item or a list (Dmitrijs Ledkovs)

70. By Stefan Rijnhart (Opener) on 2011-11-01

[FIX] UnboundLocalError: local variable 'payment_lines' referenced before assignment (Dmitrijs Ledkovs)

[Dimitri John Ledkov (ex-credativ) (dle-credativ)]

Heya all,

Changes we did for 6.1 are pending to be uploaded to launchpad. I will do it, when I have spare capacity.

For two clients we deployed to we totally ignore vouchers, and it works fine.

Ideally we want a 6.0 & 6.1 branches started and merged as soon as possible preferably as series targets, e.g. lp:account-banking/6.0

I've submitted two bug-fixes which apply to v5 and upgrade-6.0 (merged into upgrade-6.0 already). And we are maintaining our own ~credativ/upgrade-6.0 branch for our customers currently. But we'd rather merge into lp:account-banking/6.0 to ease maintenance.

Please note that there is a non-working version of account_banking in addons-extra/6.0

Please note that account_banking should conflict with account_payment_extension (both use the same relation table for many2many, but a different target table resulting in very peculiar error messages).

Do any of you have commit access to addons-extra?

Regards,

Dmitrijs.

[Stefan Rijnhart (Opener) (stefan-opener)]

>
> Please note that there is a non-working version of account_banking in addons-
> extra/6.0
>
> Do any of you have commit access to addons-extra?

Hi Dmitrijs,

as it turned out, other people have now duplicated some of our work because of these obsolete versions in the extra addons branches, which also turn up on http://apps.openerp.com.

I think the extra addons branches should be obsolete now that you can add any branch on that site, so I removed the account_banking modules from extra-6.0 and extra-trunk completely.

Cheers,
Stefan.

[Stefan Rijnhart (Opener) (stefan-opener)]

This branch has been abandoned. Please go to https://launchpad.net/banking-addons

[lp:~therp-nl/account-banking/upgrade-6.0]

71. By Stefan Rijnhart (Opener) on 2011-11-23

[ADD] Announce deprecation of this branch

Unmerged revisions

71. By Stefan Rijnhart (Opener) on 2011-11-23

[ADD] Announce deprecation of this branch

70. By Stefan Rijnhart (Opener) on 2011-11-01

[FIX] UnboundLocalError: local variable 'payment_lines' referenced before assignment (Dmitrijs Ledkovs)

69. By Stefan Rijnhart (Opener) on 2011-11-01

[FIX] iban read method to accept a single item or a list (Dmitrijs Ledkovs)

68. By Stefan Rijnhart (Opener) on 2011-08-19

[FIX] Take moves from new refund journal types into account when matching transactions

67. By Stefan Rijnhart (Opener) on 2011-07-24

[IMP] Provide upgrade path for the previously pushed revision
[FIX] Layout change in the Triodos CSV format (account numbers)

66. By Stefan Rijnhart (Opener) on 2011-07-21

[REF] Payment wizards are now new style (osv_memory) wizards
[FIX] Allow for ClieOp export with empty reference

65. By Stefan Rijnhart (Opener) on 2011-07-14

[REF] Import wizard is now a new style (osv_memory) wizard

64. By Stefan Rijnhart (Opener) on 2011-05-23

[IMP] Restores suitable bank types functionality similar to V5

63. By Stefan Rijnhart (Opener) on 2011-05-20

[MRG] fixes from parent branch already included in this branch

62. By Stefan Rijnhart (Opener) on 2011-05-01

[FIX] Cannot use storage trigger on field 'id'

=== added file 'THIS_BRANCH_IS_DEPRECATED.txt'
--- THIS_BRANCH_IS_DEPRECATED.txt	1970-01-01 00:00:00 +0000
+++ THIS_BRANCH_IS_DEPRECATED.txt	2011-11-23 10:40:16 +0000
@@ -0,0 +1,3 @@
+This branch has been replaced by lp:banking-addons/6.0
+
+See https://launchpad.net/banking-addons

=== modified file 'account_banking/__terp__.py'
--- account_banking/__terp__.py	2011-11-08 13:10:34 +0000
+++ account_banking/__terp__.py	2011-11-23 10:40:16 +0000
@@ -35,66 +35,14 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'data/account_banking_data.xml',
-        'account_banking_import_wizard.xml',
-        'account_banking_payment_wizard.xml',
+        'wizard/bank_import_view.xml',
         'account_banking_view.xml',
         'account_banking_workflow.xml',
     ],
     'demo_xml': [],
     'description': '''
-    Module to do banking.
-
-    Note: This module is depending on BeautifulSoup.
-
-    This modules tries to combine all current banking import and export
-    schemes. Rationale for this is that it is quite common to have foreign
-    bank account numbers next to national bank account numbers. The current
-    approach, which hides the national banking interface schemes in the
-    l10n_xxx modules, makes it very difficult to use these simultanious.
-    A more banking oriented approach seems more logical and cleaner.
-
-    Changes to default OpenERP:
-
-    * Puts focus on the real life messaging with banks:
-      + Bank statement lines upgraded to independent bank transactions.
-      + Banking statements have no special accountancy meaning, they're just
-        message envelopes for a number of bank transactions.
-      + Bank statements can be either encoded by hand to reflect the document
-        version of Bank Statements, or created as an optional side effect of
-        importing Bank Transactions.
-
-    * Preparations for SEPA:
-      + IBAN accounts are the standard in the SEPA countries
-      + local accounts are derived from SEPA (excluding Turkey) but are
-        considered to be identical to the corresponding SEPA account.
-      + Banks are identified with either Country + Bank code + Branch code or BIC
-      + Each bank can have its own pace in introducing SEPA into their
-        communication with their customers.
-      + National online databases can be used to convert BBAN's to IBAN's.
-      + The SWIFT database is consulted for bank information.
-
-    * Adds dropin extensible import facility for bank communication in:
-      - Drop-in input parser development.
-      - MultiBank (NL) format transaction files available as
-        account_banking_nl_multibank,
-
-    * Extends payments for digital banking:
-      + Adapted workflow in payments to reflect banking operations
-      + Relies on account_payment mechanics to extend with export generators.
-      - ClieOp3 (NL) payment and direct debit orders files available as
-        account_banking_nl_clieop
-
-    * Additional features for the import/export mechanism:
-      + Automatic matching and creation of bank accounts, banks and partners,
-        during import of statements.
-      + Automatic matching with invoices and payments.
-      + Sound import mechanism, allowing multiple imports of the same
-        transactions repeated over multiple files.
-      + Journal configuration per bank account.
-      + Business logic and format parsing strictly separated to ease the
-        development of new parsers.
-      + No special configuration needed for the parsers, new parsers are
-        recognized and made available at server (re)start.
+Do not install this module. This branch has been replaced by lp:banking-addons/6.0
+See https://launchpad.net/banking-addons
     ''',
     'active': False,
     'installable': True,

=== modified file 'account_banking/account_banking.py'
--- account_banking/account_banking.py	2011-11-08 13:10:34 +0000
+++ account_banking/account_banking.py	2011-11-23 10:40:16 +0000
@@ -63,6 +63,7 @@
 from osv import osv, fields
 from tools.translate import _
 from wizard.banktools import get_or_create_bank
+import decimal_precision as dp
 import pooler
 import netsvc
 from tools import config
@@ -184,6 +185,60 @@
     }
 account_banking_imported_file()
 
+class payment_mode_type(osv.osv):
+    _name= 'payment.mode.type'
+    _description= 'Payment Mode Type'
+    _columns= {
+        'name': fields.char(
+            'Name', size=64, required=True,
+            help='Payment Type'
+            ),
+        'code': fields.char(
+            'Code', size=64, required=True,
+            help='Specify the Code for Payment Type'
+            ),
+        # Setting suitable_bank_types to required pending
+        # https://bugs.launchpad.net/openobject-addons/+bug/786845
+        'suitable_bank_types': fields.many2many(
+            'res.partner.bank.type',
+            'bank_type_payment_type_rel',
+            'pay_type_id','bank_type_id',
+            'Suitable bank types', required=True),
+        'ir_model_id': fields.many2one(
+            'ir.model', 'Payment wizard',
+            help=('Select the Payment Wizard for payments of this type. '
+                  'Leave empty for manual processing'),
+            domain=[('osv_memory', '=', True)],
+            ),
+    }
+
+payment_mode_type()
+
+class payment_mode(osv.osv):
+    ''' Restoring the payment type from version 5,
+    used to select the export wizard (if any) '''
+    _inherit = "payment.mode"
+
+    def suitable_bank_types(self, cr, uid, payment_mode_id=None, context=None):
+        """ Reinstates functional code for suitable bank type filtering.
+        Current code in account_payment is disfunctional.
+        """
+        res = []
+        payment_mode = self.browse(
+            cr, uid, payment_mode_id, context)
+        if (payment_mode and payment_mode.type and
+            payment_mode.type.suitable_bank_types):
+            res = [type.code for type in payment_mode.type.suitable_bank_types]
+        return res
+
+    _columns = {
+        'type': fields.many2one(
+            'payment.mode.type', 'Payment type',
+            help='Select the Payment Type for the Payment Mode.'
+            ),
+        }
+payment_mode()
+
 class account_bank_statement(osv.osv):
     '''
     Extensions from account_bank_statement:
@@ -265,228 +320,139 @@
     #    '''
     #    return None
 
-    def button_confirm(self, cursor, uid, ids, context=None):
-        '''
-        Trigger function for button 'Confirm'
-        As this function completely replaces the old one in account, other
-        modules who wish to alter behavior of this function but want to
-        cooperate with account_banking, should move their functionality to 
-
-            on_button_confirm(self, cursor, uid, ids, context=None)
-
-        and drop any calls to super() herein.
-        In order to allow usage with and without account_banking, one could
-        use 
-
-            def on_button_confirm(...):
-                # Your code here
-
-            def button_confirm(...):
-                super(my_class, self).button_confirm(...)
-                self.on_button_confirm(...)
-
-        This way, code duplication is minimized.
-        '''
+    def create_move_from_st_line(self, cr, uid, st_line_id,
+                                 company_currency_id, st_line_number,
+                                 context=None):
         # This is largely a copy of the original code in account
+        # Modifications are marked with AB
         # As there is no valid inheritance mechanism for large actions, this
         # is the only option to add functionality to existing actions.
         # WARNING: when the original code changes, this trigger has to be
         # updated in sync.
-        done = []
+        if context is None:
+            context = {}
         res_currency_obj = self.pool.get('res.currency')
-        res_users_obj = self.pool.get('res.users')
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
-        account_bank_statement_line_obj = \
-                self.pool.get('account.bank.statement.line')
-
-        company_currency_id = res_users_obj.browse(cursor, uid, uid,
-                context=context).company_id.currency_id.id
-
-        for st in self.browse(cursor, uid, ids, context):
-            if not st.state=='draft':
-                continue
-
-            # Calculate statement balance from the contained lines
-            end_bal = st.balance_end or 0.0
-            if not (abs(end_bal - st.balance_end_real) < 0.0001):
+        account_bank_statement_line_obj = self.pool.get(
+            'account.bank.statement.line')
+        st_line = account_bank_statement_line_obj.browse(cr, uid, st_line_id,
+                                                         context=context)
+        st = st_line.statement_id
+
+        context.update({'date': st_line.date})
+        period_id = self._get_period(
+            cr, uid, st_line.date, context=context) # AB
+
+        move_id = account_move_obj.create(cr, uid, {
+            'journal_id': st.journal_id.id,
+            'period_id': period_id, # AB
+            'date': st_line.date,
+            'name': st_line_number,
+        }, context=context)
+        account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
+            'move_ids': [(4, move_id, False)]
+        })
+
+        if st_line.amount >= 0:
+            account_id = st.journal_id.default_credit_account_id.id
+        else:
+            account_id = st.journal_id.default_debit_account_id.id
+
+        acc_cur = ((st_line.amount <= 0 and
+                    st.journal_id.default_debit_account_id) or
+                   st_line.account_id)
+        context.update({
+                'res.currency.compute.account': acc_cur,
+            })
+        amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                company_currency_id, st_line.amount, context=context)
+
+        val = {
+            'name': st_line.name,
+            'date': st_line.date,
+            'ref': st_line.ref,
+            'move_id': move_id,
+            'partner_id': (((st_line.partner_id) and st_line.partner_id.id) or
+                           False),
+            'account_id': (st_line.account_id) and st_line.account_id.id,
+            'credit': ((amount>0) and amount) or 0.0,
+            'debit': ((amount<0) and -amount) or 0.0,
+            'statement_id': st.id,
+            'journal_id': st.journal_id.id,
+            'period_id': period_id, # AB
+            'currency_id': st.currency.id,
+            'analytic_account_id': (st_line.analytic_account_id and
+                                    st_line.analytic_account_id.id or
+                                    False),
+        }
+
+        if st.currency.id <> company_currency_id:
+            amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                        st.currency.id, amount, context=context)
+            val['amount_currency'] = -amount_cur
+
+        if (st_line.account_id and st_line.account_id.currency_id and
+            st_line.account_id.currency_id.id <> company_currency_id):
+            val['currency_id'] = st_line.account_id.currency_id.id
+            amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                    st_line.account_id.currency_id.id, amount, context=context)
+            val['amount_currency'] = -amount_cur
+
+        move_line_id = account_move_line_obj.create(
+            cr, uid, val, context=context)
+        torec = move_line_id
+
+        # Fill the secondary amount/currency
+        # if currency is not the same than the company
+        amount_currency = False
+        currency_id = False
+        if st.currency.id <> company_currency_id:
+            amount_currency = st_line.amount
+            currency_id = st.currency.id
+        account_move_line_obj.create(cr, uid, {
+            'name': st_line.name,
+            'date': st_line.date,
+            'ref': st_line.ref,
+            'move_id': move_id,
+            'partner_id': (((st_line.partner_id) and st_line.partner_id.id) or
+                           False),
+            'account_id': account_id,
+            'credit': ((amount < 0) and -amount) or 0.0,
+            'debit': ((amount > 0) and amount) or 0.0,
+            'statement_id': st.id,
+            'journal_id': st.journal_id.id,
+            'period_id': period_id, # AB
+            'amount_currency': amount_currency,
+            'currency_id': currency_id,
+            }, context=context)
+
+        for line in account_move_line_obj.browse(cr, uid, [x.id for x in
+                account_move_obj.browse(cr, uid, move_id,
+                    context=context).line_id],
+                context=context):
+            if line.state <> 'valid':
                 raise osv.except_osv(_('Error !'),
-                    _('The statement balance is incorrect !\n') +
-                    _('The expected balance (%.2f) is different '
-                      'than the computed one. (%.2f)') % (
-                          st.balance_end_real, st.balance_end
-                      ))
-            if (not st.journal_id.default_credit_account_id) \
-                    or (not st.journal_id.default_debit_account_id):
-                raise osv.except_osv(_('Configration Error !'),
-                    _('Please verify that an account is defined in the journal.'))
-
-            for line in st.move_line_ids:
-                if line.state != 'valid':
-                    raise osv.except_osv(_('Error !'),
-                        _('The account entries lines are not in valid state.'))
-
-            for move in st.line_ids:
-                context.update({'date':move.date})
-                # Essence of the change is here...
-                period_id = self._get_period(cursor, uid, move.date, context=context)
-                move_id = account_move_obj.create(cursor, uid, {
-                    'journal_id': st.journal_id.id,
-                    # .. and here
-                    'period_id': period_id,
-                    'date': move.date,
-                }, context=context)
-                account_bank_statement_line_obj.write(cursor, uid, [move.id], {
-                    'move_ids': [(4, move_id, False)]
-                })
-                if not move.amount:
-                    continue
-
-                torec = []
-                if move.amount >= 0:
-                    account_id = st.journal_id.default_credit_account_id.id
-                else:
-                    account_id = st.journal_id.default_debit_account_id.id
-                acc_cur = ((move.amount<=0) and st.journal_id.default_debit_account_id) \
-                          or move.account_id
-                amount = res_currency_obj.compute(cursor, uid, st.currency.id,
-                        company_currency_id, move.amount, context=context,
-                        account=acc_cur)
-                if move.reconcile_id and move.reconcile_id.line_new_ids:
-                    for newline in move.reconcile_id.line_new_ids:
-                        amount += newline.amount
-
-                val = {
-                    'name': move.name,
-                    'date': move.date,
-                    'ref': move.ref,
-                    'move_id': move_id,
-                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
-                    'account_id': (move.account_id) and move.account_id.id,
-                    'credit': ((amount>0) and amount) or 0.0,
-                    'debit': ((amount<0) and -amount) or 0.0,
-                    'statement_id': st.id,
-                    'journal_id': st.journal_id.id,
-                    'period_id': period_id,
-                    'currency_id': st.currency.id,
-                }
-
-                amount = res_currency_obj.compute(cursor, uid, st.currency.id,
-                        company_currency_id, move.amount, context=context,
-                        account=acc_cur)
-                if st.currency.id != company_currency_id:
-                    amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
-                                st.currency.id, amount, context=context,
-                                account=acc_cur)
-                    val['amount_currency'] = -amount_cur
-
-                if move.account_id and move.account_id.currency_id and move.account_id.currency_id.id != company_currency_id:
-                    val['currency_id'] = move.account_id.currency_id.id
-                    amount_cur = res_currency_obj.compute(cursor, uid, company_currency_id,
-                            move.account_id.currency_id.id, amount, context=context,
-                            account=acc_cur)
-                    val['amount_currency'] = -amount_cur
-
-                torec.append(account_move_line_obj.create(cursor, uid, val , context=context))
-
-                if move.reconcile_id and move.reconcile_id.line_new_ids:
-                    for newline in move.reconcile_id.line_new_ids:
-                        account_move_line_obj.create(cursor, uid, {
-                            'name': newline.name or move.name,
-                            'date': move.date,
-                            'ref': move.ref,
-                            'move_id': move_id,
-                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
-                            'account_id': (newline.account_id) and newline.account_id.id,
-                            'debit': newline.amount>0 and newline.amount or 0.0,
-                            'credit': newline.amount<0 and -newline.amount or 0.0,
-                            'statement_id': st.id,
-                            'journal_id': st.journal_id.id,
-                            'period_id': period_id,
-                        }, context=context)
-
-                # Fill the secondary amount/currency
-                # if currency is not the same than the company
-                amount_currency = False
-                currency_id = False
-                if st.currency.id <> company_currency_id:
-                    amount_currency = move.amount
-                    currency_id = st.currency.id
-
-                account_move_line_obj.create(cursor, uid, {
-                    'name': move.name,
-                    'date': move.date,
-                    'ref': move.ref,
-                    'move_id': move_id,
-                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
-                    'account_id': account_id,
-                    'credit': ((amount < 0) and -amount) or 0.0,
-                    'debit': ((amount > 0) and amount) or 0.0,
-                    'statement_id': st.id,
-                    'journal_id': st.journal_id.id,
-                    'period_id': period_id,
-                    'amount_currency': amount_currency,
-                    'currency_id': currency_id,
-                    }, context=context)
-
-                for line in account_move_line_obj.browse(cursor, uid, [x.id for x in 
-                        account_move_obj.browse(cursor, uid, move_id, context=context).line_id
-                        ], context=context):
-                    if line.state != 'valid':
-                        raise osv.except_osv(
-                            _('Error !'),
-                            _('Account move line "%s" is not valid')
-                            % line.name
-                        )
-
-                if move.reconcile_id and move.reconcile_id.line_ids:
-                    ## Search if move has already a partial reconciliation
-                    previous_partial = False
-                    for line_reconcile_move in move.reconcile_id.line_ids:
-                        if line_reconcile_move.reconcile_partial_id:
-                            previous_partial = True
-                            break
-                    ##
-                    torec += map(lambda x: x.id, move.reconcile_id.line_ids)
-                    #try:
-                    if abs(move.reconcile_amount-move.amount)<0.0001:
-
-                        writeoff_acc_id = False
-                        #There should only be one write-off account!
-                        for entry in move.reconcile_id.line_new_ids:
-                            writeoff_acc_id = entry.account_id.id
-                            break
-                        ## If we have already a partial reconciliation
-                        ## We need to make a partial reconciliation
-                        ## To add this amount to previous paid amount
-                        if previous_partial:
-                            account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
-                        ## If it's the first reconciliation, we do a full reconciliation as regular
-                        else:
-                            account_move_line_obj.reconcile(
-                                cursor, uid, torec, 'statement',
-                                writeoff_acc_id=writeoff_acc_id,
-                                writeoff_period_id=st.period_id.id,
-                                writeoff_journal_id=st.journal_id.id,
-                                context=context
-                            )
-                    else:
-                        account_move_line_obj.reconcile_partial(
-                            cursor, uid, torec, 'statement', context
-                        )
-
-                if st.journal_id.entry_posted:
-                    account_move_obj.write(cursor, uid, [move_id], {'state':'posted'})
-            done.append(st.id)
-        self.write(cursor, uid, done, {'state':'confirm'}, context=context)
-
-        # Be nice to other modules as well, relay button_confirm calls to
-        # on_button_confirm calls.
-        for other in self._abf_others:
-            if hasattr(other, 'on_button_confirm'):
-                other.on_button_confirm(self, cursor, uid, ids, context=context)
-
-        return True
+                        _('Journal Item "%s" is not valid') % line.name)
+
+        # Bank statements will not consider boolean on journal entry_posted
+        account_move_obj.post(cr, uid, [move_id], context=context)
+        
+        """ 
+        Account-banking:
+        - Write stored reconcile_id
+        - Pay invoices through workflow 
+        """
+        if st_line.reconcile_id:
+            account_move_line_obj.write(cr, uid, [torec], {
+                    'reconcile_id': st_line.reconcile_id.id }, context=context)
+            for move_line in (st_line.reconcile_id.line_id or []) + (
+                st_line.reconcile_id.line_partial_ids or []):
+                netsvc.LocalService("workflow").trg_trigger(
+                    uid, 'account.move.line', move_line.id, cr)
+        """ End account-banking """
+
+        return move_id
 
 account_bank_statement()
 
@@ -564,9 +530,23 @@
     #            res[line.id] = 0.0
     #    return res
 
+    def _get_invoice_id(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for st_line in self.browse(cr, uid, ids, context):
+            res[st_line.id] = False
+            for move_line in (st_line.reconcile_id and
+                              (st_line.reconcile_id.line_id or []) +
+                              (st_line.reconcile_id.line_partial_ids or []) or
+                              []):
+                if move_line.invoice:
+                    res[st_line.id] = move_line.invoice.id
+                    continue
+        return res
+
     _columns = {
         # Redefines
         'amount': fields.float('Amount', readonly=True,
+                            digits_compute=dp.get_precision('Account'),
                             states={'draft': [('readonly', False)]}),
         'ref': fields.char('Ref.', size=32, readonly=True,
                             states={'draft': [('readonly', False)]}),
@@ -596,6 +576,13 @@
                             required=False,
                             states={'confirm': [('readonly', True)]},
                             ),
+        'reconcile_id': fields.many2one(
+            'account.move.reconcile', 'Reconciliation', readonly=True
+            ),
+        'invoice_id': fields.function(
+            _get_invoice_id, method=True, string='Linked Invoice',
+            type='many2one', relation='account.invoice'
+            ),
     }
 
     _defaults = {
@@ -604,57 +591,8 @@
         'currency': _get_currency,
     }
 
-    def onchange_partner_id(self, cursor, uid, line_id, partner_id, type,
-                            currency_id, context=None
-                           ):
-        '''
-        Find default accounts when encoding statements by hand
-        '''
-        if not partner_id:
-            return {}
-
-        result = {}
-        if not currency_id:
-            users_obj = self.pool.get('res.users')
-            currency_id = users_obj.browse(
-                    cursor, uid, uid, context=context
-                ).company_id.currency_id.id
-        result['currency_id'] = currency_id
-        
-        partner_obj = self.pool.get('res.partner')
-        partner = partner_obj.browse(cursor, uid, partner_id, context=context)
-        if partner.supplier and not partner.customer:
-            if partner.property_account_payable.id:
-                result['account_id'] = partner.property_account_payable.id
-            result['type'] = 'supplier'
-        elif partner.customer and not partner.supplier:
-            if partner.property_account_receivable.id:
-                result['account_id'] =  partner.property_account_receivable.id
-            result['type'] = 'customer'
-
-        return result and {'value': result} or {}
-
 account_bank_statement_line()
 
-class payment_type(osv.osv):
-    '''
-    Make description field translatable #, add country context
-    '''
-    _inherit = 'payment.type'
-    _columns = {
-        'name': fields.char('Name', size=64, required=True, translate=True,
-                            help='Payment Type'
-                           ),
-        #'country_id': fields.many2one('res.country', 'Country',
-        #                    required=False,
-        #                    help='Use this to limit this type to a specific country'
-        #                   ),
-    }
-    #_defaults = {
-    #    'country_id': lambda *a: False,
-    #}
-payment_type()
-
 class payment_line(osv.osv):
     '''
     Add extra export_state and date_done fields; make destination bank account
@@ -814,6 +752,7 @@
     Enable extra states for payment exports and add extra functionality.
     '''
     _inherit = 'payment.order'
+<<<<<<< TREE
 
     def __no_transactions(self, cursor, uid, ids, field_name, arg=None,
                           context=None):
@@ -862,8 +801,11 @@
         cursor.execute(query)
         return dict(cursor.fetchall())
 
+=======
+
+>>>>>>> MERGE-SOURCE
     _columns = {
-        'date_planned': fields.date(
+        'date_scheduled': fields.date(
             'Scheduled date if fixed',
             states={
                 'sent': [('readonly', True)],
@@ -941,6 +883,47 @@
             ),
     }
 
+    def launch_wizard(self, cr, uid, ids, context=None):
+        """
+        Search for a wizard to launch according to the type.
+        If type is manual. just confirm the order.
+        Previously (pre-v6) in account_payment/wizard/wizard_pay.py
+        """
+        if context == None:
+            context={}
+        result = {}
+        orders = self.browse(cr, uid, ids, context)
+        order = orders[0]
+        # check if a wizard is defined for the first order
+        if order.mode.type and order.mode.type.ir_model_id:
+            context['active_ids'] = ids
+            wizard_model = order.mode.type.ir_model_id.model
+            wizard_obj = self.pool.get(wizard_model)
+            wizard_id = wizard_obj.create(cr, uid, {}, context)
+            result = {
+                'name': wizard_obj._description or 'Payment Order Export',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': wizard_model,
+                'domain': [],
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_id': wizard_id,
+                'nodestroy': True,
+                }
+        else:
+            # should all be manual orders without type or wizard model
+            for order in orders[1:]:
+                if order.mode.type and order.mode.type.ir_model_id:
+                    raise osv.except_osv(
+                        _('Error'),
+                        _('You can only combine payment orders of the same type')
+                        )
+            # process manual payments
+            self.action_sent(cr, uid, ids, context)
+        return result
+
     def _write_payment_lines(self, cursor, uid, ids, **kwargs):
         '''
         ORM method for setting attributes of corresponding payment.line objects.
@@ -1180,8 +1163,13 @@
         Convert IBAN electronic format to IBAN display format
         '''
         records = self._founder.read(self, *args, **kwargs)
+<<<<<<< TREE
         if not hasattr(records, '__iter__'):
             records = [records]
+=======
+	if not isinstance(records, list):
+            records = [records,]
+>>>>>>> MERGE-SOURCE
         for record in records:
             if 'iban' in record and record['iban']:
                 record['iban'] = unicode(sepa.IBAN(record['iban']))
@@ -1268,12 +1256,15 @@
                  ):
                 country_ids = [user.company_id.partner_id.country.id]
             else:
-                # Ok, tried everything, give up and leave it to the user
-                return warning(_('Insufficient data'),
-                               _('Insufficient data to select online '
-                                 'conversion database')
-                              )
-
+                if (user.company_id and user.company_id.partner_id and
+                    user.company_id.partner_id.country):
+                    country_ids =  [user.company_id.partner_id.country.id]
+                else:
+                    # Ok, tried everything, give up and leave it to the user
+                    return warning(_('Insufficient data'),
+                                   _('Insufficient data to select online '
+                                     'conversion database')
+                                   )
         result = {'value': values}
         # Complete data with online database when available
         if country.code in sepa.IBAN.countries:

=== removed file 'account_banking/account_banking_import_wizard.xml'
--- account_banking/account_banking_import_wizard.xml	2010-01-26 20:55:24 +0000
+++ account_banking/account_banking_import_wizard.xml	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) EduSense BV <http://www.edusense.nl>
-  All rights reserved.
-  The licence is in the file __terp__.py
--->
-<openerp>
-    <data>
-        <wizard id="wizard_account_banking_import_file"
-            string="Import Bank Statements File"
-            model="account.bank.statement"
-            name="account_banking.banking_import"
-            />
-    </data>
-</openerp>

=== removed file 'account_banking/account_banking_payment_wizard.xml'
--- account_banking/account_banking_payment_wizard.xml	2011-02-12 13:37:09 +0000
+++ account_banking/account_banking_payment_wizard.xml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) EduSense BV <http://www.edusense.nl>
-  All rights reserved.
-  The licence is in the file __terp__.py
--->
-<openerp>
-    <data>
-        <wizard id="wizard_account_banking_payment_manual"
-            menu="False"
-            string="Manual Bank Payment"
-            model="account_payment.payment.order"
-            name="account_banking.payment_manual"
-            />
-        <wizard id="account_payment.wizard_populate_payment"
-            menu="False"
-            string="Populate payment"
-            model="payment.order"
-            name="account_payment.populate_payment"
-            />
-    </data>
-</openerp>

=== modified file 'account_banking/account_banking_view.xml'
--- account_banking/account_banking_view.xml	2011-11-07 12:34:48 +0000
+++ account_banking/account_banking_view.xml	2011-11-23 10:40:16 +0000
@@ -42,7 +42,7 @@
                     <field name="company_id" />
                     <separator string="Bank Account Details" colspan="4" />
                     <field name="partner_bank_id" /> <!-- Needs domain for used companies /-->
-                    <field name="journal_id" domain="[('type','=','cash')]" />
+                    <field name="journal_id" domain="[('type','=','bank')]" />
                     <separator string="Default Accounts for Unknown Movements" colspan="4" />
                     <field name="default_credit_account_id" />
                     <field name="default_debit_account_id" />
@@ -61,7 +61,7 @@
                 <tree string="Default Import Settings for Bank Account">
                     <field name="company_id" />
                     <field name="partner_bank_id" /> <!-- Needs domain for used companies /-->
-                    <field name="journal_id" domain="[('type','=','cash')]" />
+                    <field name="journal_id" domain="[('type','=','bank')]" />
                 </tree>
             </field>
         </record>
@@ -140,10 +140,18 @@
         <menuitem name="Import Bank Statements File"
             id="menu_account_banking_import_wizard"
             parent="account_banking.menu_finance_banking_actions"
-            type="wizard"
             action="wizard_account_banking_import_file"
             sequence="15"/>
 
+        <!-- Add the import wizard to the statement's right menu -->
+        <act_window name="Import Bank Statements File"
+            res_model="account.banking.bank.import"
+            src_model="account.bank.statement"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="act_account_banking_import_wizard"/>
+
         <!-- Create right menu entry to see statements -->
         <act_window name="Bank Statements File"
             domain="[('id','=',banking_id)]"
@@ -170,7 +178,15 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="period_id" position="replace"/>
+                <data>
+                    <field name="period_id" position="replace"/>
+                    <xpath expr="/form/notebook/page[@string='Transaction']/field/tree/field[@name='name']" position="replace">
+                        <field name="name" required="1"/>
+                    </xpath>
+                    <xpath expr="/form/notebook/page[@string='Transaction']/field/form/field[@name='name']" position="replace">
+                        <field name="name" required="1"/>
+                    </xpath>
+                </data>
             </field>
         </record>
         <record id="view_banking_bank_statement_form_2" model="ir.ui.view">
@@ -179,7 +195,7 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Entry encoding']/field/tree/field[@name='type']" position="after">
+                <xpath expr="/form/notebook/page[@string='Transaction']/field/tree/field[@name='ref']" position="after">
                     <field name="period_id"/>
                 </xpath>
             </field>
@@ -190,7 +206,7 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Entry encoding']/field/form/field[@name='type']" position="after">
+                <xpath expr="/form/notebook/page[@string='Transaction']/field/form/field[@name='ref']" position="after">
                     <field name="period_id"/>
                 </xpath>
             </field>
@@ -235,9 +251,19 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='partner_id']" position="after">
-                    <field name="partner_bank_id"/>
-                </xpath>
+                <data>
+                    <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='partner_id']" position="after">
+                        <field name="partner_bank_id"/>
+                    </xpath>
+                    <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+                        <field name="invoice_id"/>
+                        <field name="reconcile_id"/>
+                    </xpath>
+                    <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='amount']" position="after">
+                        <field name="invoice_id"/>
+                        <field name="reconcile_id"/>
+                    </xpath>
+                </data>
             </field>
         </record>
         <record id="view_banking_bank_statement_form_6" model="ir.ui.view">
@@ -252,6 +278,7 @@
             </field>
         </record>
 
+<<<<<<< TREE
         <!-- Reset trigger on button_confirm to the trigger code in this module -->
         <record id="view_banking_bank_statement_form_7" model="ir.ui.view">
             <field name="name">account.bank.statement.form.banking-7</field>
@@ -264,21 +291,44 @@
                 </button>
             </field>
         </record>
+=======
+        <!-- Make buttons on payment order sensitive for extra states,
+             restore wizard functionality when making payments
+          -->
+>>>>>>> MERGE-SOURCE
 
-        <!-- Make buttons on payment order sensitive for extra states -->
         <record id="view_banking_payment_order_form_1" model="ir.ui.view">
             <field name="name">account.payment.order.form.banking-1</field>
             <field name="inherit_id" ref="account_payment.view_payment_order_form" />
             <field name="model">payment.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/button[@string='Select Invoices to Pay']"
-                    position="replace">
-                    <button name="%(account_payment.wizard_populate_payment)s"
-                        colspan="2" type="action" states="draft,open"
-                        string="Select Invoices to Pay"
-                        />
-                </xpath>
+                <data>
+                    <xpath expr="/form/group/button[@string='Select Invoices to Pay']"
+                           position="replace">
+                        <button colspan="2" name="%(account_payment.action_create_payment_order)s"
+                                string="Select Invoices to Pay" type="action" 
+				attrs="{'invisible':[('state','!=','draft')]}"
+                                icon="gtk-find"
+                                />
+                    </xpath>
+                    <xpath expr="/form/group/button[@string='Make Payments']"
+                           position="replace">
+                        <button name="launch_wizard" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
+                        <newline/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        <record id="view_banking_payment_order_tree_1" model="ir.ui.view">
+            <field name="name">account.payment.order.tree.banking-1</field>
+            <field name="inherit_id" ref="account_payment.view_payment_order_tree" />
+            <field name="model">payment.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+		<button string="Make Payments" position="replace">
+                    <button name="launch_wizard" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
+                </button>
             </field>
         </record>
 
@@ -353,7 +403,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="replace">
-                    <field name="acc_number" on_change="onchange_acc_number(acc_number, parent.id, country_id)" />
+                    <field name="acc_number" on_change="onchange_acc_number(acc_number, parent.id, country_id)" select="1" />
                 </xpath>
             </field>
         </record>
@@ -371,5 +421,43 @@
             </field>
         </record>
 
+        <!-- Insert payment_mode.type -->
+        <record id="view_payment_mode_form_inherit" model="ir.ui.view">
+            <field name="name">payment.mode.form.inherit</field>
+            <field name="model">payment.mode</field>
+            <field name="inherit_id" ref="account_payment.view_payment_mode_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="type"/>
+                </field>
+            </field>
+        </record>
+        <record id="view_payment_mode_tree_inherit" model="ir.ui.view">
+            <field name="name">payment.mode.tree.inherit</field>
+            <field name="model">payment.mode</field>
+            <field name="inherit_id" ref="account_payment.view_payment_mode_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="type"/>
+                </field>
+            </field>
+        </record>
+
+	<!-- basic view for payment mode type -->
+        <record model="ir.ui.view" id="view_payment_mode_type_form">
+            <field name="name">view.payment.mode.type.form</field>
+            <field name="model">payment.mode.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+		    <field name="name" />
+		    <field name="code" />
+		    <field name="suitable_bank_types"/>
+		    <field name="ir_model_id"/>
+                </form>
+            </field>
+        </record>
     </data>
 </openerp>

=== modified file 'account_banking/data/account_banking_data.xml'
--- account_banking/data/account_banking_data.xml	2010-12-20 10:58:51 +0000
+++ account_banking/data/account_banking_data.xml	2011-11-23 10:40:16 +0000
@@ -17,14 +17,14 @@
              Ratio: one can have bank accounts in foreign banks. Foreign
              addresses not automatically involve international banking.
         -->
-        <record id="bank_normal_field_contry" model="res.partner.bank.type.field">
+        <record id="base.bank_normal_field_contry" model="res.partner.bank.type.field">
             <field name="name">country_id</field>
             <field name="bank_type_id" ref="base.bank_normal"/>
             <field eval="False" name="required"/>
             <field eval="False" name="readonly"/>
         </record>
         <!-- Add manual bank transfer as default payment option -->
-        <record model="payment.type" id="account_banking.manual_bank_tranfer">
+        <record model="payment.mode.type" id="account_banking.manual_bank_tranfer">
             <field name="name">Manual Bank Transfer</field>
             <field name="code">BANKMAN</field>
             <field name="suitable_bank_types"

=== modified file 'account_banking/security/ir.model.access.csv'
--- account_banking/security/ir.model.access.csv	2010-12-20 10:58:51 +0000
+++ account_banking/security/ir.model.access.csv	2011-11-23 10:40:16 +0000
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_banking_settings","account.banking.account.settings","model_account_banking_account_settings","account.group_account_manager",1,1,1,1
+"access_account_banking_settings_user","account.banking.account.settings user","model_account_banking_account_settings","account.group_account_user",1,0,0,0
 "access_account_banking_import","account.bankimport","model_account_banking_imported_file","account.group_account_user",1,1,1,1
+"access_payment_mode_type","payment.mode.type","model_payment_mode_type","account_payment.group_account_payment",1,1,1,1

=== modified file 'account_banking/wizard/__init__.py'
--- account_banking/wizard/__init__.py	2011-02-12 13:37:09 +0000
+++ account_banking/wizard/__init__.py	2011-11-23 10:40:16 +0000
@@ -20,6 +20,6 @@
 ##############################################################################
 import bank_import
 import bank_payment_manual
-import wizard_payment_order
+import account_payment_order
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_banking/wizard/account_payment_order.py'
--- account_banking/wizard/account_payment_order.py	1970-01-01 00:00:00 +0000
+++ account_banking/wizard/account_payment_order.py	2011-11-23 10:40:16 +0000
@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import datetime
+from osv import osv
+from account_banking.struct import struct
+from account_banking.parsers import convert
+
+today = datetime.date.today
+
+def str2date(str):
+    dt = convert.str2date(str, '%Y-%m-%d')
+    return datetime.date(dt.year, dt.month, dt.day)
+
+class payment_order_create(osv.osv_memory):
+    _inherit = 'payment.order.create'
+
+    def create_payment(self, cr, uid, ids, context=None):
+        '''
+        This method is a slightly modified version of the existing method on this
+        model in account_payment.
+        - pass the payment mode to line2bank()
+        - allow invoices to create influence on the payment process: not only 'Free'
+        references are allowed, but others as well
+        - check date_to_pay is not in the past.
+        '''
+
+        order_obj = self.pool.get('payment.order')
+        line_obj = self.pool.get('account.move.line')
+        payment_obj = self.pool.get('payment.line')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        line_ids = data['entries']
+        if not line_ids:
+            return {'type': 'ir.actions.act_window_close'}
+
+        payment = order_obj.browse(cr, uid, context['active_id'], context=context)
+        ### account banking
+        # t = None
+        # line2bank = line_obj.line2bank(cr, uid, line_ids, t, context)
+        line2bank = line_obj.line2bank(cr, uid, line_ids, payment.mode.id, context)
+        _today = today()
+        ### end account banking
+
+        ## Finally populate the current payment with new lines:
+        for line in line_obj.browse(cr, uid, line_ids, context=context):
+            if payment.date_prefered == "now":
+                #no payment date => immediate payment
+                date_to_pay = False
+            elif payment.date_prefered == 'due':
+                ### account_banking
+                # date_to_pay = line.date_maturity
+                date_to_pay = line.date_maturity and \
+                           str2date(line.date_maturity) > _today\
+                           and line.date_maturity or False
+                ### end account banking
+            elif payment.date_prefered == 'fixed':
+                ### account_banking
+                # date_to_pay = payment.date_planned
+                date_to_pay = payment.date_planned and \
+                           str2date(payment.date_planned) > _today\
+                           and payment.date_planned or False
+                ### end account banking
+
+            ### account_banking
+            state = communication2 = False
+            communication = line.ref or '/'
+            if line.invoice:
+                if line.invoice.reference_type == 'structured':
+                    state = 'structured'
+                    communication = line.invoice.reference
+                else:
+                    state = 'normal'
+                    communication2 = line.invoice.reference
+            ### end account_banking
+
+            payment_obj.create(cr, uid,{
+                'move_line_id': line.id,
+                'amount_currency': line.amount_to_pay,
+                'bank_id': line2bank.get(line.id),
+                'order_id': payment.id,
+                'partner_id': line.partner_id and line.partner_id.id or False,
+                ### account banking
+                # 'communication': line.ref or '/'
+                'communication': communication,
+                'communication2': communication2,
+                'state': state,
+                ### end account banking
+                'date': date_to_pay,
+                'currency': line.invoice and line.invoice.currency_id.id or False,
+                }, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+payment_order_create()

=== modified file 'account_banking/wizard/bank_import.py'
--- account_banking/wizard/bank_import.py	2011-11-07 22:23:48 +0000
+++ account_banking/wizard/bank_import.py	2011-11-23 10:40:16 +0000
@@ -28,9 +28,8 @@
 The parsing is done in the parser modules. Every parser module is required to
 use parser.models as a mean of communication with the business logic.
 '''
-import pooler
+from osv import osv, fields
 import time
-import wizard
 import netsvc
 import base64
 import datetime
@@ -41,6 +40,7 @@
 from account_banking.struct import struct
 from account_banking import sepa
 from banktools import *
+import decimal_precision as dp
 
 bt = models.mem_bank_transaction
 
@@ -55,6 +55,7 @@
     '''
     return models.parser_type.get_parser_types()
 
+<<<<<<< TREE
 class banking_import(wizard.interface):
     '''
     Wizard to import bank statements. Generic code, parsing is done in the
@@ -130,10 +131,14 @@
 
     def _fill_results(self, *args, **kwargs):
         return {'log': self._log}
+=======
+class banking_import(osv.osv_memory):
+    _name = 'account.banking.bank.import'
+>>>>>>> MERGE-SOURCE
 
     def _get_move_info(self, cursor, uid, move_line, partner_bank_id=False,
                        partial=False):
-        reconcile_obj = self.pool.get('account.bank.statement.reconcile')
+        reconcile_obj = self.pool.get('account.move.reconcile')
         type_map = {
             'out_invoice': 'customer',
             'in_invoice': 'supplier',
@@ -153,7 +158,14 @@
 
         if partial:
             move_line.reconcile_partial_id = reconcile_obj.create(
+<<<<<<< TREE
                 cursor, uid, {'line_partial_ids': [(6, 0, [move_line.id])]}
+=======
+                cursor, uid, {
+                    'type': 'auto',
+                    'line_partial_ids': [(4, 0, [move_line.id])]
+                    }
+>>>>>>> MERGE-SOURCE
             )
         else:
             if move_line.reconcile_partial_id:
@@ -164,7 +176,12 @@
                 partial_ids = []
             move_line.reconcile_id = reconcile_obj.create(
                 cursor, uid, {
+<<<<<<< TREE
                     'line_ids': [
+=======
+                    'type': 'auto',
+                    'line_id': [
+>>>>>>> MERGE-SOURCE
                         (4, x, False) for x in [move_line.id] + partial_ids
                     ],
                     'line_partial_ids': [
@@ -228,12 +245,13 @@
         return []
 
     def _link_payment(self, cursor, uid, trans, payment_lines,
-                      partner_ids, bank_account_ids, log):
+                      partner_ids, bank_account_ids, log, linked_payments):
         '''
         Find the payment order belonging to this reference - if there is one
         When sending payments, the returned bank info should be identical to
         ours.
         '''
+<<<<<<< TREE
         # TODO:
         #    1. Not sure what side effects are created when payments are done
         #       for credited customer invoices, which will be matched later on
@@ -247,6 +265,11 @@
         # intertwined. Ignoring this causes double processing of the same
         # payment line.
 
+=======
+        # TODO: Not sure what side effects are created when payments are done
+        # for credited customer invoices, which will be matched later on too.
+        digits = dp.get_precision('Account')(cursor)[1]
+>>>>>>> MERGE-SOURCE
         candidates = [x for x in payment_lines
             if x.id not in self.__linked_payments and
                (not self._cached(x.move_line_id)) and 
@@ -260,6 +283,7 @@
             ]
         if len(candidates) == 1:
             candidate = candidates[0]
+<<<<<<< TREE
             self.__linked_payments[candidate.id] = True
             self._cache(candidate.move_line_id)
             payment_line_obj = self.pool.get('payment.line')
@@ -271,12 +295,21 @@
                 cursor, uid, candidate.move_line_id,
                 partner_bank_id=\
                     bank_account_ids and bank_account_ids[0].id or False
+=======
+            # Check cache to prevent multiple matching of a single payment
+            if candidate.id not in linked_payments:
+                linked_payments[candidate.id] = True
+                payment_line_obj = self.pool.get('payment.line')
+                payment_line_obj.write(cursor, uid, [candidate.id], {
+                    'export_state': 'done',
+                    'date_done': trans.effective_date.strftime('%Y-%m-%d')}
+>>>>>>> MERGE-SOURCE
                 )
 
         return False
 
     def _link_invoice(self, cursor, uid, trans, move_lines,
-                      partner_ids, bank_account_ids, log):
+                      partner_ids, bank_account_ids, log, linked_invoices):
         '''
         Find the invoice belonging to this reference - if there is one
         Use the sales journal to check.
@@ -360,6 +393,22 @@
 
             return False
 
+<<<<<<< TREE
+=======
+        def _cached(move_line):
+            '''Check if the move_line has been cached'''
+            return move_line.id in linked_invoices
+
+        def _cache(move_line, remaining=0.0):
+            '''Cache the move_line'''
+            linked_invoices[move_line.id] = remaining
+
+        def _remaining(move_line):
+            '''Return the remaining amount for a previously matched move_line
+            '''
+            return linked_invoices[move_line.id]
+
+>>>>>>> MERGE-SOURCE
         def _sign(invoice):
             '''Return the direction of an invoice'''
             return {'in_invoice': -1, 
@@ -368,7 +417,7 @@
                     'out_refund': -1
                    }[invoice.type]
 
-        digits = int(config['price_accuracy'])
+        digits = dp.get_precision('Account')(cursor)[1]
         partial = False
 
         # Search invoice on partner
@@ -465,8 +514,6 @@
                                                        for x in best or candidates
                                                       ])
                           })
-                    self.__multiple_matches.append((trans, best or
-                                                    candidates))
                 move_line = False
                 partial = False
 
@@ -543,7 +590,7 @@
         if not account_info.costs_account_id:
             return []
 
-        digits = int(config['price_accuracy'])
+        digits = dp.get_precision('Account')(cursor)[1]
         amount = round(abs(trans.transferred_amount), digits)
         # Make sure to be able to pinpoint our costs invoice for later
         # matching
@@ -591,14 +638,10 @@
                 invoice_line = invoice_lines,
             ))
             invoice = invoice_obj.browse(cursor, uid, invoice_id)
-            # Set number
-            invoice.action_number(cursor, uid, [invoice_id])
-            # Create moves
-            invoice.action_move_create(cursor, uid, [invoice_id])
             # Create workflow
+            invoice_obj.button_compute(cursor, uid, [invoice_id], 
+                                       {'type': 'in_invoice'}, set_total=True)
             wf_service = netsvc.LocalService('workflow')
-            res = wf_service.trg_create(uid, 'account.invoice', invoice.id,
-                                        cursor)
             # Move to state 'open'
             wf_service.trg_validate(uid, 'account.invoice', invoice.id,
                                     'invoice_open', cursor)
@@ -606,17 +649,16 @@
         # return move_lines to mix with the rest
         return [x for x in invoice.move_id.line_id if x.account_id.reconcile]
 
-    def _import_statements_file(self, cursor, uid, data, context):
+    def import_statements_file(self, cursor, uid, ids, context):
         '''
         Import bank statements / bank transactions file.
         This method represents the business logic, the parser modules
         represent the decoding logic.
         '''
-        form = data['form']
-        statements_file = form['file']
+        banking_import = self.browse(cursor, uid, ids, context)[0]
+        statements_file = banking_import.file
         data = base64.decodestring(statements_file)
 
-        self.pool = pooler.get_pool(cursor.dbname)
         company_obj = self.pool.get('res.company')
         user_obj = self.pool.get('res.user')
         partner_obj = self.pool.get('res.partner')
@@ -632,28 +674,24 @@
         digits = int(config['price_accuracy'])
 
         # get the parser to parse the file
-        parser_code = form['parser']
+        parser_code = banking_import.parser
         parser = models.create_parser(parser_code)
         if not parser:
-            raise wizard.except_wizard(
+            raise osv.except_osv(
                 _('ERROR!'),
                 _('Unable to import parser %(parser)s. Parser class not found.') %
-                {'parser':parser_code}
+                {'parser': parser_code}
             )
 
         # Get the company
-        company = form['company']
-        if not company:
-            user_data = user_obj.browse(cursor, uid, uid, context)
-        company = company_obj.browse(
-            cursor, uid, company or user_data.company_id.id, context
-        )
+        company = (banking_import.company or
+                   user_obj.browse(cursor, uid, uid, context).company_id)
 
         # Parse the file
         statements = parser.parse(data)
 
         if any([x for x in statements if not x.is_valid()]):
-            raise wizard.except_wizard(
+            raise osv.except_osv(
                 _('ERROR!'),
                 _('The imported statements appear to be invalid! Check your file.')
             )
@@ -682,6 +720,9 @@
         error_accounts = {}
         info = {}
         imported_statement_ids = []
+        linked_payments = {}
+        linked_invoices = {}
+        payment_lines = []
 
         if statements:
             # Get default defaults
@@ -690,7 +731,8 @@
 
             # Get interesting journals once
             journal_ids = journal_obj.search(cursor, uid, [
-                ('type', 'in', ('sale','purchase')),
+                ('type', 'in', ('sale','purchase',
+                                'purchase_refund','sale_refund')),
                 ('company_id', '=', company.id),
             ])
             # Get all unreconciled moves predating the last statement in one big
@@ -718,6 +760,7 @@
                                  "o.state = 'sent' AND "
                                  "l.date_done IS NULL"
                           )
+<<<<<<< TREE
             line_ids = [x[0] for x in cursor.fetchall()]
             if line_ids:
                 # Get payment_orders and calculated total amounts as well in
@@ -740,6 +783,11 @@
                          order_totals.keys()
                         ))
                     ]
+=======
+            payment_line_ids = [x[0] for x in cursor.fetchall()]
+            if payment_line_ids:
+                payment_lines = payment_line_obj.browse(cursor, uid, payment_line_ids)
+>>>>>>> MERGE-SOURCE
 
         for statement in statements:
             if statement.local_account in error_accounts:
@@ -749,7 +797,7 @@
                 continue
 
             # Create fallback currency code
-            currency_code = statement.local_currency or company.currency_id.code
+            currency_code = statement.local_currency or company.currency_id.name
 
             # Check cache for account info/currency
             if statement.local_account in info and \
@@ -781,7 +829,7 @@
                     continue
 
                 # Get required currency code
-                currency_code = account_info.currency_id.code
+                currency_code = account_info.currency_id.name
 
                 # Cache results
                 if not statement.local_account in info:
@@ -793,7 +841,7 @@
 
             # Final check: no coercion of currencies!
             if statement.local_currency \
-               and account_info.currency_id.code != statement.local_currency:
+               and account_info.currency_id.name != statement.local_currency:
                 # TODO: convert currencies?
                 results.log.append(
                     _('Statement %(statement_id)s for account %(bank_account)s' 
@@ -970,7 +1018,7 @@
                     move_info = self._link_payment(
                         cursor, uid, transaction,
                         payment_lines, partner_ids,
-                        partner_banks, results.log
+                        partner_banks, results.log, linked_payments,
                         )
 
                 # Second guess, invoice -> may split transaction, so beware
@@ -980,7 +1028,7 @@
                     # these, and invoice matching still has to be done.
                     move_info, remainder = self._link_invoice(
                         cursor, uid, transaction, move_lines, partner_ids,
-                        partner_banks, results.log
+                        partner_banks, results.log, linked_invoices,
                         )
                     if remainder:
                         injected.append(remainder)
@@ -1087,107 +1135,71 @@
         state = results.error_cnt and 'error' or 'ready'
         statement_file_obj.write(cursor, uid, import_id, dict(
             state = state, log = text_log,
-        ))
-        if results.error_cnt or not imported_statement_ids:
-            self._nextstate = 'view_error'
-        else:
-            self._nextstate = 'view_statements'
-        self._import_id = import_id
-        self._log = text_log
-        self._statement_ids = imported_statement_ids
-        return {}
-
-    def _action_open_window(self, cursor, uid, data, context):
-        '''
-        Open a window with the resulting bank statements
-        '''
-        # TODO: this needs fiddling. The resulting window is informative,
-        # but not very usefull...
-        module_obj = self.pool.get('ir.model.data')
-        action_obj = self.pool.get('ir.actions.act_window')
-        result = module_obj._get_id(
-            cursor, uid, 'account', 'action_bank_statement_tree'
-        )
-        id = module_obj.read(cursor, uid, [result], ['res_id'])[0]['res_id']
-        result = action_obj.read(cursor, uid, [id])[0]
-        result['context'] = str({'banking_id': self._import_id})
-        return result
-
-    def _action_open_import(self, cursor, uid, data, context):
-        '''
-        Open a window with the resulting import in error
-        '''
-        return dict(
-            view_type = 'form',
-            view_mode = 'form,tree',
-            res_model = 'account.banking.imported.file',
-            view_id = False,
-            type = 'ir.actions.act_window',
-            res_id = self._import_id
-        )
-
-    def _check_next_state(self, cursor, uid, data, context):
-        return self._nextstate
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {
-                'type' : 'form',
-                'arch' : import_form,
-                'fields': import_fields,
-                'state': [('end', '_Cancel', 'gtk-cancel'),
-                          ('import', '_Ok', 'gtk-ok'),
-                         ]
-            }
-        },
-        'import': {
-            'actions': [_import_statements_file],
-            'result': {
-                'type': 'choice',
-                'next_state': _check_next_state,
-            }
-        },
-        'view_statements' : {
-            'actions': [_fill_results],
-            'result': {
-                'type': 'form',
-                'arch': result_form,
-                'fields': result_fields,
-                'state': [('end', '_Close', 'gtk-close'),
-                          ('open_statements', '_View Statements', 'gtk-ok'),
-                         ]
-            }
-        },
-        'view_error': {
-            'actions': [_fill_results],
-            'result': {
-                'type': 'form',
-                'arch': result_form,
-                'fields': result_fields,
-                'state': [('end', '_Close', 'gtk-close'),
-                          ('open_import', '_View Imported File', 'gtk-ok'),
-                         ]
-            }
-        },
-        'open_import': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _action_open_import,
-                'state': 'end'
-            }
-        },
-        'open_statements': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _action_open_window,
-                'state': 'end'
-            }
-        },
-    }
-
-banking_import('account_banking.banking_import')
+            ), context)
+        if not imported_statement_ids:
+            # file state can be 'ready' while import state is 'error'
+            state = 'error'
+        self.write(cursor, uid, [ids[0]], dict(
+                import_id = import_id, log = text_log, state = state,
+                statement_ids = [[6, 0, imported_statement_ids]],
+                ), context)
+        return {
+            'name': _('Import Bank Transactions File'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': False,
+            'res_model': self._name,
+            'domain': [],
+            'context': dict(context, active_ids=ids),
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'res_id': ids[0] or False,
+        }
+
+    _columns = {
+        'company': fields.many2one(
+            'res.company', 'Company', required=True,
+            states={
+                'ready': [('readonly', True)],
+                'error': [('readonly', True)],
+                },
+            ),
+        'file': fields.binary(
+            'Statements File', required=True,
+            help = ('The Transactions File to import. Please note that while it is '
+            'perfectly safe to reload the same file multiple times or to load in '
+            'timeframe overlapping statements files, there are formats that may '
+            'introduce different sequencing, which may create double entries.\n\n'
+            'To stay on the safe side, always load bank statements files using the '
+            'same format.'),
+            states={
+                'ready': [('readonly', True)],
+                'error': [('readonly', True)],
+                },
+            ),
+        'parser': fields.selection(
+            parser_types, 'File Format', required=True,
+            states={
+                'ready': [('readonly', True)],
+                'error': [('readonly', True)],
+                },
+            ),
+        'log': fields.text('Log', readonly=True),
+        'state': fields.selection(
+            [('init', 'init'), ('ready', 'ready'),
+             ('error', 'error')],
+            'State', readonly=True),
+        'import_id': fields.many2one(
+            'account.banking.imported.file', 'Import File'),
+        # osv_memory does not seem to support one2many
+        'statement_ids': fields.many2many(
+            'account.bank.statement', 'rel_wiz_statements', 'wizard_id',
+            'statement_id', 'Imported Bank Statements'),
+        }
+
+    _defaults = {
+        'state': 'init',
+        }
+banking_import()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_banking/wizard/bank_import_view.xml'
--- account_banking/wizard/bank_import_view.xml	1970-01-01 00:00:00 +0000
+++ account_banking/wizard/bank_import_view.xml	2011-11-23 10:40:16 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_banking_import" model="ir.ui.view">
+            <field name="name">account.banking.bank.import</field>
+            <field name="model">account.banking.bank.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+		<form string="Import Bank Transactions File">
+		    <group colspan="4">
+			<separator colspan="4" string="Select the processing details:"/>
+			<field name="company" colspan="1"/>
+			<field name="file"/>
+			<newline />
+			<field name="parser"/>
+			<field name="state" invisible="1"/>
+		    </group>
+		    <group colspan="4" states="ready,error">
+			<separator colspan="4" string="Results:"/>
+			<field name="log" colspan="4" nolabel="1" width="500"/>
+		    </group>
+		    <group colspan="4" states="ready">
+			<field name="statement_ids" colspan="4" nolabel="1"/>
+		    </group>
+		    <group colspan="2" states="init">
+			<button icon="gtk-cancel"
+				special="cancel"
+				string="Cancel"/>
+			<button icon="gtk-ok"
+				string="Import" 
+				name="import_statements_file"
+				type="object"/>
+		    </group>
+		    <button icon="gtk-close"
+			    special="cancel"
+			    string="Close"
+			    states="ready,error"/>
+		</form>
+	    </field>
+        </record>
+
+        <record id="wizard_account_banking_import_file" model="ir.actions.act_window">
+            <field name="name">Import Bank Statements File</field>
+	    <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.banking.bank.import</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_banking_import"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>

=== modified file 'account_banking/wizard/banktools.py'
--- account_banking/wizard/banktools.py	2011-04-27 11:42:52 +0000
+++ account_banking/wizard/banktools.py	2011-11-23 10:40:16 +0000
@@ -216,12 +216,12 @@
     # Find matching journal for currency
     journal_obj = pool.get('account.journal')
     journal_ids = journal_obj.search(cursor, uid, [
-        ('type', '=', 'cash'),
-        ('currency', '=', currency or company.currency_id.code)
+        ('type', '=', 'bank'),
+        ('currency', '=', currency or company.currency_id.name)
     ])
-    if not journal_ids and currency == company.currency_id.code:
+    if not journal_ids and currency == company.currency_id.name:
         journal_ids = journal_obj.search(cursor, uid, [
-            ('type', '=', 'cash'), ('currency', '=', False)
+            ('type', '=', 'bank'), ('currency', '=', False)
         ])
     if journal_ids:
         criteria.append(('journal_id', 'in', journal_ids))
@@ -302,9 +302,9 @@
     else:
         info = struct(name=name, code=code)
 
-    if info.code and ((not online) or not bank_id):
+    if not online or not bank_id:
         bank_id = bank_obj.create(cursor, uid, dict(
-            code = info.code,
+            code = info.code or 'UNKNOW',
             name = info.name or _('Unknown Bank'),
             country = country_id,
             bic = bic,
@@ -341,12 +341,18 @@
             cursor, uid, partner_id).country
         country_code = country.code
         country_id = country.id
-    elif iban.valid:
-        country_ids = country_obj.search(cursor, uid,
-                                         [('code', '=', iban.countrycode)]
-                                        )
+    else:
+        if iban.valid:
+            country_ids = country_obj.search(cursor, uid,
+                                             [('code', '=', iban.countrycode)]
+                                             )
+        else:
+            country_ids = country_obj.search(cursor, uid,
+                                             [('code', '=', country_code)]
+                                             )
         country_id = country_ids[0]
     
+    account_info = False
     if not iban.valid:
         # No, try to convert to IBAN
         values.state = 'bank'
@@ -362,9 +368,11 @@
                 bic = account_info.bic
 
     if bic:
-        values.bank_id = get_or_create_bank(pool, cursor, uid, bic)
+        values.bank = get_or_create_bank(pool, cursor, uid, bic)[0]
 
-    elif bankcode:
+    else:
+        if not bankcode:
+            bankcode = "UNKNOW"
         # Try to link bank
         bank_obj = pool.get('res.bank')
         bank_ids = bank_obj.search(cursor, uid, [
@@ -372,10 +380,10 @@
         ])
         if bank_ids:
             # Check BIC on existing banks
-            values.bank_id = bank_ids[0]
-            bank = bank_obj.browse(cursor, uid, values.bank_id)
+            values.bank = bank_ids[0]
+            bank = bank_obj.browse(cursor, uid, values.bank)
             if not bank.bic:
-                bank_obj.write(cursor, uid, values.bank_id, dict(bic=bic))
+                bank_obj.write(cursor, uid, values.bank, dict(bic=bic))
         else:
             # New bank - create
             res = struct(country_id=country_id)
@@ -389,7 +397,7 @@
                 res.code = bankcode
                 res.name = _('Unknown Bank')
 
-            values.bank_id = bank_obj.create(cursor, uid, res)
+            values.bank = bank_obj.create(cursor, uid, res)
 
     # Create bank account and return
     return pool.get('res.partner.bank').create(cursor, uid, values)

=== removed file 'account_banking/wizard/wizard_payment_order.py'
--- account_banking/wizard/wizard_payment_order.py	2011-02-13 09:28:59 +0000
+++ account_banking/wizard/wizard_payment_order.py	1970-01-01 00:00:00 +0000
@@ -1,212 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) EduSense BV (<http://www.edusense.nl>).
-#    All Rights Reserved.
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import datetime
-import wizard
-import pooler
-from tools.misc import UpdateableStr
-from tools.translate import _
-from account_banking.struct import struct
-from account_banking.parsers import convert
-
-__doc__ = '''
-This module is a slightly modified version of the identical named payment
-order wizard in account_payment. The rationale for this bulk copy is the
-inability to inherit wizards in OpenERP versions prior to version 6.
-The modifications in this wizard allows invoices to create influence on the
-payment process: not only 'Free' references are allowed, but others as well.
-
-In order to allow further projects based on account_banking to inherit from
-this wizard, the complete wizard is made object oriented, as is should have
-been from the start.
-'''
-
-today = datetime.date.today
-
-def str2date(str):
-    dt = convert.str2date(str, '%Y-%m-%d')
-    return datetime.date(dt.year, dt.month, dt.day)
-
-class wizard_payment_order(wizard.interface):
-    '''
-    Create a payment object with lines corresponding to the account move line
-    to pay according to the date and the mode provided by the user.
-    Hypothesis:
-    - Small number of non-reconcilied move line , payment mode and bank account type,
-    - Big number of partner and bank account.
-
-    If a type is given, unsuitable account move lines are ignored.
-    '''
-
-    FORM = UpdateableStr()
-    FIELDS = {
-        'entries': {
-            'string':'Entries',
-            'type':'many2many',
-            'relation': 'account.move.line',
-        },
-    }
-    field_duedate = {
-        'duedate': {
-            'string': 'Due Date',
-            'type': 'date',
-            'required': True,
-            'default': lambda *a: convert.date2str(today()),
-        },
-    }
-    arch_duedate='''<?xml version="1.0"?>
-    <form string="Search Payment lines">
-        <field name="duedate" />
-    </form>'''
-
-
-    def search_entries(self, cursor, uid, data, context):
-        '''
-        Search for invoices that can be paid
-        '''
-        search_due_date = data['form']['duedate']
-
-        pool = pooler.get_pool(cursor.dbname)
-        order_obj = pool.get('payment.order')
-        move_line_obj = pool.get('account.move.line')
-
-        payment = order_obj.browse(cursor, uid, data['id'], context=context)
-        if payment.mode:
-            ctx = '''context="{'journal_id': %d}"''' % payment.mode.journal.id
-        else:
-            ctx = ''
-
-        # Search account.move.line to pay:
-        domain = [
-            ('reconcile_id', '=', False),
-            ('account_id.type', '=', 'payable'),
-            ('amount_to_pay', '>', 0),
-            '|', ('date_maturity','<=',search_due_date),
-                 ('date_maturity','=',False)
-        ]
-        line_ids = move_line_obj.search(cursor, uid, domain, context=context)
-        self.FORM.string = '''<?xml version="1.0"?>
-    <form string="Populate Payment:">
-        <field name="entries" colspan="4" height="300" width="800" nolabel="1"
-            domain="[('id', 'in', [%s])]" %s
-            />
-    </form>''' % (','.join([str(x) for x in line_ids]), ctx)
-        return {}
-
-    def get_communication(self, line):
-        '''
-        Method to fill the communication and communication2 lines of a payment
-        line. Returns (state, comm1, comm2).
-        '''
-        if line.invoice.reference_type == 'structured':
-            return ('structured', line.invoice.reference, '')
-        return ('normal', '', line.invoice.reference)
-
-    def create_payment(self, cursor, uid, data, context):
-        '''
-        Create payment lines from the data of previously created payable
-        invoices
-        '''
-        ids = data['form']['entries'][0][2]
-        if not ids:
-            return {}
-
-        pool = pooler.get_pool(cursor.dbname)
-        order_obj = pool.get('payment.order')
-        move_line_obj = pool.get('account.move.line')
-        payment_line_obj = pool.get('payment.line')
-
-        payment = order_obj.browse(cursor, uid, data['id'], context=context)
-        ptype = payment.mode and payment.mode.type.id or None
-        line2bank = move_line_obj.line2bank(cursor, uid, ids, ptype, context)
-        _today = today()
-        retval = struct()
-
-        # Populate the current payment with new lines
-        for line in move_line_obj.browse(cursor, uid, ids, context=context):
-            if payment.date_prefered == 'now':
-                # no payment date means immediate payment
-                date_to_pay = False
-            elif payment.date_prefered == 'due':
-                date_to_pay = line.date_maturity and \
-                           str2date(line.date_maturity) > _today\
-                           and line.date_maturity or False
-            elif payment.date_prefered == 'fixed':
-                date_to_pay = payment.date_planned and \
-                           str2date(payment.date_planned) > _today\
-                           and payment.date_planned or False
-            values = struct(
-                move_line_id = line.id,
-                amount_currency = line.amount_to_pay,
-                bank_id = line2bank.get(line.id),
-                order_id = payment.id,
-                partner_id = line.partner_id and line.partner_id.id or False,
-                date = date_to_pay,
-                currency = False,
-            )
-            if line.invoice:
-                values.state, values.communication, values.communication2 = \
-                        self.get_communication(line)
-                values.currency = line.invoice.currency_id.id,
-            payment_line_obj.create(cursor, uid, values, context=context)
-
-        return {}
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': arch_duedate,
-                'fields': field_duedate,
-                'state': [
-                    ('end','_Cancel'),
-                    ('search','_Search', '', True)
-                ]
-            },
-         },
-        'search': {
-            'actions': [search_entries],
-            'result': {
-                'type': 'form',
-                'arch': FORM,
-                'fields': FIELDS,
-                'state': [
-                    ('end','_Cancel'),
-                    ('create','_Add to payment order', '', True)
-                ]
-            },
-         },
-        'create': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': create_payment,
-                'state': 'end'
-            }
-        },
-    }
-
-wizard_payment_order('account_payment.populate_payment')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_banking_fi_patu/__terp__.py'
--- account_banking_fi_patu/__terp__.py	2011-11-08 13:10:34 +0000
+++ account_banking_fi_patu/__terp__.py	2011-11-23 10:40:16 +0000
@@ -33,9 +33,8 @@
     'category': 'Account Banking',
     'depends': ['account_banking'],
     'description': '''
-    Module to import Finnish PATU format transation files.
-
-    This modules contains no logic, just an import filter for account_banking.
+Do not install this module. This branch has been replaced by lp:banking-addons/6.0
+See https://launchpad.net/banking-addons
     ''',
     'active': False,
     'installable': True,

=== modified file 'account_banking_nl_abnamro/__openerp__.py'
--- account_banking_nl_abnamro/__openerp__.py	2011-04-26 21:00:12 +0000
+++ account_banking_nl_abnamro/__openerp__.py	2011-11-23 10:40:16 +0000
@@ -39,14 +39,8 @@
     ],
     'demo_xml': [],
     'description': '''
-Import filter for abnamro (NL) bank transaction files (txt/tab format).
-
-No formal specifications of the file layout are released by abnamro. You can
-help improve the performance of this import filter on
-https://launchpad.net/account-banking.
-
-Imported bank transfers are organized in statements covering periods of one week,
-even if the imported files cover a different period.
+Do not install this module. This branch has been replaced by lp:banking-addons/6.0
+See https://launchpad.net/banking-addons
     ''',
     'active': False,
     'installable': True,

=== modified file 'account_banking_nl_abnamro/__terp__.py'
--- account_banking_nl_abnamro/__terp__.py	2011-11-08 13:10:34 +0000
+++ account_banking_nl_abnamro/__terp__.py	2011-11-23 10:40:16 +0000
@@ -39,14 +39,8 @@
     ],
     'demo_xml': [],
     'description': '''
-Import filter for abnamro (NL) bank transaction files (txt/tab format).
-
-No formal specifications of the file layout are released by abnamro. You can
-help improve the performance of this import filter on
-https://launchpad.net/account-banking.
-
-Imported bank transfers are organized in statements covering periods of one week,
-even if the imported files cover a different period.
+Do not install this module. This branch has been replaced by lp:banking-addons/6.0
+See https://launchpad.net/banking-addons
     ''',
     'active': False,
     'installable': True,

=== modified file 'account_banking_nl_clieop/__terp__.py'
--- account_banking_nl_clieop/__terp__.py	2011-11-08 13:10:34 +0000
+++ account_banking_nl_clieop/__terp__.py	2011-11-23 10:40:16 +0000
@@ -25,7 +25,11 @@
 ##############################################################################
 {
     'name': 'Account Banking NL ClieOp',
+<<<<<<< TREE
     'version': '0.67',
+=======
+    'version': '0.63',
+>>>>>>> MERGE-SOURCE
     'license': 'GPL-3',
     'author': 'EduSense BV',
     'website': 'http://www.edusense.nl',
@@ -33,17 +37,15 @@
     'depends': ['account_banking'],
     'init_xml': [],
     'update_xml': [
-        #'security/ir.model.access.csv',
         'account_banking_nl_clieop.xml',
-        'account_banking_export_wizard.xml',
+        'wizard/export_clieop_view.xml',
         'data/banking_export_clieop.xml',
+        'security/ir.model.access.csv',
     ],
     'demo_xml': [],
     'description': '''
-    Module to export payment orders in ClieOp format.
-
-    ClieOp format is used by Dutch banks to batch national bank transfers.
-    This module uses the account_banking logic.
+Do not install this module. This branch has been replaced by lp:banking-addons/6.0
+See https://launchpad.net/banking-addons
     ''',
     'active': False,
     'installable': True,

=== removed file 'account_banking_nl_clieop/account_banking_export_wizard.xml'
--- account_banking_nl_clieop/account_banking_export_wizard.xml	2010-01-26 20:55:24 +0000
+++ account_banking_nl_clieop/account_banking_export_wizard.xml	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) EduSense BV <http://www.edusense.nl>
-  All rights reserved.
-  The licence is in the file __terp__.py
--->
-<openerp>
-    <data>
-        <wizard id="wizard_account_banking_export_clieop"
-            string="Export ClieOp File"
-            model="payment.order"
-            name="account_banking_nl_clieop.banking_export_clieop"
-            />
-    </data>
-</openerp>

=== modified file 'account_banking_nl_clieop/account_banking_nl_clieop.py'
--- account_banking_nl_clieop/account_banking_nl_clieop.py	2010-01-26 20:55:24 +0000
+++ account_banking_nl_clieop/account_banking_nl_clieop.py	2011-11-23 10:40:16 +0000
@@ -22,25 +22,19 @@
 from datetime import date
 from tools.translate import _
 
-class payment_order(osv.osv):
-    '''
-    Attach export_clieop wizard to payment order and allow traceability
-    '''
-    _inherit = 'payment.order'
-    def get_wizard(self, type):
-        if type in ['CLIEOPPAY', 'CLIEOPINC', 'CLIEOPSAL']:
-            return self._module, 'wizard_account_banking_export_clieop'
-        return super(payment_order, self).get_wizard(type)
-payment_order()
-
 class clieop_export(osv.osv):
     '''ClieOp3 Export'''
     _name = 'banking.export.clieop'
     _description = __doc__
+    _rec_name = 'identification'
 
     _columns = {
-        'payment_order_ids':
-            fields.text('Payment Orders'),
+        'payment_order_ids': fields.many2many(
+            'payment.order',
+            'account_payment_order_clieop_rel',
+            'banking_export_clieop_id', 'account_order_id',
+            'Payment Orders',
+            readonly=True),
         'testcode':
             fields.selection([('T', _('Yes')), ('P', _('No'))],
                              'Test Run', readonly=True),

=== modified file 'account_banking_nl_clieop/account_banking_nl_clieop.xml'
--- account_banking_nl_clieop/account_banking_nl_clieop.xml	2010-01-28 10:59:35 +0000
+++ account_banking_nl_clieop/account_banking_nl_clieop.xml	2011-11-23 10:40:16 +0000
@@ -14,19 +14,33 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Client Opdrachten Export">
-                    <separator string="General Information" colspan="4" />
-                    <field name="filetype" />
-                    <field name="identification" />
-                    <separator string="ClieOp Information" colspan="4" />
-                    <field name="total_amount" />
-                    <field name="check_no_accounts" />
-                    <field name="no_transactions" />
-                    <separator string="Processing Information" colspan="4" />
-                    <field name="prefered_date" />
-                    <field name="date_generated" />
-                    <field name="testcode" />
-                    <newline />
-                    <field name="file" colspan="4" />
+		    <notebook>
+			<page string="General Information">
+			    <field name="filetype" />
+			    <field name="identification" />
+			    <separator string="ClieOp Information" colspan="4" />
+			    <field name="total_amount" />
+			    <field name="check_no_accounts" />
+			    <field name="no_transactions" />
+			    <separator string="Processing Information" colspan="4" />
+			    <field name="prefered_date" />
+			    <field name="date_generated" />
+			    <field name="testcode" />
+			    <newline />
+			    <field name="file" colspan="4" />
+			</page>
+			<page string="Payment Orders">
+			    <field name="payment_order_ids" colspan="4" nolabel="1">
+				<tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment order">
+				    <field name="reference"/>
+				    <field name="date_created"/>
+				    <field name="date_done"/>
+				    <field name="total"/>
+				    <field name="state"/>
+				</tree>
+			    </field>
+			</page>
+		    </notebook>
                 </form>
             </field>
         </record>
@@ -59,5 +73,14 @@
             sequence="12"
          />
 
+        <!-- Create right menu entry to see generated files -->
+        <act_window name="Generated ClieOp3 Files"
+            domain="[('payment_order_ids', '=', active_id)]"
+            res_model="banking.export.clieop"
+            src_model="payment.order"
+            view_type="form"
+            view_mode="tree,form"
+            id="act_banking_export_clieop_payment_order"/>
+
     </data>
 </openerp>

=== modified file 'account_banking_nl_clieop/data/banking_export_clieop.xml'
--- account_banking_nl_clieop/data/banking_export_clieop.xml	2010-12-20 10:58:51 +0000
+++ account_banking_nl_clieop/data/banking_export_clieop.xml	2011-11-23 10:40:16 +0000
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record model="payment.type" id="account_banking_nl_clieop.export_clieop_inc">
+        <record model="payment.mode.type" id="account_banking_nl_clieop.export_clieop_inc">
             <field name="name">ClieOp3 Direct Debit Batch</field>
             <field name="code">CLIEOPINC</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base_iban.bank_iban'),ref('base.bank_normal'),])]" />
+	    <field name="ir_model_id"
+		ref="account_banking_nl_clieop.model_banking_export_clieop_wizard"/>
         </record>
 
-        <record model="payment.type" id="account_banking_nl_clieop.export_clieop_pay">
+        <record model="payment.mode.type" id="account_banking_nl_clieop.export_clieop_pay">
             <field name="name">ClieOp3 Payment Batch</field>
             <field name="code">CLIEOPPAY</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base_iban.bank_iban'),ref('base.bank_normal'),])]" />
+	    <field name="ir_model_id"
+		ref="account_banking_nl_clieop.model_banking_export_clieop_wizard"/>
         </record>
 
-        <record model="payment.type" id="account_banking_nl_clieop.export_clieop_sal">
+        <record model="payment.mode.type" id="account_banking_nl_clieop.export_clieop_sal">
             <field name="name">ClieOp3 Salary Payment Batch</field>
             <field name="code">CLIEOPSAL</field>
             <field name="suitable_bank_types"
                 eval="[(6,0,[ref('base_iban.bank_iban'),ref('base.bank_normal'),])]" />
+	    <field name="ir_model_id"
+		ref="account_banking_nl_clieop.model_banking_export_clieop_wizard"/>
         </record>
     </data>
 </openerp>

=== added directory 'account_banking_nl_clieop/migrations'
=== added directory 'account_banking_nl_clieop/migrations/0.63'
=== added file 'account_banking_nl_clieop/migrations/0.63/post-fill-ir_model_id.py'
--- account_banking_nl_clieop/migrations/0.63/post-fill-ir_model_id.py	1970-01-01 00:00:00 +0000
+++ account_banking_nl_clieop/migrations/0.63/post-fill-ir_model_id.py	2011-11-23 10:40:16 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Therp BV (<http://therp.nl>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+""" This script covers the migration of the payment wizards from old style to
+new style (osv_memory). It guarantees an easy upgrade for early adopters
+of the 6.0 branch of this OpenERP module. Note that a migration from OpenERP 
+5.0 to OpenERP 6.0 with respect to this module is not covered by this script.
+"""
+
+__name__ = "payment.mode.type:: Add new style payment wizards to existing payment mode types"
+
+def migrate(cr, version):
+    cr.execute ("UPDATE payment_mode_type"
+                " SET ir_model_id = data1.res_id"
+                " FROM ir_model_data data1,"
+                "      ir_model_data data2"
+                " WHERE data2.res_id = payment_mode_type.id"
+                " AND data1.module = 'account_banking_nl_clieop'"
+                " AND data1.model = 'ir.model'"
+                " AND data1.name = 'model_banking_export_clieop_wizard'"
+                " AND data2.module = 'account_banking_nl_clieop'"
+                " AND data2.model = 'payment.mode.type'"
+                " AND data2.name IN ('export_clieop_inc',"
+                "                    'export_clieop_pay',"
+                "                    'export_clieop_sal'"
+                "                   )"
+                )

=== added directory 'account_banking_nl_clieop/security'
=== added file 'account_banking_nl_clieop/security/ir.model.access.csv'
--- account_banking_nl_clieop/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ account_banking_nl_clieop/security/ir.model.access.csv	2011-11-23 10:40:16 +0000
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_banking_export_clieop","banking.export.clieop","model_banking_export_clieop","account_payment.group_account_payment",1,1,1,1

=== modified file 'account_banking_nl_clieop/wizard/clieop.py'
--- account_banking_nl_clieop/wizard/clieop.py	2011-03-10 15:25:05 +0000
+++ account_banking_nl_clieop/wizard/clieop.py	2011-11-23 10:40:16 +0000
@@ -76,7 +76,7 @@
 
     def __init__(self, id='1', seqno=1, duplicate=False):
         super(HeaderRecord, self).__init__()
-        self.sender_id = id
+        self.sender_id = id or ''
         self.file_id = '%02d%02d' % (self.creation_date.day, seqno)
         self.duplicatecode = duplicate and '2' or '1'
 #}}}
@@ -362,7 +362,7 @@
         self.header.variantcode = batch_id and 'C' or 'B'
         self.header.transactiongroup = transactiongroup
         self.header.batch_tracer = batch_tracer
-        self.header.batch_id = batch_id
+        self.header.batch_id = batch_id or ''
         self.header.accountno_sender = rekeningnr
         self.sender.name_sender = sender
         self.sender.preferred_execution_date = execution_date

=== modified file 'account_banking_nl_clieop/wizard/export_clieop.py'
--- account_banking_nl_clieop/wizard/export_clieop.py	2011-02-12 13:37:09 +0000
+++ account_banking_nl_clieop/wizard/export_clieop.py	2011-11-23 10:40:16 +0000
@@ -19,12 +19,11 @@
 #
 ##############################################################################
 
-import wizard
-import pooler
 import base64
 from datetime import datetime, date, timedelta
+from osv import osv, fields
+from tools.translate import _
 from account_banking import sepa
-from tools.translate import _
 import clieop
 
 def strpdate(arg, format='%Y-%m-%d'):
@@ -35,151 +34,131 @@
     '''shortcut'''
     return arg.strftime(format)
 
-class wizard_banking_export_clieop(wizard.interface):
-    form = '''<?xml version="1.0"?>
-<form string="Client Opdrachten Export">
-    <separator colspan="4" string="Processing Details" />
-    <field name="batchtype" />
-    <field name="execution_date" />
-    <field name="test" />
-    <separator colspan="4" string="Reference for further communication" />
-    <field name="reference" colspan="2" />
-    <separator colspan="4" string="Additional message for all transactions" />
-    <field name="fixed_message" />
-</form>'''
-
-    fields = {
-        'reference' : {
-            'string': 'Reference',
-            'type': 'char',
-            'size': 5,
-            'required': False,
-            'help': ('The bank will use this reference in feedback communication '
-                     'to refer to this run. Only five characters are available.'
-                    )
-        },
-        'batchtype': {
-            'string': 'Type',
-            'type': 'selection',
-            'selection': [
+class banking_export_clieop_wizard(osv.osv_memory):
+    _name = 'banking.export.clieop.wizard'
+    _description = 'Client Opdrachten Export'
+    _columns = {
+        'state': fields.selection(
+            [
+                ('create', 'Create'),
+                ('finish', 'Finish')
+                ],
+            'State',
+            readonly=True,
+        ),
+        'reference': fields.char(
+            'Reference', size=5,
+            help=('The bank will use this reference in feedback communication '
+                  'to refer to this run. Only five characters are available.'
+                  ),
+            ),
+        'batchtype': fields.selection(
+            [
                 ('CLIEOPPAY', 'Payments'),
                 ('CLIEOPSAL', 'Salary Payments'),
                 ('CLIEOPINC', 'Direct Debits'),
-            ],
-            'readonly': True,
-        },
-        'execution_date': {
-            'string': 'Execution Date',
-            'type': 'date',
-            'required': False,
-            'help': ('This is the date the file should be processed by the bank. '
-                     'Don\'t choose a date beyond the nearest date in your '
-                     'payments. The latest allowed date is 30 days from now.\n'
-                     'Please keep in mind that banks only execute on working days '
-                     'and typically use a delay of two days between execution date '
-                     'and effective transfer date.'
-                    ),
-        },
-        'test': {
-            'string': 'Test Run',
-            'type': 'boolean',
-            'required': True,
-            'default': True,
-            'help': ('Select this if you want your bank to run a test process '
-                     'rather then execute your orders for real.'
-                    )
-        },
-        'fixed_message': {
-            'string': 'Fixed Message',
-            'type': 'char',
-            'size': 32,
-            'required': False,
-            'default': '',
-            'help': ('A fixed message to apply to all transactions in addition to '
-                     'the individual messages.'
-                    ),
-        },
-    }
-
-    file_form = '''<?xml version="1.0"?>
-<form string="Client Opdrachten Export">
-    <field name="filetype" />
-    <field name="identification" />
-    <field name="total_amount" />
-    <field name="check_no_accounts" />
-    <field name="no_transactions" />
-    <field name="prefered_date" />
-    <field name="testcode" />
-    <newline/>
-    <field name="file" />
-    <field name="log" colspan="4" nolabel="1" />
-</form>'''
-
-    file_fields = {
-        'testcode': {
-            'string': 'Test Run',
-            'type': 'selection',
-            'selection': [('T', _('Yes')), ('P', _('No'))],
-            'required': False,
-            'readonly': True,
-        },
-        'prefered_date': {
-            'string': 'Prefered Processing Date',
-            'type': 'date',
-            'required': False,
-            'readonly': True,
-        },
-        'no_transactions': {
-            'string': 'Number of Transactions',
-            'type': 'int',
-            'required': False,
-            'readonly': True,
-        },
-        'check_no_accounts': {
-            'string': 'Check Number Accounts',
-            'type': 'char',
-            'size': 5,
-            'required': False,
-            'readonly': True,
-        },
-        'total_amount': {
-            'string': 'Total Amount',
-            'type': 'float',
-            'required': False,
-            'readonly': True,
-        },
-        'identification': {
-            'string': 'Identification',
-            'type': 'char',
-            'size': 6,
-            'required': False,
-            'readonly': True,
-        },
-        'filetype': {
-            'string': 'File Type',
-            'type': 'selection',
-            'selection': [
+            ], 'Type', readonly=True,
+            ),
+        'execution_date': fields.date(
+            'Execution Date',
+            help=('This is the date the file should be processed by the bank. '
+                  'Don\'t choose a date beyond the nearest date in your '
+                  'payments. The latest allowed date is 30 days from now.\n'
+                  'Please keep in mind that banks only execute on working days '
+                  'and typically use a delay of two days between execution date '
+                  'and effective transfer date.'
+                  ),
+            ),
+        'test': fields.boolean(
+            'Test Run',
+            help=('Select this if you want your bank to run a test process '
+                  'rather then execute your orders for real.'
+                  ),
+            ),
+        'fixed_message': fields.char(
+            'Fixed Message', size=32,
+            help=('A fixed message to apply to all transactions in addition to '
+                  'the individual messages.'
+                  ),
+            ),
+        # file fields
+        'file_id': fields.many2one(
+            'banking.export.clieop',
+            'ClieOp File',
+            readonly=True
+            ),
+        # fields.related does not seem to support 
+        # fields of type selection
+        'testcode': fields.selection(
+            [('T', _('Yes')), ('P', _('No'))],
+            'Test Run', readonly=True,
+            ),
+        'filetype': fields.selection(
+            [
                 ('CREDBET', 'Payment Batch'),
                 ('SALARIS', 'Salary Payment Batch'),
                 ('INCASSO', 'Direct Debit Batch'),
-            ],
-            'required': False,
-            'readonly': True,
-        },
-        'file': {
-            'string': 'ClieOp File',
-            'type': 'binary',
-            'required': False,
-            'readonly': True,
-        },
-        'log': {
-            'string': 'Log',
-            'type': 'text',
-            'readonly': True,
-        },
-    }
-
-    def _check_orders(self, cursor, uid, data, context):
+                ],
+            'File Type',
+            readonly=True,
+            ),
+        'prefered_date': fields.related(
+            'file_id', 'prefered_date',
+            type='date',
+            string='Prefered Processing Date',
+            readonly=True,
+            ),
+        'no_transactions': fields.related(
+            'file_id', 'no_transactions',
+            type ='integer',
+            string='Number of Transactions',
+            readonly=True,
+            ),
+        'check_no_accounts': fields.related(
+            'file_id', 'check_no_accounts',
+            type='char', size=5,
+            string='Check Number Accounts',
+            readonly=True,
+            ),
+        'total_amount': fields.related(
+            'file_id', 'total_amount',
+            type='float',
+            string='Total Amount',
+            readonly=True,
+            ),
+        'identification': fields.related(
+            'file_id', 'identification',
+            type='char', size=6,
+            string='Identification',
+            readonly=True,
+            ),
+        'file': fields.related(
+            'file_id', 'file', type='binary',
+            readonly=True,
+            string='File',
+            ),
+        'payment_order_ids': fields.many2many(
+            'payment.order', 'rel_wiz_payorders', 'wizard_id',
+            'payment_order_id', 'Payment Orders',
+            readonly=True,
+            ),
+        }
+    
+    _defaults = {
+        'test': True,
+        }
+
+    def create(self, cursor, uid, vals, context=None):
+        '''
+        Retrieve a sane set of default values based on the payment orders
+        from the context.
+        '''
+        if 'batchtype' not in vals:
+            self.check_orders(cursor, uid, vals, context)
+        return super(banking_export_clieop_wizard, self).create(
+            cursor, uid, vals, context)
+
+    def check_orders(self, cursor, uid, vals, context):
         '''
         Check payment type for all orders.
 
@@ -191,14 +170,14 @@
         Also mind that rates for batches are way higher than those for
         transactions. It pays to limit the number of batches.
         '''
-        form = data['form']
         today = date.today()
-        pool = pooler.get_pool(cursor.dbname)
-        payment_order_obj = pool.get('payment.order')
+        payment_order_obj = self.pool.get('payment.order')
 
+        # Payment order ids are provided in the context
+        payment_order_ids = context.get('active_ids', [])
         runs = {}
         # Only orders of same type can be combined
-        payment_orders = payment_order_obj.browse(cursor, uid, data['ids'])
+        payment_orders = payment_order_obj.browse(cursor, uid, payment_order_ids)
         for payment_order in payment_orders:
 
             payment_type = payment_order.mode.type.code
@@ -226,34 +205,33 @@
                     else:
                         execution_date = today
                 if execution_date and execution_date >= max_date:
-                    raise wizard.except_wizard(
+                    raise osv.except_osv(
                         _('Error'),
                         _('You can\'t create ClieOp orders more than 30 days in advance.')
                     )
-            # Sanity check: can't process in the past
-            form['execution_date'] = strfdate(max(execution_date, today))
-
         if len(runs) != 1:
-            raise wizard.except_wizard(
+            raise osv.except_osv(
                 _('Error'),
                 _('You can only combine payment orders of the same type')
             )
 
-        form['batchtype'] = type = runs.keys()[0]
-        form['reference'] = runs[type][0].reference[-5:]
-        return form
+        type = runs.keys()[0]
+        vals.update({
+            'execution_date': strfdate(max(execution_date, today)),
+            'batchtype': type,
+            'reference': runs[type][0].reference[-5:],
+            'payment_order_ids': [[6, 0, payment_order_ids]],
+            'state': 'create',
+            })
 
-    def _create_clieop(self, cursor, uid, data, context):
+    def create_clieop(self, cursor, uid, ids, context):
         '''
         Wizard to actually create the ClieOp3 file
         '''
-        pool = pooler.get_pool(cursor.dbname)
-        payment_order_obj = pool.get('payment.order')
-        form = data['form']
-
+        payment_order_obj = self.pool.get('payment.order')
+        clieop_export = self.browse(cursor, uid, ids, context)[0]
         clieopfile = None
-        payment_orders = payment_order_obj.browse(cursor, uid, data['ids'])
-        for payment_order in payment_orders:
+        for payment_order in clieop_export.payment_order_ids:
             if not clieopfile:
                 # Just once: create clieop file
                 our_account_owner = payment_order.mode.bank_id.owner_name \
@@ -264,19 +242,19 @@
                         payment_order.mode.bank_id.iban
                     ).localized_BBAN
                 if not our_account_nr:
-                    raise wizard.except_wizard(
+                    raise osv.except_osv(
                         _('Error'),
                         _('Your bank account has to have a valid account number')
                     )
                 clieopfile = {'CLIEOPPAY': clieop.PaymentsFile,
                               'CLIEOPINC': clieop.DirectDebitFile,
                               'CLIEOPSAL': clieop.SalaryPaymentsFile,
-                             }[form['batchtype']](
-                                 identification = form['reference'],
-                                 execution_date = form['execution_date'],
+                             }[clieop_export['batchtype']](
+                                 identification = clieop_export['reference'],
+                                 execution_date = clieop_export['execution_date'],
                                  name_sender = our_account_owner,
                                  accountno_sender = our_account_nr,
-                                 test = form['test']
+                                 test = clieop_export['test']
                              )
 
                 # ClieOp3 files can contain multiple batches, but we put all
@@ -285,21 +263,21 @@
                 # cheaper to combine than it is to split. As we split out all
                 # reported errors afterwards, there is no additional gain in
                 # using multiple batches.
-                if form['fixed_message']:
-                    messages = [form['fixed_message']]
+                if clieop_export['fixed_message']:
+                    messages = [clieop_export['fixed_message']]
                 else:
                     messages = []
                 # The first payment order processed sets the reference of the
                 # batch.
                 batch = clieopfile.batch(
                     messages = messages,
-                    batch_id = payment_order.reference
+                    batch_id = clieop_export['reference']
                 )
 
             for line in payment_order.line_ids:
                 # Check on missing partner of bank account (this can happen!)
                 if not line.bank_id or not line.bank_id.partner_id:
-                    raise wizard.except_wizard(
+                    raise osv.except_osv(
                         _('Error'),
                         _('There is insufficient information.\r\n'
                           'Both destination address and account '
@@ -318,13 +296,13 @@
                 # Is this an IBAN account?
                 if iban.valid:
                     if iban.countrycode != 'NL':
-                        raise wizard.except_wizard(
+                        raise osv.except_osv(
                             _('Error'),
                             _('You cannot send international bank transfers '
                               'through ClieOp3!')
                         )
                     other_account_nr = iban.localized_BBAN
-                if form['batchtype'] == 'CLIEOPINC':
+                if clieop_export['batchtype'] == 'CLIEOPINC':
                     kwargs['accountno_beneficiary'] = our_account_nr
                     kwargs['accountno_payer'] = other_account_nr
                 else:
@@ -334,86 +312,63 @@
 
         # Generate the specifics of this clieopfile
         order = clieopfile.order
-        values = dict(
-            filetype = order.name_transactioncode,
-            identification = order.identification,
-            prefered_date = strfdate(order.preferred_execution_date),
-            total_amount = int(order.total_amount) / 100.0,
-            check_no_accounts = order.total_accountnos,
-            no_transactions = order.nr_posts,
-            testcode = order.testcode,
-            file = base64.encodestring(clieopfile.rawdata),
-        )
-        form.update(values)
-        values['daynumber'] = int(clieopfile.header.file_id[2:])
-        values['payment_order_ids'] = ','.join(map(str, data['ids']))
-        data['file_id'] = pool.get('banking.export.clieop').create(cursor, uid, values)
-        data['clieop'] = clieopfile
-        form['log'] = ''
-        return form
+        file_id = self.pool.get('banking.export.clieop').create(
+            cursor, uid, dict(
+                filetype = order.name_transactioncode,
+                identification = order.identification,
+                prefered_date = strfdate(order.preferred_execution_date),
+                total_amount = int(order.total_amount) / 100.0,
+                check_no_accounts = order.total_accountnos,
+                no_transactions = order.nr_posts,
+                testcode = order.testcode,
+                file = base64.encodestring(clieopfile.rawdata),
+                daynumber = int(clieopfile.header.file_id[2:]),
+                payment_order_ids = [
+                    [6, 0, [x.id for x in clieop_export['payment_order_ids']]]
+                     ],
+                    ), context)
+        self.write(cursor, uid, [ids[0]], dict(
+                filetype = order.name_transactioncode,
+                testcode = order.testcode,
+                file_id = file_id,
+                state = 'finish',
+                ), context)
+        return {
+            'name': _('Client Opdrachten Export'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': self._name,
+            'domain': [],
+            'context': dict(context, active_ids=ids),
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'res_id': ids[0] or False,
+        }
 
-    def _cancel_clieop(self, cursor, uid, data, context):
+    def cancel_clieop(self, cursor, uid, ids, context):
         '''
         Cancel the ClieOp: just drop the file
         '''
-        pool = pooler.get_pool(cursor.dbname)
-        pool.get('banking.export.clieop').unlink(cursor, uid, data['file_id'])
-        return {'state': 'end'}
-
-    def _save_clieop(self, cursor, uid, data, context):
-        '''
-        Save the ClieOp: mark all payments in the file as 'sent'.
-        '''
-        pool = pooler.get_pool(cursor.dbname)
-        clieop_obj = pool.get('banking.export.clieop')
-        payment_order_obj = pool.get('payment.order')
-        clieop_file = clieop_obj.write(
-            cursor, uid, data['file_id'], {'state':'sent'}
-        )
-        payment_order_obj.write(cursor, uid, data['ids'], {'state': 'sent'})
-        return {'state': 'end'}
-
-    states = {
-        'init': {
-            'actions': [_check_orders],
-            'result': {
-                'type': 'form',
-                'arch': form,
-                'fields' : fields,
-                'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('create', 'Create', 'gtk-ok'),
-                ]
-            }
-        },
-        'create': {
-            'actions': [_create_clieop],
-            'result': {
-                'type': 'form',
-                'arch': file_form,
-                'fields': file_fields,
-                'state': [
-                    ('cancel', 'Cancel', 'gtk-cancel'),
-                    ('save', 'Save', 'gtk-save'),
-                ]
-            },
-        },
-        'cancel': {
-            'actions': [_cancel_clieop],
-            'result': {
-                'type': 'state',
-                'state': 'end'
-            }
-        },
-        'save': {
-            'actions': [_save_clieop],
-            'result': {
-                'type': 'state',
-                'state': 'end'
-            },
-        }
-    }
-
-wizard_banking_export_clieop('account_banking_nl_clieop.banking_export_clieop')
+        clieop_export = self.read(cursor, uid, ids, ['file_id'], context)[0]
+        self.pool.get('banking.export.clieop').unlink(cursor, uid, clieop_export['file_id'])
+        return {'type': 'ir.actions.act_window_close'}
+
+    def save_clieop(self, cursor, uid, ids, context):
+        '''
+        Save the ClieOp: mark all payments in the file as 'sent', if not a test
+        '''
+        clieop_export = self.browse(
+            cursor, uid, ids, context)[0]
+        if not clieop_export['test']:
+            clieop_obj = self.pool.get('banking.export.clieop')
+            payment_order_obj = self.pool.get('payment.order')
+            clieop_file = clieop_obj.write(
+                cursor, uid, clieop_export['file_id'].id, {'state':'sent'}
+                )
+            payment_order_obj.action_sent(
+                cursor, uid, [x.id for x in clieop_export['payment_order_ids']])
+        return {'type': 'ir.actions.act_window_close'}
+
+banking_export_clieop_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_banking_nl_clieop/wizard/export_clieop_view.xml'
--- account_banking_nl_clieop/wizard/export_clieop_view.xml	1970-01-01 00:00:00 +0000
+++ account_banking_nl_clieop/wizard/export_clieop_view.xml	2011-11-23 10:40:16 +0000
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="banking_export_clieop_wizard_view" model="ir.ui.view">
+            <field name="name">banking.export.clieop.wizard.view</field>
+            <field name="model">banking.export.clieop.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+		<form string="Client Opdrachten Export">
+		    <field name="state" invisible="True"/>
+		    <group states="create">
+			<separator colspan="4" string="Processing Details" />
+			<field name="batchtype" />
+			<field name="execution_date" />
+			<field name="test" />
+			<separator colspan="4" string="Reference for further communication" />
+			<field name="reference" colspan="2" />
+			<separator colspan="4" string="Additional message for all transactions" />
+			<field name="fixed_message" />
+			<newline/>
+			<button icon="gtk-close"
+				special="cancel"
+				string="Cancel"
+				/>
+			<button icon="gtk-ok"
+				string="Create" 
+				name="create_clieop"
+				type="object"
+				/>
+		    </group>
+		    <group states="finish">
+			<field name="filetype" />
+			<field name="identification" />
+			<field name="total_amount" />
+			<field name="check_no_accounts" />
+			<field name="no_transactions" />
+			<field name="prefered_date" />
+			<field name="testcode" />
+			<newline/>
+			<field name="file_id" />
+			<field name="file" />
+			<newline/>
+			<button icon="gtk-close"
+				string="Cancel" 
+				name="cancel_clieop"
+				type="object"
+				/>
+			<button icon="gtk-ok"
+				string="Finish" 
+				name="save_clieop"
+				type="object"
+				/>
+		    </group>
+		</form>
+	    </field>
+	</record>
+    </data>
+</openerp>

=== modified file 'account_banking_nl_girotel/__terp__.py'
--- account_banking_nl_girotel/__terp__.py	2011-11-08 13:10:34 +0000
+++ account_banking_nl_girotel/__terp__.py	2011-11-23 10:40:16 +0000
@@ -37,9 +37,8 @@
     ],
     'demo_xml': [],
     'description': '''
-    Module to import Dutch Girotel format transation files.
-
-    This modules contains no logic, just an import filter for account_banking.
+Do not install this module. This branch has been replaced by lp:banking-addons/6.0
+See https://launchpad.net/banking-addons
     ''',
     'active': False,
     'installable': True,

=== modified file 'account_banking_nl_multibank/__terp__.py'
--- account_banking_nl_multibank/__terp__.py	2011-11-08 13:10:34 +0000
+++ account_banking_nl_multibank/__terp__.py	2011-11-23 10:40:16 +0000
@@ -37,9 +37,8 @@
     ],
     'demo_xml': [],
     'description': '''
-    Module to import Dutch Multibank format transation files.
-
-    This modules contains no logic, just an import filter for account_banking.
+Do not install this module. This branch has been replaced by lp:banking-addons/6.0
+See https://launchpad.net/banking-addons
     ''',
     'active': False,
     'installable': True,

=== modified file 'account_banking_nl_triodos/__openerp__.py'
--- account_banking_nl_triodos/__openerp__.py	2011-04-26 21:00:12 +0000
+++ account_banking_nl_triodos/__openerp__.py	2011-11-23 10:40:16 +0000
@@ -39,19 +39,8 @@
     ],
     'demo_xml': [],
     'description': '''
-Module to import Dutch Triodos bank format transation files (CSV format).
-
-As the Triodos bank does not provide detailed specification concerning possible
-values and their meaning for the fields in the CSV file format, the statements
-are parsed according to an educated guess based on incomplete information.
-You can contact the account-banking developers through their launchpad page and
-help improve the performance of this import filter on
-https://launchpad.net/account-banking.
-
-Note that imported bank transfers are organized in statements covering periods
-of one week, even if the imported files cover a different period.
-
-This modules contains no logic, just an import filter for account_banking.
+Do not install this module. This branch has been replaced by lp:banking-addons/6.0
+See https://launchpad.net/banking-addons
     ''',
     'active': False,
     'installable': True,

=== modified file 'account_banking_nl_triodos/__terp__.py'
--- account_banking_nl_triodos/__terp__.py	2011-11-08 13:10:34 +0000
+++ account_banking_nl_triodos/__terp__.py	2011-11-23 10:40:16 +0000
@@ -39,19 +39,8 @@
     ],
     'demo_xml': [],
     'description': '''
-Module to import Dutch Triodos bank format transation files (CSV format).
-
-As the Triodos bank does not provide detailed specification concerning possible
-values and their meaning for the fields in the CSV file format, the statements
-are parsed according to an educated guess based on incomplete information.
-You can contact the account-banking developers through their launchpad page and
-help improve the performance of this import filter on
-https://launchpad.net/account-banking.
-
-Note that imported bank transfers are organized in statements covering periods
-of one week, even if the imported files cover a different period.
-
-This modules contains no logic, just an import filter for account_banking.
+Do not install this module. This branch has been replaced by lp:banking-addons/6.0
+See https://launchpad.net/banking-addons
     ''',
     'active': False,
     'installable': True,

=== modified file 'account_banking_nl_triodos/triodos.py'
--- account_banking_nl_triodos/triodos.py	2011-04-27 10:16:40 +0000
+++ account_banking_nl_triodos/triodos.py	2011-11-23 10:40:16 +0000
@@ -68,6 +68,9 @@
         # Set statement_id based on week number
         self.statement_id = self.effective_date.strftime('%Yw%W')
         self.id = str(subno).zfill(4)
+        # Normalize basic account numbers
+        self.remote_account = self.remote_account.replace('.', '').zfill(10)
+        self.local_account = self.local_account.replace('.', '').zfill(10)
 
 class transaction(models.mem_bank_transaction):
     '''