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

[MERGE] procurement, product, stock: improve warehouse (polish3) 

bzr revid: rco@openerp.com-20111201095408-bxaqm81mdibxs8ih
This commit is contained in:
Raphael Collet 2011-12-01 10:54:08 +01:00
parent 0ba393d309 6965127b25
commit 1e679f3bbf
9 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/procurement/board_mrp_procurement_view.xml
View File

@ -16,7 +16,7 @@
<field name="inherit_id" ref="stock.board_warehouse_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/board/column/action[@string='Incoming Product']" position="before">
<xpath expr="/form/board/column/action[@string='Incoming Shipments']" position="before">
<action name="%(procurement_action_board)d" string="Procurements in Exception"/>
</xpath>
</field>

2
addons/product/product_data.xml
View File

@ -57,7 +57,7 @@
<field name="category_id" ref="product_uom_categ_kgm"/>
<!-- 'tonne' is the most common spelling in english-speaking countries,
the alternative is 'metric ton' in the US, abbreviated as 'mt' -->
<field name="name">tonne</field>
<field name="name">t</field>
<field name="factor" eval="0.001"/>
<field name="uom_type">bigger</field>
</record>

12
addons/stock/board_warehouse_view.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<record id="action_incoming_product_board" model="ir.actions.act_window">
<field name="name">Incoming Product</field>
<field name="name">Incoming Shipments</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -12,7 +12,7 @@
</record>
<record id="action_outgoing_product_board" model="ir.actions.act_window">
<field name="name">Outgoing Product</field>
<field name="name">Delivery Orders</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@ -28,7 +28,7 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
<field name="view_id" ref="stock.view_stock_graph_board"></field>
<field name="context">{'default_type':'in','search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
<field name="context">{'search_default_in':1}</field>
</record>
<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
<field name="name">Outgoing Products Delay</field>
@ -37,7 +37,7 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
<field name="view_id" ref="stock.view_stock_graph_board"></field>
<field name="context">{'default_type':'out','search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
<field name="context">{'search_default_out':1}</field>
</record>
<record id="board_warehouse_form" model="ir.ui.view">
<field name="name">board.warehouse.form</field>
@ -47,8 +47,8 @@
<form string="Warehouse board">
<board style="1-2">
<column>
<action name="%(action_incoming_product_board)d" string="Incoming Product"/>
<action name="%(action_outgoing_product_board)d" string="Outgoing Product"/>
<action name="%(action_incoming_product_board)d" string="Incoming Shipments"/>
<action name="%(action_outgoing_product_board)d" string="Delivery Orders"/>
</column>
<column>

21
addons/stock/stock_view.xml
View File

@ -1022,8 +1022,8 @@
<field name="arch" type="xml">
<search string="Picking list">
<group>
<filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
<filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
<filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
<filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
<filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
<separator orientation="vertical"/>
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
@ -1239,7 +1239,7 @@
<field name="arch" type="xml">
<search string="Incoming Shipments">
<group>
<filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
<filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
<filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
<separator orientation="vertical" />
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
@ -1277,7 +1277,7 @@
<field name="domain">[('type','=','in')]</field>
<field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
<field name="search_view_id" ref="view_picking_in_search"/>
<field name="help">The Incoming Shipments is the list of all orders you will receive from your supplier. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially.</field>
<field name="help">The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially.</field>
</record>
<record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
@ -1305,8 +1305,8 @@
<field name="arch" type="xml">
<search string="Internal Picking List">
<group>
<filter icon="terp-check" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
<filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
<filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
<filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
<separator orientation="vertical"/>
<field name="name"/>
<field name="origin"/>
@ -1670,7 +1670,8 @@
<field name="arch" type="xml">
<search string="Stock Moves">
<group>
<filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
<filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
<filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
<filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
<separator orientation="vertical"/>
<filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
@ -1702,7 +1703,7 @@
<field name="arch" type="xml">
<search string="Stock Moves">
<group>
<filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (available or not)"/>
<filter icon="terp-gtk-go-back-rtl" name="receive" string=" Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
<filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
<filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
@ -1735,7 +1736,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="context" eval="'{\'search_default_receive\':1, \'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
<field name="context" eval="'{\'search_default_receive\':1, \'search_default_available\':1, \'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
<field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
<field name="help">Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
</record>
@ -1870,7 +1871,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="context" eval="'{\'search_default_receive\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
<field name="context" eval="'{\'search_default_receive\':1,\'search_default_available\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
<field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
<field name="help">You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field).</field>
</record>

2
addons/stock/wizard/stock_move.py
View File

@ -254,7 +254,7 @@ class stock_move_split_lines_exist(osv.osv_memory):
_name = "stock.move.split.lines"
_description = "Stock move Split lines"
_columns = {
'name': fields.char('Tracking serial', size=64),
'name': fields.char('Production Lot', size=64),
'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
'wizard_id': fields.many2one('stock.move.split', 'Parent Wizard'),
'wizard_exist_id': fields.many2one('stock.move.split', 'Parent Wizard (for existing lines)'),

3
addons/stock/wizard/stock_partial_picking.py
View File

@ -22,13 +22,14 @@
import time
from osv import fields, osv
from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
import decimal_precision as dp
class stock_partial_picking_line(osv.TransientModel):
_name = "stock.partial.picking.line"
_rec_name = 'product_id'
_columns = {
'product_id' : fields.many2one('product.product', string="Product", required=True, ondelete='CASCADE'),
'quantity' : fields.float("Quantity", required=True),
'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Product UoM'), required=True),
'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True, ondelete='CASCADE'),
'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot', ondelete='CASCADE'),
'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete='CASCADE'),

6
addons/stock/wizard/stock_partial_picking_view.xml
View File

@ -36,9 +36,6 @@
<field name="product_id" />
<field name="quantity" />
<field name="product_uom" />
<field name="location_id" />
<field name="location_dest_id" />
<field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" />
<field name="update_cost" invisible="1"/>
<field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
<field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
@ -54,9 +51,6 @@
<field name="product_id" />
<field name="quantity" />
<field name="product_uom" />
<field name="location_id" />
<field name="location_dest_id" />
<field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="base.group_extended" />
<field name="update_cost" invisible="1"/>
<field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
<field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>

3
addons/stock/wizard/stock_return_picking.py
View File

@ -24,13 +24,14 @@ import time
from osv import osv,fields
from tools.translate import _
import decimal_precision as dp
class stock_return_picking_memory(osv.osv_memory):
_name = "stock.return.picking.memory"
_rec_name = 'product_id'
_columns = {
'product_id' : fields.many2one('product.product', string="Product", required=True),
'quantity' : fields.float("Quantity", required=True),
'quantity' : fields.float("Quantity", digits_compute=dp.get_precision('Product UoM'), required=True),
'wizard_id' : fields.many2one('stock.return.picking', string="Wizard"),
'move_id' : fields.many2one('stock.move', "Move"),
}

2
addons/stock/wizard/stock_splitinto.py
View File

@ -27,7 +27,7 @@ class stock_split_into(osv.osv_memory):
_name = "stock.split.into"
_description = "Split into"
_columns = {
'quantity': fields.float('Quantity',digits_compute=dp.get_precision('Product UOM')),
'quantity': fields.float('Quantity',digits_compute=dp.get_precision('Product UoM')),
}
_defaults = {
'quantity': lambda *x: 0,