X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fstock%2Fstock_view.xml;h=4264a4884367b33f78175fba27602b5af1d6ca70;hb=d47562af6fe35ffafb914521a3a643d0338b8520;hp=9990dd674b6e4ab4756b897256c060690ab583f5;hpb=89715842257e8eee5f28ddbc05d8d8c30e65d575;p=odoo%2Fodoo.git
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9990dd6..4264a48 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -6,13 +6,33 @@
groups="group_stock_manager,group_stock_user" sequence="5"
web_icon="images/warehouse.png"
web_icon_hover="images/warehouse-hover.png"/>
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
stock.inventory.line.tree
@@ -37,7 +57,7 @@
form
@@ -197,9 +216,9 @@
+ colspan="2"/>
+ context="{'type': 'move_history_ids'}" colspan="2"/>
@@ -227,11 +246,12 @@
stock.trackingform
- This is the list of all your packs. After having selected a Pack, you can get the up-stream or down-stream traceability of the products contained in the pack.
+ This is the list of all your packs. When you select a Pack, you can get the upstream or downstream traceability of the products contained in the pack.
@@ -254,7 +274,7 @@
search
-
+
@@ -309,8 +329,8 @@
-
-
+
+
@@ -321,9 +341,9 @@
-
-
-
+
+
+
@@ -362,7 +382,7 @@
search
-
+
@@ -372,7 +392,7 @@
-
+
@@ -386,10 +406,12 @@
form
- {'full':'1',"search_default_available":1}
- This is the list of all the production lots (serial numbers) you recorded. After having selected a lot, you can get the up-stream or down-stream traceability of the products contained in lot.
+ {"search_default_available":1}
+ This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers.
-
+
#
# Lot composition (history)
@@ -400,7 +422,7 @@
treemove_history_ids
-
+
@@ -414,7 +436,6 @@
-
@@ -425,7 +446,7 @@
treemove_history_ids2
-
+
@@ -443,6 +464,38 @@
+
+ Downstream traceability
+ ir.actions.act_window
+ stock.move
+ [('id','in',active_ids)]
+ tree
+
+
+
+
+ tree_but_action
+ stock.move
+ Downstream traceability
+
+
+
+
+ Upstream traceability
+ ir.actions.act_window
+ stock.move
+ [('id','in',active_ids)]
+ tree
+
+
+
+
+ tree_but_action
+ stock.move
+ Upstream traceability
+
+
+
stock.location.formstock.location
@@ -478,6 +531,9 @@
+
+
+
@@ -499,6 +555,7 @@
string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
+
@@ -526,10 +583,10 @@
form
- {'full':1, 'search_default_in_location':1}
- Define your locations in order to reflect to your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partners location (customers, suppliers) and virtual locations which are the counter-part of the stock operations like the manufacturing orders consummations, the inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location into the Stock location. Each report can be performed on physicals, partners or virtual locations.
+ {'search_default_in_location':1}
+ Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations.
-
+
stock.location.tree
@@ -549,9 +606,12 @@
[('location_id','=',False)]tree
- This is the structure of your company's warehouses and locations. You can click on a location in order to get the list of the products and their stock level in this particular location and all its children.
+ This is the structure of your company's warehouses and locations. You can click on a location to get the list of the products and their stock level in this particular location and all its children.
-
+
stock.warehouse
@@ -591,7 +651,7 @@
Create and manage your warehouses and assign them a location from here
-
+
stock.picking.calendar
@@ -611,8 +671,9 @@
stock.pickingtree
-
+
+
@@ -620,7 +681,7 @@
-
+
@@ -630,12 +691,13 @@
form
-
-
+
@@ -941,7 +996,7 @@
-
+
@@ -965,14 +1020,14 @@
search
-
-
-
-
+
+
+
+
-
+
@@ -981,7 +1036,7 @@
-
+
@@ -996,15 +1051,15 @@
- Outgoing Deliveries
+ Delivery Ordersstock.pickingir.actions.act_windowformtree,form,calendar[('type','=','out')]
- {'contact_display': 'partner_address', 'search_default_available': 1}
+ {'default_type': 'out', 'contact_display': 'partner_address', 'search_default_confirmed': 1, 'search_default_available': 1}
- This is the list of all delivery orders that must be prepared, according to your different sales orders and your logistics rules.
+ This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules.
@@ -1030,7 +1085,7 @@
stock.pickingtree
-
+
@@ -1055,7 +1110,7 @@
-
+
@@ -1067,7 +1122,7 @@
-
+
@@ -1123,7 +1178,7 @@
-
+
@@ -1136,7 +1191,7 @@
+ on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
-
+
-
-
-
-
+
+
@@ -1184,12 +1237,14 @@
search
-
-
+
+
+
+
@@ -1197,11 +1252,7 @@
-
-
-
-
-
+
@@ -1225,7 +1276,7 @@
[('type','=','in')]{'contact_display': 'partner_address',"search_default_available":1}
- 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.
+ 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.
@@ -1252,9 +1303,9 @@
search
-
-
-
+
+
+
@@ -1262,7 +1313,7 @@
-
+
@@ -1283,9 +1334,9 @@
formtree,form,calendar[('type','=','internal')]
- {'contact_display': 'partner_address',"search_default_available":1}
+ {'default_type': 'internal', 'contact_display': 'partner_address', 'search_default_available': 1}
- The Internal Moves lists all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has it's own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your pre-configured logistics rules but you can also record manual stock operations.
+ Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations.
@@ -1303,7 +1354,7 @@
-
+
stock.move.tree
@@ -1311,7 +1362,8 @@
tree
-
+
+
@@ -1329,7 +1381,6 @@
-
-
+
+
@@ -1390,7 +1441,7 @@
-
+
@@ -1403,7 +1454,7 @@
+ on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" colspan="3"/>
@@ -1626,22 +1668,20 @@
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
+
@@ -1661,22 +1701,20 @@
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
@@ -1697,9 +1735,9 @@
tree,form['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]
-
+
- You will find here the list of all products you are waiting for, according to your preceding purchase orders. 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.
+ 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.
@@ -1749,6 +1787,8 @@
tree,form
+
+
stock.locationProducts
-
@@ -1794,7 +1833,6 @@
stock.locationOpen Products
- Customers Packings
@@ -1803,7 +1841,7 @@
formtree,form,calendar[('type','=','out')]
- {'contact_display': 'partner',"search_default_available":1}
+ {'default_type': 'out', 'contact_display': 'partner',"search_default_available":1}
@@ -1832,9 +1870,9 @@
tree,form['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]
-
+
- The 'Deliver Products' menu lists all products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu.
+ 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).
@@ -1850,8 +1888,8 @@
-
-
+
+
@@ -1892,13 +1930,17 @@
stock.journalir.actions.act_windowform
- The stock journals system allows you assign each stock operation into a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc.
+ The stock journal system allows you to assign each stock operation to a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc.
+
+ Stock Management
+
+