Merge lp:~openerp-dev/openobject-addons/6.1-opw-581762-msh into lp:openobject-addons/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of translation of share link of share web-addons.

Demo :- Install share module and see the share link in sidebar in other language is not translatable.

Thanks.

[Niels Huylebroeck (red15)]

This merge seems to contain changes on the stock form view concerning the
traceability. You might want to resubmit a clean merge.

2012/11/7 Mohammed Shekha(Open ERP) <email address hidden>

> Mohammed Shekha(Open ERP) has proposed merging
> lp:~openerp-dev/openobject-addons/6.1-opw-581762-msh into
> lp:openobject-addons/6.1.
>
> Requested reviews:
> OpenERP Core Team (openerp)
>
> For more details, see:
>
> https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-581762-msh/+merge/133240
>
> Hello,
>
> Fixed the issue of translation of share link of share web-addons.
>
> Demo :- Install share module and see the share link in sidebar in other
> language is not translatable.
>
> Thanks.
> --
>
> https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-581762-msh/+merge/133240
> You are subscribed to branch lp:openobject-addons/6.1.
>
> === modified file 'share/static/src/js/share.js'
> --- share/static/src/js/share.js 2011-12-27 20:36:18 +0000
> +++ share/static/src/js/share.js 2012-11-07 13:34:45 +0000
> @@ -1,6 +1,8 @@
>
> openerp.share = function(session) {
>
> +var _t = session.web._t;
> +
> function launch_wizard(self, view, user_type) {
> var action = view.widget_parent.action;
> var Share = new session.web.DataSet(self, 'share.wizard',
> view.dataset.get_context());
> @@ -50,7 +52,7 @@
> var self = this;
> has_share(function() {
> self.add_items('other', [{
> - label: 'Share',
> + label: _t('Share'),
> callback: self.on_sidebar_click_share,
> classname: 'oe-share',
> }]);
>
> === modified file 'stock/stock_view.xml'
> --- stock/stock_view.xml 2012-03-02 15:26:24 +0000
> +++ stock/stock_view.xml 2012-11-07 13:34:45 +0000
> @@ -331,8 +331,8 @@
> <group col="2" colspan="2">
> <separator string="Traceability" colspan="2"/>
> <field name="stock_available" colspan="2"/>
> - <button name="action_traceability"
> string="Upstream Traceability" type="object" context="{'type': '', 'field':
> 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
> - <button name="action_traceability"
> string="Downstream Traceability" type="object" context="{'type':
> 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
> + <button name="action_traceability"
> string="Upstream Traceability" type="object" context="{'type':
> 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
> + <button name="action_traceability"
> string="Downstream Traceability" type="object" context="{'field':
> 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
> </group>
> <notebook colspan="4">
> <page string="Revisions">
>
>
>

--
Niels Huylebroeck
Lead Architect -- Agaplan
Tel. : [phone]
Web : http://www.agaplan.eu

[lp:~openerp-dev/openobject-addons/6.1-opw-581762-msh]

7059. By Olivier Dony (Odoo) on 2012-11-07

[FIX] project_issue: fix access rights error when using portal access

Due to the recent change in the computation of the closing duration
for project issues[1], viewing issues now fails for users who do not
have read access to project.project. This is typically the case for
portal users, who can view their own issues but not the project details.
Doing the computation in superuser mode does not cause any security
problem and avoids the access rights error.

7060. By Launchpad Translations on behalf of openerp on 2012-11-08

Launchpad automatic translations update.

7061. By Launchpad Translations on behalf of openerp on 2012-11-09

Launchpad automatic translations update.

7062. By Launchpad Translations on behalf of openerp on 2012-11-10

Launchpad automatic translations update.

7063. By Launchpad Translations on behalf of openerp on 2012-11-11

Launchpad automatic translations update.

7064. By Launchpad Translations on behalf of openerp on 2012-11-12

Launchpad automatic translations update.

7065. By Launchpad Translations on behalf of openerp on 2012-11-13

Launchpad automatic translations update.

7066. By Launchpad Translations on behalf of openerp on 2012-11-14

Launchpad automatic translations update.

7067. By Launchpad Translations on behalf of openerp on 2012-11-15

Launchpad automatic translations update.

7068. By Launchpad Translations on behalf of openerp on 2012-11-16

Launchpad automatic translations update.

7069. By Mohammed Shekha(Open ERP) on 2012-11-22

[FIX]Refixed the issue of translation of share link of share web-addons.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-581762-port-mma/+merge/135068 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7069. By Mohammed Shekha(Open ERP) on 2012-11-22

[FIX]Refixed the issue of translation of share link of share web-addons.

=== modified file 'share/static/src/js/share.js'
--- share/static/src/js/share.js	2011-12-27 20:36:18 +0000
+++ share/static/src/js/share.js	2012-11-22 13:01:32 +0000
@@ -1,6 +1,8 @@
 
 openerp.share = function(session) {
 
+var _t = session.web._t;
+
 function launch_wizard(self, view, user_type) {
         var action = view.widget_parent.action;
         var Share = new session.web.DataSet(self, 'share.wizard', view.dataset.get_context());
@@ -50,7 +52,7 @@
         var self = this;
         has_share(function() {
             self.add_items('other', [{
-                label: 'Share',
+                label: _t('Share'),
                 callback: self.on_sidebar_click_share,
                 classname: 'oe-share',
             }]);