@@ -126,7 +126,6 @@
-
diff --git a/addons/stock/product.py b/addons/stock/product.py
index c42e137e2fe..0dd44afdbda 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -234,6 +234,11 @@ class product_product(osv.osv):
'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
}
+ _defaults = {
+ # Dirty hack to avoid empty stat button in create view
+ 'qty_available_text': lambda *x: '0.0 On Hand',
+ }
+
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
if context is None:
@@ -381,6 +386,8 @@ class product_template(osv.osv):
_defaults = {
'sale_delay': 7,
+ # Dirty hack to avoid empty stat button in create view
+ 'qty_available_text': lambda *x: '0.0 On Hand',
}
def action_view_routes(self, cr, uid, ids, context=None):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d0293f159d6..3a29372c825 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -635,7 +635,7 @@ class stock_quant(osv.osv):
class stock_picking(osv.osv):
_name = "stock.picking"
_inherit = ['mail.thread']
- _description = "Picking List"
+ _description = "Transfer"
_order = "priority desc, date asc, id desc"
def _set_min_date(self, cr, uid, id, field, value, arg, context=None):
@@ -1685,7 +1685,7 @@ class stock_move(osv.osv):
'move_dest_id': fields.many2one('stock.move', 'Destination Move', help="Optional: next stock move when chaining them", select=True, copy=False),
'move_orig_ids': fields.one2many('stock.move', 'move_dest_id', 'Original Move', help="Optional: previous stock move when chaining them", select=True),
- 'picking_id': fields.many2one('stock.picking', 'Reference', select=True, states={'done': [('readonly', True)]}),
+ 'picking_id': fields.many2one('stock.picking', 'Reference Stock Move', select=True, states={'done': [('readonly', True)]}),
'note': fields.text('Notes'),
'state': fields.selection([('draft', 'New'),
('cancel', 'Cancelled'),
@@ -1705,7 +1705,7 @@ class stock_move(osv.osv):
'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
'split_from': fields.many2one('stock.move', string="Move Split From", help="Technical field used to track the origin of a split move, which can be useful in case of debug", copy=False),
'backorder_id': fields.related('picking_id', 'backorder_id', type='many2one', relation="stock.picking", string="Back Order of", select=True),
- 'origin': fields.char("Source"),
+ 'origin': fields.char("Source Document"),
'procure_method': fields.selection([('make_to_stock', 'Default: Take From Stock'), ('make_to_order', 'Advanced: Apply Procurement Rules')], 'Supply Method', required=True,
help="""By default, the system will take from the stock in the source location and passively wait for availability. The other possibility allows you to directly create a procurement on the source location (and thus ignore its current stock) to gather products. If we want to chain moves and have this one to wait for the previous, this second option should be chosen."""),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a95300d8744..6a903515129 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -338,26 +338,31 @@