Account - Consolidation

Merge lp://staging/~elbati/account-consolidation/account_parallel_currency_7_tests into lp://staging/~elbati/account-consolidation/adding_account_parallel_currency_7

Proposed by Lorenzo Battistini on 2013-03-27

Status:	Merged
Merge reported by:	Lorenzo Battistini
Merged at revision:	not available
Proposed branch:	lp://staging/~elbati/account-consolidation/account_parallel_currency_7_tests
Merge into:	lp://staging/~elbati/account-consolidation/adding_account_parallel_currency_7
Diff against target:	843 lines (+688/-77) 8 files modified account_parallel_currency/__init__.py (+0/-1) account_parallel_currency/__openerp__.py (+8/-3) account_parallel_currency/account.py (+27/-25) account_parallel_currency/account_demo.xml (+504/-0) account_parallel_currency/res_user.py (+0/-31) account_parallel_currency/test/customer_invoice.yml (+138/-0) account_parallel_currency/test/mapping_parallel_accounts.yml (+11/-0) account_parallel_currency/user_view.xml (+0/-17)
To merge this branch:	bzr merge lp://staging/~elbati/account-consolidation/account_parallel_currency_7_tests
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Guewen Baconnier @ Camptocamp (community)			Needs Resubmitting on 2013-04-02
Lorenzo Battistini			Pending
Review via email: mp+155795@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2013-04-02.

26. By Lorenzo Battistini on 2013-03-27: [ADD] automated tests for parallel accounts mapping
27. By Lorenzo Battistini on 2013-03-27: [add] customer invoice test
28. By Lorenzo Battistini on 2013-03-28: [FIX] allowing normal user to cancel moves
29. By Lorenzo Battistini on 2013-03-28: [FIX] when secondary curr is = parallel currency
30. By Lorenzo Battistini on 2013-03-28: [ADD] test for USD invoice
31. By Lorenzo Battistini on 2013-03-29: [FIX] module description

Revision history for this message

Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote on 2013-04-02:

If your intention is to merge both branches in lp:account-consolidation/7.0 respecting the right order, the correct way would have been to create this merge proposal against lp:account-consolidation/7.0 but to set lp:~elbati/account-consolidation/adding_account_parallel_currency_7 in the 'prerequisite branch'.

Can you resubmit this merge in this manner please?

review: Needs Resubmitting

Revision history for this message

Lorenzo Battistini (elbati) wrote on 2013-04-02:

On 04/02/2013 11:41 AM, Guewen Baconnier @ Camptocamp wrote:
> Review: Resubmit
>
> This merge proposal target branch is lp:~elbati/account-consolidation/adding_account_parallel_currency_7
>
> If your intention is to merge both branches in lp:account-consolidation/7.0 respecting the right order, the correct way would have been to create this merge proposal against lp:account-consolidation/7.0 but to set lp:~elbati/account-consolidation/adding_account_parallel_currency_7 in the 'prerequisite branch'.

Thank you Guewen

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

People subscribed via source and target branches

to all changes: