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

[Mayur Maheshwari(OpenERP)]

Hello,

        stock: I Have improved help tool-tip

Thanks.
mma

[Purnendu Singh (OpenERP) (purnendu-singh)]

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

Thanks,
Purnendu Singh

review: Needs Fixing

[Mayur Maheshwari(OpenERP) (mma-openerp)]

Hello

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

Thanks
Mayur

review: Needs Resubmitting

[Purnendu Singh (OpenERP) (purnendu-singh)]

seems good now

Thanks,
Purnendu Singh

review: Approve

Unmerged revisions

6670. By Mayur Maheshwari(OpenERP) on 2012-09-07

[MERGE]: Merge with lp:openobject-addons

6669. By Mayur Maheshwari(OpenERP) on 2012-09-07

[IMP]stock : improved tooltip in pot file

6668. By Mayur Maheshwari(OpenERP) on 2012-03-12

[FIX]stock: Improved help tool-tip

=== modified file 'stock/i18n/stock.pot'
--- stock/i18n/stock.pot	2012-08-08 14:46:13 +0000
+++ stock/i18n/stock.pot	2012-09-07 09:33:22 +0000
@@ -1162,8 +1162,8 @@
 #. module: stock
 #: help:stock.location,chained_company_id:0
 msgid ""
-"The company the Picking List containing the chained move will belong to "
-"(leave empty to use the default company determination rules"
+"Picking List containing the chained move will belong to this company "
+"( leave empty to use the default company determination rules )"
 msgstr ""
 
 #. module: stock
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2012-08-31 07:40:32 +0000
+++ stock/stock.py	2012-09-07 09:33:22 +0000
@@ -189,7 +189,7 @@
                 "by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
             ),
         '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)."),
-        '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'),
+        '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 )."),
         'chained_delay': fields.integer('Chaining Lead Time',help="Delay between original move and chained move in days"),
         'partner_id': fields.many2one('res.partner', 'Location Address',help="Address of  customer or supplier."),
         'icon': fields.selection(tools.icons, 'Icon', size=64,help="Icon show in  hierarchical tree view"),