Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-944341-mma into lp:openobject-addons

  1. trunk-bug-944341-mma
  2. Merge into trunk
Proposed by Mayur Maheshwari(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-944341-mma
Merge into: lp:openobject-addons
Diff against target: 27 lines (+3/-3)
2 files modified
stock/i18n/stock.pot (+2/-2)
stock/stock.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-944341-mma
Reviewer Review Type Date Requested Status
Purnendu Singh (OpenERP) (community) Approve
Mayur Maheshwari(OpenERP) (community) Needs Resubmitting
Review via email: mp+96971@code.launchpad.net

Description of the change

Hello,

        stock: I Have improved help tool-tip

Thanks.
mma

To post a comment you must log in.
Revision history for this message
Purnendu Singh (OpenERP) (purnendu-singh) wrote :

update the pot also as it is done for 6.1. Also update it with latest trunk

Thanks,
Purnendu Singh

review: Needs Fixing
Reply
Revision history for this message
Mayur Maheshwari(OpenERP) (mma-openerp) wrote :

Hello

     I Have improved pot file as well update branch with latest trunk

Thanks
Mayur

review: Needs Resubmitting
Reply
Revision history for this message
Purnendu Singh (OpenERP) (purnendu-singh) wrote :

seems good now

Thanks,
Purnendu Singh

review: Approve
Reply

Unmerged revisions

6670. By Mayur Maheshwari(OpenERP)

[MERGE]: Merge with lp:openobject-addons

6669. By Mayur Maheshwari(OpenERP)

[IMP]stock : improved tooltip in pot file

6668. By Mayur Maheshwari(OpenERP)

[FIX]stock: Improved help tool-tip

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/i18n/stock.pot'
2--- stock/i18n/stock.pot 2012-08-08 14:46:13 +0000
3+++ stock/i18n/stock.pot 2012-09-07 09:33:22 +0000
4@@ -1162,8 +1162,8 @@
5 #. module: stock
6 #: help:stock.location,chained_company_id:0
7 msgid ""
8-"The company the Picking List containing the chained move will belong to "
9-"(leave empty to use the default company determination rules"
10+"Picking List containing the chained move will belong to this company "
11+"( leave empty to use the default company determination rules )"
12 msgstr ""
13
14 #. module: stock
15
16=== modified file 'stock/stock.py'
17--- stock/stock.py 2012-08-31 07:40:32 +0000
18+++ stock/stock.py 2012-09-07 09:33:22 +0000
19@@ -189,7 +189,7 @@
20 "by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
21 ),
22 'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', help="Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."),
23- 'chained_company_id': fields.many2one('res.company', 'Chained Company', help='The company the Picking List containing the chained move will belong to (leave empty to use the default company determination rules'),
24+ 'chained_company_id': fields.many2one('res.company', 'Chained Company', help="Picking List containing the chained move will belong to this company ( leave empty to use the default company determination rules )."),
25 'chained_delay': fields.integer('Chaining Lead Time',help="Delay between original move and chained move in days"),
26 'partner_id': fields.many2one('res.partner', 'Location Address',help="Address of customer or supplier."),
27 'icon': fields.selection(tools.icons, 'Icon', size=64,help="Icon show in hierarchical tree view"),

Subscribers

People subscribed via source and target branches

to all changes: