OpenObject Extension

Merge lp://staging/~sebastien.beau/openobject-extension/oerp6.1-stable-fix into lp://staging/openobject-extension/oerp6.1-stable

oerp6.1-stable-fix
Merge into oerp6.1-stable

Proposed by Sébastien BEAU - http://www.akretion.com on 2013-06-10

Status:	Needs review
Proposed branch:	lp://staging/~sebastien.beau/openobject-extension/oerp6.1-stable-fix
Merge into:	lp://staging/openobject-extension/oerp6.1-stable
Diff against target:	83 lines (+19/-10) 2 files modified base_external_referentials/decorator.py (+15/-3) base_file_protocole/base_file_protocole.py (+4/-7)
To merge this branch:	bzr merge lp://staging/~sebastien.beau/openobject-extension/oerp6.1-stable-fix
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
extra-addons-commiter		2013-06-10	Pending
Review via email: mp+168486@code.staging.launchpad.net

Description of the change

Fix base_file_protocole
And also fix the base_external_referential decorator for catching error. Indeed for example for the export of the picking the resource contain the id of the picking.

lp://staging/~sebastien.beau/openobject-extension/oerp6.1-stable-fix updated on 2013-06-10

396. By Sébastien BEAU - http://www.akretion.com on 2013-06-10: [FIX] fix error introduced by last merge. copy of log_kwargs must be out of the if

Unmerged revisions

398. By Sébastien BEAU - http://www.akretion.com on 2013-06-10: [REF] base_external_referentials : refactor the way to get the res_id, indeed in some case the resource is directly the res_id, so I just test if resource is an integer/long
397. By Sébastien BEAU - http://www.akretion.com on 2013-06-10: [FIX] base_file_protocole: fix read of fil ein file system