lp:~openerp-dev/openobject-server/6.0-opw-381612-ado

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openobject-server/6.0 at revision 3591

Olivier Dony (Odoo): Disapprove on 2012-02-24

Amit Dodiya (OpenERP) (community): Needs Resubmitting on 2012-02-24

Xavier ALT (community): Needs Fixing on 2012-02-24

Naresh(OpenERP) (community): Approve on 2012-01-24

Diff: 38 lines (+13/-9)

1 file modified

bin/addons/base/module/module.py (+13/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3589. By Amit Dodiya (OpenERP) on 2012-02-24

[FIX] Dependancies loop executes when you install a new module

3588. By Launchpad Translations on behalf of openerp on 2012-02-22

Launchpad automatic translations update.

3587. By Launchpad Translations on behalf of openerp on 2012-02-21

Launchpad automatic translations update.

3586. By Launchpad Translations on behalf of openerp on 2012-02-18

Launchpad automatic translations update.

3585. By Launchpad Translations on behalf of openerp on 2012-02-17

Launchpad automatic translations update.

3584. By Olivier Laurent (Open ERP) on 2012-02-14

[FIX] resubmit patch for opw 51206 (cfr r3552, r3553, r3576). Also check addons revision 5056

3583. By tfr (Openerp) on 2012-02-10

[MERGE] fix opw issue 56037 : res.log context need to allow more the 250 char

3582. By Christophe Simonis (OpenERP) on 2012-02-09

[IMP] backport of rev <email address hidden> of trunk: tools.translate: be more lenient and accept standart gettext source annotations

Original commit information:
------------------------------------------------------------
revno: 4002
revision-id: <email address hidden>
parent: <email address hidden>
committer: Olivier Dony <email address hidden>
branch nick: trunk
timestamp: Thu 2012-02-02 15:32:10 +0100
message:
  [IMP] tools.translate: be more lenient and accept standart gettext source annotations

   The GetText spec says that PO auto-comments indicating
    the source location have this form:
     #: /path/to/file:lineno
    However OpenERP's POT export system defaults to a modified
    version of this format with an extra 'type' field:
     #: type:/path/to/file:lineno
    The babel extractors we use for openerp-web's translations
    have the GetText format hardcoded, so it's a good idea
    to be more lenient and allow the standards annotations too.
    We can use a default 'code' type for such cases.

    For openerp-web translations the type does not matter,
    as the translations will be directly loaded by the
    web engine from the PO files and served in Javascript
   to the browser, with no typing needed.

    This patch simply avoids failing to parse updated PO files
    that will contain standard GetText annotations for the
    openerp-web related terms.

3581. By Olivier Laurent (Open ERP) on 2012-02-09

[FIX] ir_values: revert r3568: caused a crash when creating a new purchase.order

3580. By Launchpad Translations on behalf of openerp on 2012-02-09

Launchpad automatic translations update.