Merge lp://staging/~mukunde/unifield-server/US-10725 into lp://staging/unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 6385
Proposed branch: lp://staging/~mukunde/unifield-server/US-10725
Merge into: lp://staging/unifield-server
Diff against target: 194 lines (+40/-7) (has conflicts)
3 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+14/-1)
bin/addons/register_accounting/wizard/wizard_cash_return.py (+23/-5)
bin/addons/register_accounting/wizard/wizard_cash_return.xml (+3/-1)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp://staging/~mukunde/unifield-server/US-10725
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+434937@code.staging.launchpad.net
To post a comment you must log in.
6362. By Gaël Mukunde

US-10725 [IMP] Remove unnecessary code in onchange_account method

6363. By Gaël Mukunde

US-10725 [IMP] Fix bug introduced in US-7819 that prevents to validate the advance wizard if an operational advance account is used even if an employee is selected

6364. By Gaël Mukunde

US-10725 [IMP] Remove unused journal_id field in cash return wizard object introduced in US-7819

6365. By Gaël Mukunde

US-10725 [IMP] Restore blocking transfer to current journal and journal filtering by currency as in US-7819

6366. By Gaël Mukunde

US-10725 [IMP] Add a transfer_journal_id in create_move_line method for handling the 3rd party journal when a creating move line from an advance return wizard

Preview Diff

[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.

Subscribers

People subscribed via source and target branches