Merge lp://qastaging/~openerp-chinese-team/magentoerpconnect/guest-order-bug-fix into lp://qastaging/magentoerpconnect/oerp6.1-stable

Proposed by Joshua Jan(SHINEIT)
Status: Rejected
Rejected by: Sébastien BEAU - http://www.akretion.com
Proposed branch: lp://qastaging/~openerp-chinese-team/magentoerpconnect/guest-order-bug-fix
Merge into: lp://qastaging/magentoerpconnect/oerp6.1-stable
Diff against target: 35 lines (+8/-6)
1 file modified
magentoerpconnect/sale.py (+8/-6)
To merge this branch: bzr merge lp://qastaging/~openerp-chinese-team/magentoerpconnect/guest-order-bug-fix
Reviewer Review Type Date Requested Status
Sébastien BEAU - http://www.akretion.com Disapprove
Guewen Baconnier @ Camptocamp Needs Resubmitting
Review via email: mp+131813@code.qastaging.launchpad.net

Description of the change

Hello all,
    There are two change to fix the https://bugs.launchpad.net/magentoerpconnect/+bug/1054059
    Another one:
    https://code.launchpad.net/~openerp-chinese-team/e-commerce-addons/guest-order-bug-fix
Best Regards
Joshua

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Hello,

Your merge proposal is conflicting against the current code. Can you rebase your branch and propose your merge again please?
By the way, you'll want to check because it seems to have been fixed in a different manner on the main branch.

Thanks for your proposal

review: Needs Resubmitting
Revision history for this message
Sébastien BEAU - http://www.akretion.com (sebastien.beau) wrote :

I confirm the bug related have been closed. So no need to merge this branch
http://bazaar.launchpad.net/~magentoerpconnect-core-editors/magentoerpconnect/oerp6.1-stable/revision/676.2.36

Thanks

review: Disapprove

Unmerged revisions

678. By Joshua Jan(SHINEIT)

fix [base_sale_multichannels] Importing Guest-Orders is not possible

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.