OpenObject Extension

Merge lp://staging/~serpent-consulting-services/openobject-extension/gekko-tek-995350 into lp://staging/openobject-extension/oerp6.1-stable

  1. gekko-tek-995350
  2. Merge into oerp6.1-stable
Proposed by Kyle Waid
Status: Rejected
Rejected by: Sébastien BEAU - http://www.akretion.com
Proposed branch: lp://staging/~serpent-consulting-services/openobject-extension/gekko-tek-995350
Merge into: lp://staging/openobject-extension/oerp6.1-stable
Diff against target: 45 lines (+6/-3) (has conflicts)
2 files modified
base_external_referentials/external_osv.py (+3/-3)
base_external_referentials/report.py (+3/-0)
Text conflict in base_external_referentials/report.py
To merge this branch: bzr merge lp://staging/~serpent-consulting-services/openobject-extension/gekko-tek-995350
Reviewer Review Type Date Requested Status
Sébastien BEAU - http://www.akretion.com Pending
Review via email: mp+106494@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Sébastien BEAU - http://www.akretion.com (sebastien.beau) wrote :

Sorry the problem was not here.
This functions have correct args.
I fix the bug in rev 638 of magentoerpconnect.

Thanks for helping us.

PS : take care about >>>TREE and <<<MERGE ;)

Unmerged revisions

291. By Serpent Consulting Services

[FIX] fix some issue releated to referential_id field.

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.