← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-765559-ron into lp:openobject-addons

 

Rohan Nayani(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-765559-ron into lp:openobject-addons.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)
Related bugs:
  Bug #765559 in OpenERP Addons: "locations cannot be sorted"
  https://bugs.launchpad.net/openobject-addons/+bug/765559

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-765559-ron/+merge/59498
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-765559-ron/+merge/59498
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-765559-ron.
=== modified file 'stock/stock.py'
--- stock/stock.py	2011-04-07 11:40:14 +0000
+++ stock/stock.py	2011-04-29 12:14:23 +0000
@@ -164,7 +164,7 @@
                        \n* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products
                       """, select = True),
          # temporarily removed, as it's unused: 'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
-        'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"),
+        'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name", store=True),
 
         'stock_real': fields.function(_product_value, method=True, type='float', string='Real Stock', multi="stock"),
         'stock_virtual': fields.function(_product_value, method=True, type='float', string='Virtual Stock', multi="stock"),

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2011-04-07 11:40:14 +0000
+++ stock/stock_view.xml	2011-04-29 12:14:23 +0000
@@ -559,6 +559,7 @@
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
                     <field name="name"/>
+                    <field name="complete_name" string="Parent Location"/>
                 </search>
             </field>
         </record>


Follow ups