odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] stock review: add missing INDEXes, improve tooltips, labels, remove unused allocation_method field 

bzr revid: odo@openerp.com-20100906135123-p4p25t0qi3o330mn
This commit is contained in:
Olivier Dony 2010-09-06 15:51:23 +02:00
parent 5ba2af5f41
commit bc240ec607
4 changed files with 68 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
addons/stock/stock.py
View File

@ -40,7 +40,7 @@ class stock_incoterms(osv.osv):
_columns = { _columns = {
'name': fields.char('Name', size=64, required=True, help="Incoterms are series of sales terms.They are used to divide transaction costs and responsibilities between buyer and seller and reflect state-of-the-art transportation practices."), 'name': fields.char('Name', size=64, required=True, help="Incoterms are series of sales terms.They are used to divide transaction costs and responsibilities between buyer and seller and reflect state-of-the-art transportation practices."),
'code': fields.char('Code', size=3, required=True, help="Code for Incoterms"), 'code': fields.char('Code', size=3, required=True, help="Code for Incoterms"),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the incoterms without removing it."), 'active': fields.boolean('Active', help="By unchecking the active field, you may hide an INCOTERM without deleting it."),
} }
_defaults = { _defaults = {
'active': True, 'active': True,
@ -168,17 +168,17 @@ class stock_location(osv.osv):
_columns = { _columns = {
'name': fields.char('Location Name', size=64, required=True, translate=True), 'name': fields.char('Location Name', size=64, required=True, translate=True),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the stock location without removing it."), 'active': fields.boolean('Active', help="By unchecking the active field, you may hide a location without deleting it."),
'usage': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True, 'usage': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True,
help=' * The \'Supplier Location\' Source of products received from suppliers. \ help="""* Supplier Location: Virtual location representing the source location for products coming from your suppliers
\n* The \'View \' Shows that the location is only an organizational node for the hierarchical structure, and can be involved in stock moves itself. \ \n* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products
\n* The \'Internal Location\' Locations for your own stock,.\ \n* Internal Location: Physical locations inside your own warehouses,
\n* The \'Customer Location\' Destination for products sent to customers.\ \n* Customer Location: Virtual location representing the destination location for products sent to your customers
\n* The \'Inventory\' The counterpart for inventory operations used to correct stock levels,. \ \n* Inventory: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)
\n* The \'Procurement\' The counterpart for procurement operations when you dont yet know the source (supplier or production). Products in this location should be zero after the scheduler run completes. \ \n* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running.
\n* The \'Production\' The counterpart for production operations; receipt of raw material and sending finished products. \ \n* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products
'), """, select = True),
'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=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"),
'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock"), 'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock"),
@ -221,13 +221,12 @@ class stock_location(osv.osv):
'parent_right': fields.integer('Right Parent', select=1), 'parent_right': fields.integer('Right Parent', select=1),
'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"), 'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"),
'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"), 'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"),
'company_id': fields.many2one('res.company', 'Company', select=1, help='Let this field empty if this location is shared for every companies'), 'company_id': fields.many2one('res.company', 'Company', select=1, help='Let this field empty if this location is shared between all companies'),
'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'), 'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
} }
_defaults = { _defaults = {
'active': True, 'active': True,
'usage': 'internal', 'usage': 'internal',
'allocation_method': 'fifo',
'chained_location_type': 'none', 'chained_location_type': 'none',
'chained_auto_packing': 'manual', 'chained_auto_packing': 'manual',
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.location', context=c), 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.location', context=c),
@ -286,6 +285,9 @@ class stock_location(osv.osv):
pricetype = self.pool.get('product.price.type').browse(cr, uid, price_type_id) pricetype = self.pool.get('product.price.type').browse(cr, uid, price_type_id)
context['currency_id'] = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id context['currency_id'] = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
# To be able to offer recursive or non-recursive reports we need to prevent recursive quantities by default
context['compute_child'] = False
if not product_ids: if not product_ids:
product_ids = product_obj.search(cr, uid, []) product_ids = product_obj.search(cr, uid, [])
@ -493,8 +495,8 @@ class stock_tracking(osv.osv):
return sequence + str(self.checksum(sequence)) return sequence + str(self.checksum(sequence))
_columns = { _columns = {
'name': fields.char('Tracking ID', size=64, required=True, select=True), 'name': fields.char('Pack Reference', size=64, required=True, select=True),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the pack without removing it."), 'active': fields.boolean('Active', help="By unchecking the active field, you may hide a pack without deleting it."),
'serial': fields.char('Reference', size=64, select=True), 'serial': fields.char('Reference', size=64, select=True),
'move_ids': fields.one2many('stock.move', 'tracking_id', 'Moves for this pack', readonly=True), 'move_ids': fields.one2many('stock.move', 'tracking_id', 'Moves for this pack', readonly=True),
'date': fields.datetime('Creation Date', required=True), 'date': fields.datetime('Creation Date', required=True),
@ -620,15 +622,15 @@ class stock_picking(osv.osv):
_columns = { _columns = {
'name': fields.char('Reference', size=64, select=True), 'name': fields.char('Reference', size=64, select=True),
'origin': fields.char('Origin', size=64, help="Reference of the document that produced this picking."), 'origin': fields.char('Origin', size=64, help="Reference of the document that produced this picking.", select=True),
'backorder_id': fields.many2one('stock.picking', 'Back Order of', help="If this picking was split this field links to the picking that contains the other part that has been processed already."), 'backorder_id': fields.many2one('stock.picking', 'Back Order of', help="If this picking was split this field links to the picking that contains the other part that has been processed already.", select=True),
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."), 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
'note': fields.text('Notes'), 'note': fields.text('Notes'),
'stock_journal_id': fields.many2one('stock.journal','Stock Journal'), 'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True),
'location_id': fields.many2one('stock.location', 'Location', help="Keep empty if you produce at the location where the finished products are needed." \ 'location_id': fields.many2one('stock.location', 'Location', help="Keep empty if you produce at the location where the finished products are needed." \
"Set a location if you produce at a fixed location. This can be a partner location " \ "Set a location if you produce at a fixed location. This can be a partner location " \
"if you subcontract the manufacturing operations."), "if you subcontract the manufacturing operations.", select=True),
'location_dest_id': fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the finished products."), 'location_dest_id': fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the finished products.", select=True),
'move_type': fields.selection([('direct', 'Direct Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"), 'move_type': fields.selection([('direct', 'Direct Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
'state': fields.selection([ 'state': fields.selection([
('draft', 'Draft'), ('draft', 'Draft'),
@ -646,7 +648,7 @@ class stock_picking(osv.osv):
"* Cancelled: has been cancelled, can't be confirmed anymore"), "* Cancelled: has been cancelled, can't be confirmed anymore"),
'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date", 'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
method=True, store=True, type='datetime', string='Expected Date', select=1, help="Expected date for the picking to be processed. Will be set to date of actual processing if not specified."), method=True, store=True, type='datetime', string='Expected Date', select=1, help="Expected date for the picking to be processed. Will be set to date of actual processing if not specified."),
'date': fields.datetime('Order Date', help="Date of Order"), 'date': fields.datetime('Order Date', help="Date of Order", select=True),
'date_done': fields.datetime('Date Done', help="Date of Completion"), 'date_done': fields.datetime('Date Done', help="Date of Completion"),
'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date", 'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
method=True, store=True, type='datetime', string='Max. Expected Date', select=2), method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
@ -658,7 +660,7 @@ class stock_picking(osv.osv):
("2binvoiced", "To Be Invoiced"), ("2binvoiced", "To Be Invoiced"),
("none", "Not from Picking")], "Invoice Status", ("none", "Not from Picking")], "Invoice Status",
select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}), select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
'company_id': fields.many2one('res.company', 'Company', required=True, select=1), 'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
} }
_defaults = { _defaults = {
'name': lambda self, cr, uid, context: '/', 'name': lambda self, cr, uid, context: '/',
@ -1342,14 +1344,14 @@ class stock_production_lot(osv.osv):
return ids return ids
_columns = { _columns = {
'name': fields.char('Serial', size=64, required=True), 'name': fields.char('Serial Number', size=64, required=True, help="Unique serial number"),
'ref': fields.char('Internal Reference', size=256), 'ref': fields.char('Internal Reference', size=256, help="Internal reference number in case it differs from the manufacturer's serial number"),
'prefix': fields.char('Prefix', size=64), 'prefix': fields.char('Prefix', size=64, help="Optional prefix to prepend when displaying this serial number"),
'product_id': fields.many2one('product.product', 'Product', required=True), 'product_id': fields.many2one('product.product', 'Product', required=True),
'date': fields.datetime('Created Date', required=True), 'date': fields.datetime('Creation Date', required=True),
'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select="2"), 'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select="2"),
'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'), 'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
'company_id': fields.many2one('res.company','Company',select=1), 'company_id': fields.many2one('res.company', 'Company', select=True),
} }
_defaults = { _defaults = {
'date': time.strftime('%Y-%m-%d %H:%M:%S'), 'date': time.strftime('%Y-%m-%d %H:%M:%S'),
@ -1357,7 +1359,7 @@ class stock_production_lot(osv.osv):
'product_id': lambda x, y, z, c: c.get('product_id', False), 'product_id': lambda x, y, z, c: c.get('product_id', False),
} }
_sql_constraints = [ _sql_constraints = [
('name_ref_uniq', 'unique (name, ref)', 'The serial/ref must be unique !'), ('name_ref_uniq', 'unique (name, ref)', _('The combination of serial number and internal reference must be unique !')),
] ]
def action_traceability(self, cr, uid, ids, context={}): def action_traceability(self, cr, uid, ids, context={}):
""" It traces the information of a product """ It traces the information of a product
@ -1380,7 +1382,7 @@ class stock_production_lot_revision(osv.osv):
'name': fields.char('Revision Name', size=64, required=True), 'name': fields.char('Revision Name', size=64, required=True),
'description': fields.text('Description'), 'description': fields.text('Description'),
'date': fields.date('Revision Date'), 'date': fields.date('Revision Date'),
'indice': fields.char('Revision', size=16), 'indice': fields.char('Revision Number', size=16),
'author_id': fields.many2one('res.users', 'Author'), 'author_id': fields.many2one('res.users', 'Author'),
'lot_id': fields.many2one('stock.production.lot', 'Production lot', select=True, ondelete='cascade'), 'lot_id': fields.many2one('stock.production.lot', 'Production lot', select=True, ondelete='cascade'),
'company_id': fields.related('lot_id','company_id',type='many2one',relation='res.company',string='Company',store=True), 'company_id': fields.related('lot_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
@ -1447,7 +1449,7 @@ class stock_move(osv.osv):
'name': fields.char('Name', size=64, required=True, select=True), 'name': fields.char('Name', size=64, required=True, select=True),
'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'), 'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
'date': fields.datetime('Creation Date'), 'date': fields.datetime('Creation Date', select=True),
'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."), 'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"), 'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
'product_id': fields.many2one('product.product', 'Product', required=True, select=True), 'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
@ -1462,12 +1464,12 @@ class stock_move(osv.osv):
'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True, select=True, help="Location where the system will stock the finished products."), 'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True, select=True, help="Location where the system will stock the finished products."),
'address_id': fields.many2one('res.partner.address', 'Destination Address', help="Optional address where goods are to be delivered, specifically used for allotment"), 'address_id': fields.many2one('res.partner.address', 'Destination Address', help="Optional address where goods are to be delivered, specifically used for allotment"),
'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production"), 'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production", select=True),
'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, help="Logistical shipping unit: pallet, box, pack ..."), 'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, help="Logistical shipping unit: pallet, box, pack ..."),
'auto_validate': fields.boolean('Auto Validate'), 'auto_validate': fields.boolean('Auto Validate'),
'move_dest_id': fields.many2one('stock.move', 'Destination Move', help="Optional: next stock move when chaining them"), 'move_dest_id': fields.many2one('stock.move', 'Destination Move', help="Optional: next stock move when chaining them", select=True),
'move_history_ids': fields.many2many('stock.move', 'stock_move_history_ids', 'parent_id', 'child_id', 'Move History (child moves)'), 'move_history_ids': fields.many2many('stock.move', 'stock_move_history_ids', 'parent_id', 'child_id', 'Move History (child moves)'),
'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'), 'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
'picking_id': fields.many2one('stock.picking', 'Picking List', select=True), 'picking_id': fields.many2one('stock.picking', 'Picking List', select=True),
@ -1477,10 +1479,12 @@ class stock_move(osv.osv):
\nThe state is \'Waiting\' if the move is waiting for another one.'), \nThe state is \'Waiting\' if the move is waiting for another one.'),
'price_unit': fields.float('Unit Price', 'price_unit': fields.float('Unit Price',
digits_compute= dp.get_precision('Account')), digits_compute= dp.get_precision('Account')),
'company_id': fields.many2one('res.company', 'Company', required=True, select=1), 'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner", store=True), 'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner", store=True, select=True),
'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"), 'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order", select=True),
'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin",store=True), 'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin", store=True),
# used for colors in tree views:
'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped'), 'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped'),
} }
_constraints = [ _constraints = [
@ -2307,13 +2311,13 @@ class stock_inventory(osv.osv):
_name = "stock.inventory" _name = "stock.inventory"
_description = "Inventory" _description = "Inventory"
_columns = { _columns = {
'name': fields.char('Inventory', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), 'name': fields.char('Inventory Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
'date': fields.datetime('Date create', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'date': fields.datetime('Creation Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'date_done': fields.datetime('Date done'), 'date_done': fields.datetime('Date done'),
'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}), 'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'), 'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True), 'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True, select=True),
'company_id': fields.many2one('res.company','Company',required=True,select=1), 'company_id': fields.many2one('res.company','Company',required=True,select=True),
} }
_defaults = { _defaults = {
'date': time.strftime('%Y-%m-%d %H:%M:%S'), 'date': time.strftime('%Y-%m-%d %H:%M:%S'),
@ -2405,10 +2409,10 @@ class stock_inventory_line(osv.osv):
_columns = { _columns = {
'inventory_id': fields.many2one('stock.inventory', 'Inventory', ondelete='cascade', select=True), 'inventory_id': fields.many2one('stock.inventory', 'Inventory', ondelete='cascade', select=True),
'location_id': fields.many2one('stock.location', 'Location', required=True), 'location_id': fields.many2one('stock.location', 'Location', required=True),
'product_id': fields.many2one('product.product', 'Product', required=True), 'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
'product_qty': fields.float('Quantity'), 'product_qty': fields.float('Quantity'),
'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True), 'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True),
'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"), 'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
'state': fields.related('inventory_id','state',type='char',string='State',readonly=True), 'state': fields.related('inventory_id','state',type='char',string='State',readonly=True),
} }
@ -2438,8 +2442,8 @@ class stock_warehouse(osv.osv):
_name = "stock.warehouse" _name = "stock.warehouse"
_description = "Warehouse" _description = "Warehouse"
_columns = { _columns = {
'name': fields.char('Name', size=60, required=True), 'name': fields.char('Name', size=128, required=True, select=True),
'company_id': fields.many2one('res.company','Company',required=True,select=1), 'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
'partner_address_id': fields.many2one('res.partner.address', 'Owner Address'), 'partner_address_id': fields.many2one('res.partner.address', 'Owner Address'),
'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True, domain=[('usage','<>','view')]), 'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True, domain=[('usage','<>','view')]),
'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','<>','view')]), 'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage','<>','view')]),
@ -2506,7 +2510,7 @@ stock_picking_move_wizard()
class report_products_to_received_planned(osv.osv): class report_products_to_received_planned(osv.osv):
_name = "report.products.to.received.planned" _name = "report.products.to.received.planned"
_description = "Product to Received Vs Planned" _description = "Received Products vs Planned"
_auto = False _auto = False
_columns = { _columns = {
'date':fields.date('Date'), 'date':fields.date('Date'),
@ -2540,7 +2544,7 @@ report_products_to_received_planned()
class report_delivery_products_planned(osv.osv): class report_delivery_products_planned(osv.osv):
_name = "report.delivery.products.planned" _name = "report.delivery.products.planned"
_description = "Number of Delivery products vs planned" _description = "Delivered products vs Planned"
_auto = False _auto = False
_columns = { _columns = {
'date':fields.date('Date'), 'date':fields.date('Date'),

1
addons/stock/stock_demo.xml
View File

@ -224,7 +224,6 @@
</record> </record>
<record id="stock_location_shop0" model="stock.location"> <record id="stock_location_shop0" model="stock.location">
<field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/> <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
<field eval="&quot;&quot;&quot;fifo&quot;&quot;&quot;" name="allocation_method"/>
<field name="location_id" ref="stock.stock_location_company"/> <field name="location_id" ref="stock.stock_location_company"/>
<field name="company_id" ref="res_company_shop0"/> <field name="company_id" ref="res_company_shop0"/>
<field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/> <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>

8
addons/stock/stock_report.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/> <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/>
<report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/> <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
<report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/> <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
<report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/> <report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Inventory" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
<report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/> <!-- ODO: Useless report, duplicates the previous one? <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/> -->
<report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content (With children)" rml="stock/report/lot_overview_all.rml"/> <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Inventory (with child locations)" rml="stock/report/lot_overview_all.rml"/>
<report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Inventory" rml="stock/report/stock_inventory_move.rml"/> <report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Inventory" rml="stock/report/stock_inventory_move.rml"/>
</data> </data>
</openerp> </openerp>

24
addons/stock/stock_view.xml
View File

@ -377,16 +377,20 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Stock Location"> <form string="Stock Location">
<field name="name"/> <group col="2" colspan="2">
<field name="active" groups="base.group_extended"/> <separator string="Location" colspan="2"/>
<newline/> <field name="name"/>
<field name="usage"/> <field name="usage"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="location_id"/>
<field name="location_id"/> </group>
<field name="address_id" context="{'contact_display':'partner'}"/> <group col="4" colspan="2">
<field name="icon" groups="base.group_extended"/> <separator string="Additional Information" colspan="4"/>
<field name="scrap_location"/> <field name="address_id" context="{'contact_display':'partner'}" colspan="4"/>
<newline/> <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="4"/>
<field name="icon" groups="base.group_extended" colspan="4"/>
<field name="scrap_location" groups="base.group_extended"/>
<field name="active" groups="base.group_extended"/>
</group>
<group col="2" colspan="2" groups="base.group_extended"> <group col="2" colspan="2" groups="base.group_extended">
<separator string="Chained Locations" colspan="2"/> <separator string="Chained Locations" colspan="2"/>
<field name="chained_location_type"/> <field name="chained_location_type"/>