Code review comment for lp:~openerp-dev/openobject-addons/6.1-opw-581762-msh

Revision history for this message
Niels Huylebroeck (red15) wrote :

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. : +32 (0) 93 95 98 90
Web : http://www.agaplan.eu

« Back to merge proposal