From ae5bbd49db33cf0853c444aa144242e362a0c512 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 27 Jun 2007 13:59:46 +0000
Subject: [PATCH] Renamed picking by packing in labels Better views

bzr revid: fp@tinyerp.com-e26a6dfac35aa2ab91aa1c16e4658d5846b648a0
---
 addons/delivery/__terp__.py                   |  2 +-
 addons/delivery/delivery_view.xml             |  4 +-
 addons/esale_ez/esale.py                      |  2 +-
 addons/esale_osc/esale_osc_view.xml           |  2 +-
 addons/mrp/mrp.py                             |  4 +-
 addons/mrp/wizard/wizard_procurement.py       |  2 +-
 addons/mrp/wizard/wizard_schedulers_all.py    |  2 +-
 addons/product/product.py                     |  2 +-
 addons/purchase/stock_view.xml                |  4 +-
 .../purchase_journal_view.xml                 |  4 +-
 addons/sale/sale.py                           | 18 +++----
 addons/sale/sale_view.xml                     |  2 +-
 addons/sale_crm/wizard/makesale.py            |  2 +-
 addons/sale_journal/__terp__.py               |  4 +-
 addons/sale_journal/picking_journal_view.xml  | 31 +++++------
 .../picking_journal_view_report.xml           | 32 ++++++------
 addons/sale_journal/sale_journal.py           |  2 +-
 addons/sale_journal/sale_journal_inherit.py   |  2 +-
 .../sale_journal_picking_report.py            |  4 +-
 addons/sale_journal/sale_journal_view.xml     | 18 +++----
 addons/stock/report/picking.xsl               |  4 +-
 addons/stock/stock.py                         |  8 +--
 addons/stock/stock_report.xml                 |  2 +-
 addons/stock/stock_sequence.xml               | 14 ++---
 addons/stock/stock_view.xml                   | 52 +++++++++----------
 addons/stock/stock_wizard.xml                 |  6 +--
 addons/stock/wizard/wizard_partial_picking.py |  4 +-
 addons/stock/wizard/wizard_return.py          |  2 +-
 28 files changed, 118 insertions(+), 117 deletions(-)

diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py
index d61f08f5a0c..0436dcb5d3f 100644
--- a/addons/delivery/__terp__.py
+++ b/addons/delivery/__terp__.py
@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Generic Modules/Sales & Purchases",
-	"description": "Allows to add delivery methods in sales order and pickings. You can define your own carrier and delivery grids for prices. When creating invoices from pickings, Tiny ERP is able to add and compute the shipping line.",
+	"description": "Allows to add delivery methods in sales order and packings. You can define your own carrier and delivery grids for prices. When creating invoices from pickings, Tiny ERP is able to add and compute the shipping line.",
 	"depends" : ["sale","purchase", "stock",],
 	"init_xml" : ["delivery_data.xml"],
 	"demo_xml" : ["delivery_demo.xml"],
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 27c307940e2..0e78b34adfd 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -154,7 +154,7 @@
 		</record>
 
 	<record model="ir.actions.act_window" id="action_picking_tree4">
-		<field name="name">Pickings to invoice</field>
+		<field name="name">Packings to invoice</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -162,7 +162,7 @@
 		<field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done')]</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Picking Lists/Sending Goods/Pickings to invoice"
+		name="Inventory Control/Packing lists/Sending Goods/Packings to invoice"
 		id="menu_action_picking_tree3"
 		action="action_picking_tree4"/>
 
diff --git a/addons/esale_ez/esale.py b/addons/esale_ez/esale.py
index 454da302e80..893862a4185 100644
--- a/addons/esale_ez/esale.py
+++ b/addons/esale_ez/esale.py
@@ -128,7 +128,7 @@ class esale_user(osv.osv):
 		'picking_policy': fields.selection([
 			('direct','Direct Delivery'),
 			('one','All at once')
-		], 'Picking Policy', required=True ),
+		], 'Packing Policy', required=True ),
 		'order_policy': fields.selection([
 			('prepaid','Pay before delivery'),
 			('manual','Shipping & Manual Invoice'),
diff --git a/addons/esale_osc/esale_osc_view.xml b/addons/esale_osc/esale_osc_view.xml
index 8076e0df865..d74aae0aa55 100644
--- a/addons/esale_osc/esale_osc_view.xml
+++ b/addons/esale_osc/esale_osc_view.xml
@@ -179,7 +179,7 @@
 					<page string="History">
 						<separator colspan="4" string="Generated Invoices"/>
 						<field colspan="4" name="invoice_ids" nolabel="1"/>
-						<separator colspan="4" string="Generated Pickings"/>
+						<separator colspan="4" string="Generated Packings"/>
 						<field colspan="4" name="picking_ids" nolabel="1"/>
 					</page>
 				</notebook>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 3eb26b41d3e..ba4718a6e88 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -324,7 +324,7 @@ class mrp_production(osv.osv):
 
 		'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
 
-		'picking_id': fields.many2one('stock.picking', 'Picking list'),
+		'picking_id': fields.many2one('stock.picking', 'Packing list'),
 		'move_prod_id': fields.many2one('stock.move', 'Move Product'),
 		'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products Consummed'),
 
@@ -332,7 +332,7 @@ class mrp_production(osv.osv):
 		'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Material Planned'),
 		'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
 
-		'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'State', readonly=True)
+		'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'State', readonly=True)
 	}
 	_defaults = {
 		'priority': lambda *a: '1',
diff --git a/addons/mrp/wizard/wizard_procurement.py b/addons/mrp/wizard/wizard_procurement.py
index b5cfbf534c8..0398090880b 100644
--- a/addons/mrp/wizard/wizard_procurement.py
+++ b/addons/mrp/wizard/wizard_procurement.py
@@ -48,7 +48,7 @@ parameter_fields = {
 	'po_cycle': {'string':'PO Cycle', 'type':'float', 'required':True, 'default': lambda *a: 1.0},
 	'po_lead': {'string':'PO Lead Time', 'type':'float', 'required':True, 'default': lambda *a: 1.0},
 	'security_lead': {'string':'Security Days', 'type':'float', 'required':True, 'default': lambda *a: 5.0},
-	'picking_lead': {'string':'Picking Lead Time', 'type':'float', 'required':True, 'default': lambda *a: 1.0},
+	'picking_lead': {'string':'Packing Lead Time', 'type':'float', 'required':True, 'default': lambda *a: 1.0},
 	'user_id': {'string':'Send Result To', 'type':'many2one', 'relation':'res.users', 'default': lambda uid,data,state: uid},
 }
 
diff --git a/addons/mrp/wizard/wizard_schedulers_all.py b/addons/mrp/wizard/wizard_schedulers_all.py
index cd0ab566daf..b2dc6634823 100644
--- a/addons/mrp/wizard/wizard_schedulers_all.py
+++ b/addons/mrp/wizard/wizard_schedulers_all.py
@@ -50,7 +50,7 @@ parameter_fields = {
 	'po_cycle': {'string':'PO Cycle', 'type':'float', 'required':True, 'default': lambda *a: 1.0},
 	'po_lead': {'string':'PO Lead Time', 'type':'float', 'required':True, 'default': lambda *a: 1.0},
 	'security_lead': {'string':'Security Days', 'type':'float', 'required':True, 'default': lambda *a: 50.0},
-	'picking_lead': {'string':'Picking Lead Time', 'type':'float', 'required':True, 'default': lambda *a: 1.0},
+	'picking_lead': {'string':'Packing Lead Time', 'type':'float', 'required':True, 'default': lambda *a: 1.0},
 	'automatic': {'string': 'Automatic orderpoint', 'type': 'boolean', 'help': 'Triggers an automatic procurement for all products that have a virtual stock under 0.', 'default': lambda *a: False},
 	'user_id': {'string':'Send Result To', 'type':'many2one', 'relation':'res.users', 'default': lambda uid,data,state: uid},
 }
diff --git a/addons/product/product.py b/addons/product/product.py
index 76250d7219d..df3061946ae 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -309,7 +309,7 @@ class product_product(osv.osv):
 		'variants': fields.char('Variants', size=64),
 		'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
 		'ean13': fields.char('EAN13', size=13),
-		'packaging' : fields.one2many('product.packaging', 'product_id', 'Palettization', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
+		'packaging' : fields.one2many('product.packaging', 'product_id', 'Palettization', help="Gives the different ways to package the same product. This has no impact on the packing order and is mainly used if you use the EDI module."),
 		'price_extra': fields.float('Price Extra', digits=(16, int(config['price_accuracy']))),
 		'price_margin': fields.float('Price Margin', digits=(16, int(config['price_accuracy']))),
 	}
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 382966f9fbb..c8100dbff18 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -2,7 +2,7 @@
 <data>
 
 	<record model="ir.ui.view" id="stock_picking_inherit_purchase">
-		<field name="name">stock.picking.form</field>
+		<field name="name">Packing list</field>
 		<field name="model">stock.picking</field>
 		<field name="type">form</field>
 		<field name="inherit_id" ref="stock.view_picking_form"/>
@@ -13,7 +13,7 @@
 		</field>
 	</record>
 
-	<act_window name="Pickings"
+	<act_window name="Packings"
 		domain="[('purchase_id', '=', active_id)]"
 		res_model="stock.picking"
 		src_model="purchase.order"
diff --git a/addons/purchase_journal/purchase_journal_view.xml b/addons/purchase_journal/purchase_journal_view.xml
index 5c83f132583..10e23fd560a 100644
--- a/addons/purchase_journal/purchase_journal_view.xml
+++ b/addons/purchase_journal/purchase_journal_view.xml
@@ -221,13 +221,13 @@
 		src_model="purchase_journal.purchase.journal"
 		id="act_purchase_journal_purchase_journal_2_purchase_order_approved"/>
 
-	<act_window name="Assigned pickings"
+	<act_window name="Assigned packings"
 		domain="[('purchase_journal_id', '=', active_id),('state', '=', 'assigned')]"
 		res_model="stock.picking"
 		src_model="purchase_journal.purchase.journal"
 		id="act_purchase_journal_purchase_journal_2_stock_picking_assigned"/>
 
-	<act_window name="Confirmed pickings"
+	<act_window name="Confirmed packings"
 		domain="[('purchase_journal_id', '=', active_id),('state', '=', 'confirmed')]"
 		res_model="stock.picking"
 		src_model="purchase_journal.purchase.journal"
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b1e38f5e476..d3d0965ed1e 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -116,7 +116,7 @@ class sale_order(osv.osv):
 			('invoice_except','Invoice Exception'),
 			('done','Done'),
 			('cancel','Cancel')
-			], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to be on the date 'Date Ordered'.", select=True),
+			], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the packing list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to be on the date 'Date Ordered'.", select=True),
 		'date_order':fields.date('Date Ordered', required=True, readonly=True, states={'draft':[('readonly',False)]}),
 
 		'user_id':fields.many2one('res.users', 'Salesman', states={'draft':[('readonly',False)]}, select=True),
@@ -126,24 +126,24 @@ class sale_order(osv.osv):
 		'partner_shipping_id':fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
 
 		'incoterm': fields.selection(_incoterm_get, 'Incoterm',size=3),
-		'picking_policy': fields.selection([('direct','Direct Delivery'),('one','All at once')], 'Picking Policy', required=True ),
+		'picking_policy': fields.selection([('direct','Direct Delivery'),('one','All at once')], 'Packing Policy', required=True ),
 		'order_policy': fields.selection([
 			('prepaid','Invoice before delivery'),
 			('manual','Shipping & Manual Invoice'),
 			('postpaid','Automatic Invoice after delivery'),
-			('picking','Invoice from the pickings'),
+			('picking','Invoice from the packings'),
 		], 'Shipping Policy', required=True, readonly=True, states={'draft':[('readonly',False)]},
 					help="""The Shipping Policy is used to synchronise invoice and delivery operations.
-  - The 'Pay before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.
-  - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
-  - The 'Invoice after delivery' choice will generate the draft invoice after the picking list have been finished.
-  - The 'Invoice from the pickings' choice is used to create an invoice during the picking process."""),
+  - The 'Pay before delivery' choice will first generate the invoice and then generate the packing order after the payment of this invoice.
+  - The 'Shipping & Manual Invoice' will create the packing order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
+  - The 'Invoice after delivery' choice will generate the draft invoice after the packing list have been finished.
+  - The 'Invoice from the packings' choice is used to create an invoice during the packing process."""),
 		'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft':[('readonly',False)]}),
 		'project_id':fields.many2one('account.analytic.account', 'Profit/Cost Center', readonly=True, states={'draft':[('readonly', False)]}),
 
 		'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft':[('readonly',False)]}),
 		'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoice', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
-		'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
+		'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Packing List', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
 
 		'shipped':fields.boolean('Picked', readonly=True),
 		'invoiced':fields.boolean('Paid', readonly=True),
@@ -297,7 +297,7 @@ class sale_order(osv.osv):
 				if pick.state not in ('draft','cancel'):
 					raise osv.except_osv(
 						'Could not cancel sale order !',
-						'You must first cancel all pickings attached to this sale order.')
+						'You must first cancel all packings attached to this sale order.')
 			for r in self.read(cr,uid,ids,['picking_ids']):
 				for pick in r['picking_ids']:
 					wf_service = netsvc.LocalService("workflow")
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 60504041d3e..9587dfae9d1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -171,7 +171,7 @@
 					<page string="History">
 						<separator string="Generated Invoices" colspan="4"/>
 						<field name="invoice_ids" colspan="4" nolabel="1"/>
-						<separator string="Generated Pickings" colspan="4"/>
+						<separator string="Generated packings" colspan="4"/>
 						<field name="picking_ids" colspan="4" nolabel="1"/>
 					</page>
 				</notebook>
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index 5aec9c1d666..3696c076fc2 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -47,7 +47,7 @@ sale_fields = {
 	'name' : {'string' : 'Order name', 'type': 'char'},
 	'shop_id' : {'string' : 'Shop', 'type' : 'many2one', 'relation' : 'sale.shop'},
 	'partner_id' : {'string' : 'Partner', 'type' : 'many2one', 'relation' : 'res.partner', 'readonly':True},
-	'picking_policy': {'string': 'Picking policy', 'type': 'selection', 'selection' : [('direct','Direct Delivery'),('one','All at once')]},
+	'picking_policy': {'string': 'Packing policy', 'type': 'selection', 'selection' : [('direct','Direct Delivery'),('one','All at once')]},
 }
 
 ack_form = """<?xml version="1.0"?>
diff --git a/addons/sale_journal/__terp__.py b/addons/sale_journal/__terp__.py
index 1c52f3b8db6..bd2f08845d2 100644
--- a/addons/sale_journal/__terp__.py
+++ b/addons/sale_journal/__terp__.py
@@ -13,7 +13,7 @@
 	"update_xml" : ["sale_journal_view.xml","picking_journal_view.xml","picking_journal_view_report.xml"],
 	"description" : """
 	The sale journal modules allows you to categorize your
-	sales and deliveries (pickings) between different journals.
+	sales and deliveries (packing lists) between different journals.
 	This module is very helpfull for bigger companies that
 	works by departments.
 
@@ -25,7 +25,7 @@
 	* draft, open, cancel, done.
 
 	Batch operations can be processed on the different journals to
-	confirm all sales at once, to validate or invoice pickings, ...
+	confirm all sales at once, to validate or invoice packings, ...
 
 	It also supports batch invoicing methods that can be configured by
 	partners and sales orders, examples:
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index f12722431bc..76fea5a0dbf 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -6,7 +6,7 @@
 		<field name="model">sale_journal.picking.journal</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
-			<form string="picking Journal">
+			<form string="Packing Journal">
 				<notebook>
 				<page string="Journal">
 					<separator string="Journal Information" colspan="4"/>
@@ -24,8 +24,8 @@
 						<button name="button_draft" string="Set to Draft" states="close,open" type="object"/>
 					</group>
 				</page>
-				<page string="Pickings">
-					<button string="Cancel Pickings" name="button_picking_cancel" states="draft,open" type="object"/>
+				<page string="Packings">
+					<button string="Cancel Packings" name="button_picking_cancel" states="draft,open" type="object"/>
 					<newline/>
 					<field name="picking_stats_ids" colspan="4" nolabel="1"/>
 				</page><page string="Notes">
@@ -40,7 +40,7 @@
 		<field name="model">sale_journal.picking.journal</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
-			<tree string="Picking Journal">
+			<tree string="Packing Journal">
 				<field name="name" select="1"/>
 				<field name="code" select="1"/>
 				<field name="user_id" select="1"/>
@@ -50,67 +50,68 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="action_definition_picking_journal">
-		<field name="name">sale_journal.picking.journal.tree</field>
+		<field name="name">Packings journals</field>
 		<field name="res_model">sale_journal.picking.journal</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Configuration/Pickings Journals"
+		name="Inventory Control/Configuration/Packings Journals"
 		id="menu_definition_journal_pickings"
 		action="action_definition_picking_journal"/>
 
 
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree">
-		<field name="name">sale_journal.picking.journal.tree</field>
+		<field name="name">Packings by journal</field>
 		<field name="res_model">sale_journal.picking.journal</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[]</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Picking Lists/Pickings by Journal"
+		name="Inventory Control/Packing lists/Packings by Journal"
 		id="menu_definition_journal_picking_by_journal"
 		action="action_definition_picking_journal_tree"/>
 
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_my">
-		<field name="name">sale_journal.picking.journal.tree.my</field>
+		<field name="name">My open packing journals</field>
 		<field name="res_model">sale_journal.picking.journal</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Picking Lists/Pickings by Journal/My open Journals"
+		name="Inventory Control/Packing lists/Packings by Journal/My open Journals"
 		id="menu_definition_journal_pickings_my_open"
 		action="action_definition_picking_journal_tree_my"/>
 
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_all">
-		<field name="name">sale_journal.picking.journal.tree.all</field>
+		<field name="name">Packings by journal</field>
 		<field name="res_model">sale_journal.picking.journal</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','open')]</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Picking Lists/Pickings by Journal/All open Journals"
+		name="Inventory Control/Packing lists/Packings by Journal/All open Journals"
 		id="menu_definition_journal_pickings_all_open"
 		action="action_definition_picking_journal_tree_all"/>
 
 
 	<record model="ir.actions.act_window" id="action_invoice_type_tree">
+		<field name="name">Packings by invoice_method</field>
 		<field name="name">sale_journal.invoice.type.tree</field>
 		<field name="res_model">sale_journal.invoice.type</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">tree</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Picking Lists/Sending Goods/Pickings to invoice/Pickings by invoice method"
+		name="Inventory Control/Packing lists/Sending Goods/Packings to invoice/Packings by invoice method"
 		id="menu_action_invoice_type_tree"
 		action="action_invoice_type_tree"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_open">
-		<field name="name">Pickings to invoice</field>
+		<field name="name">Packings to invoice</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -120,7 +121,7 @@
 	<record model="ir.values" id="ir_open_invoice_type">
 		<field name="key2">tree_but_open</field>
 		<field name="model">sale_journal.invoice.type</field>
-		<field name="name">Pickings to invoice</field>
+		<field name="name">Packings to invoice</field>
 		<field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
 		<field name="object" eval="True"/>
 	</record>
diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml
index 4b7d6ae9021..e025296458d 100644
--- a/addons/sale_journal/picking_journal_view_report.xml
+++ b/addons/sale_journal/picking_journal_view_report.xml
@@ -2,7 +2,7 @@
 <data>
 
 	#
-	# Pickings by invoice type
+	# Packings by invoice type
 	#
 
 	<record model="ir.ui.view" id="view_picking_invoice_type_stats_form">
@@ -10,7 +10,7 @@
 		<field name="model">sale_journal.invoice.type.stats</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
-			<form string="Pickings by invoice method">
+			<form string="Packings by invoice method">
 				<field name="name" select="1"/>
 				<field name="invoice_state" select="1"/>
 				<field name="state" select="1"/>
@@ -27,7 +27,7 @@
 		<field name="model">sale_journal.invoice.type.stats</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
-			<tree string="Pickings by invoice method">
+			<tree string="Packings by invoice method">
 				<field name="name"/>
 				<field name="invoice_state"/>
 				<field name="state"/>
@@ -40,7 +40,7 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open">
-		<field name="name">Statistics on pickings to invoice</field>
+		<field name="name">Statistics on packings to invoice</field>
 		<field name="res_model">sale_journal.invoice.type.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -50,13 +50,13 @@
 	<record model="ir.values" id="ir_open_invoice_type_stats">
 		<field name="key2">tree_but_open</field>
 		<field name="model">sale_journal.invoice.type</field>
-		<field name="name">Statistics on pickings to invoice</field>
+		<field name="name">Statistics on packings to invoice</field>
 		<field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_stats_open"/>
 		<field name="object" eval="True"/>
 	</record>
 
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open_menu_month">
-		<field name="name">sale_journal.invoice.type.stats.open</field>
+		<field name="name">Packings by invoice method</field>
 		<field name="res_model">sale_journal.invoice.type.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -64,24 +64,24 @@
 		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Reporting/This month/Pickings by invoice method"
+		name="Inventory Control/Reporting/This month/Packings by invoice method"
 		action="action_invoice_type_picking_stats_open_menu_month"
 		id="menu_invoice_type_picking_stats_open_menu"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open_menu_all">
-		<field name="name">sale_journal.invoice.type.stats.open</field>
+		<field name="name">Packings by invoice method</field>
 		<field name="res_model">sale_journal.invoice.type.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Reporting/All months/Pickings by invoice method"
+		name="Inventory Control/Reporting/All months/Packings by invoice method"
 		action="action_invoice_type_picking_stats_open_menu_all"
 		id="menu_invoice_type_picking_stats_open_all"/>
 
 	#
-	# Pickings by journal
+	# Packings by journal
 	#
 
 	<record model="ir.ui.view" id="view_picking_journal_stats_form">
@@ -89,7 +89,7 @@
 		<field name="model">sale_journal.picking.stats</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
-			<form string="Pickings by journals">
+			<form string="Packings by journals">
 				<field name="name" select="1"/>
 				<field name="state" select="1"/>
 				<field name="journal_id" select="1"/>
@@ -105,7 +105,7 @@
 		<field name="model">sale_journal.picking.stats</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
-			<tree string="Pickings by journals">
+			<tree string="Packings by journals">
 				<field name="name"/>
 				<field name="state"/>
 				<field name="journal_id"/>
@@ -118,7 +118,7 @@
 	</record>
 
 	<record model="ir.actions.act_window" id="action_picking_picking_stats_open_menu_month">
-		<field name="name">sale_journal.picking.stats.open</field>
+		<field name="name">Packings by journal</field>
 		<field name="res_model">sale_journal.picking.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -126,19 +126,19 @@
 		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Reporting/This month/Pickings by journal"
+		name="Inventory Control/Reporting/This month/Packings by journal"
 		action="action_picking_picking_stats_open_menu_month"
 		id="menu_picking_picking_stats_open_menu"/>
 
 	<record model="ir.actions.act_window" id="action_picking_picking_stats_open_menu_all">
-		<field name="name">sale_journal.picking.stats.open</field>
+		<field name="name">Packings by journal</field>
 		<field name="res_model">sale_journal.picking.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
 	<menuitem
-		name="Inventory Control/Reporting/All months/Pickings by journal"
+		name="Inventory Control/Reporting/All months/Packings by journal"
 		action="action_picking_picking_stats_open_menu_all"
 		id="menu_picking_picking_stats_open_all"/>
 
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index dc1b1aba7aa..d9fc2e7ce97 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -97,7 +97,7 @@ sale_journal()
 
 class picking_journal(osv.osv):
 	_name = 'sale_journal.picking.journal'
-	_description = 'Pickings Journal'
+	_description = 'Packings Journal'
 	_columns = {
 		'name': fields.char('Journal', size=64, required=True),
 		'code': fields.char('Code', size=16, required=True),
diff --git a/addons/sale_journal/sale_journal_inherit.py b/addons/sale_journal/sale_journal_inherit.py
index f412897892c..38f79a44f7b 100644
--- a/addons/sale_journal/sale_journal_inherit.py
+++ b/addons/sale_journal/sale_journal_inherit.py
@@ -40,7 +40,7 @@ class res_partner(osv.osv):
 		method=True,
 		view_load=True,
 		group_name="Accounting Properties",
-		help="The type of journal used for sales and pickings."),
+		help="The type of journal used for sales and packings."),
 	}
 res_partner()
 
diff --git a/addons/sale_journal/sale_journal_picking_report.py b/addons/sale_journal/sale_journal_picking_report.py
index 5531c81c1b9..ed81a1f2392 100644
--- a/addons/sale_journal/sale_journal_picking_report.py
+++ b/addons/sale_journal/sale_journal_picking_report.py
@@ -31,7 +31,7 @@ from osv import fields,osv
 
 class report_sale_journal_invoice_type_stats(osv.osv):
 	_name = "sale_journal.invoice.type.stats"
-	_description = "Stats on pickings by invoice method"
+	_description = "Stats on packings by invoice method"
 	_auto = False
 	_columns = {
 		'name': fields.date('Month', readonly=True),
@@ -79,7 +79,7 @@ report_sale_journal_invoice_type_stats()
 
 class report_sale_journal_picking(osv.osv):
 	_name = "sale_journal.picking.stats"
-	_description = "pickings Orders by Journal"
+	_description = "Packing lists by Journal"
 	_auto = False
 	_columns = {
 		'name': fields.date('Month', readonly=True),
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 9ed0b86031b..8de9d59428f 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -26,7 +26,7 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
-		<field name="res_model">sale_journal.invoice.type</field>
+		<field name="res_model">Invoice type</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
@@ -116,26 +116,26 @@
 		action="action_definition_journal_tree"/>
 
 	<record model="ir.actions.act_window" id="action_definition_journal_tree_my">
-		<field name="name">My open Journals</field>
+		<field name="name">My open journals</field>
 		<field name="res_model">sale_journal.sale.journal</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
 	</record>
 	<menuitem
-		name="Sales Management/Sales by Journal/My opened Journals"
+		name="Sales Management/Sales by Journal/My open journals"
 		id="menu_definition_journal_sales_my_open"
 		action="action_definition_journal_tree_my"/>
 
 	<record model="ir.actions.act_window" id="action_definition_journal_tree_all">
-		<field name="name">Opened Journals</field>
+		<field name="name">Open journals</field>
 		<field name="res_model">sale_journal.sale.journal</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','open')]</field>
 	</record>
 	<menuitem
-		name="Sales Management/Sales by Journal/All opened Journals"
+		name="Sales Management/Sales by Journal/All open Journals"
 		id="menu_definition_journal_sales_all_open"
 		action="action_definition_journal_tree_all"/>
 
@@ -259,25 +259,25 @@
 		src_model="sale_journal.sale.journal"
 		id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
 
-	<act_window name="Assigned pickings"
+	<act_window name="Assigned packings"
 		domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
 		res_model="stock.picking"
 		src_model="sale_journal.picking.journal"
 		id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
 
-	<act_window name="Confirmed pickings"
+	<act_window name="Confirmed packings"
 		domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
 		res_model="stock.picking"
 		src_model="sale_journal.picking.journal"
 		id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
 
-	<act_window name="Assigned pickings"
+	<act_window name="Assigned packings"
 		domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
 		res_model="stock.picking"
 		src_model="sale_journal.sale.journal"
 		id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
 
-	<act_window name="Confirmed pickings"
+	<act_window name="Confirmed packings"
 		domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
 		res_model="stock.picking"
 		src_model="sale_journal.sale.journal"
diff --git a/addons/stock/report/picking.xsl b/addons/stock/report/picking.xsl
index d1b5778ab8b..ab572280dba 100644
--- a/addons/stock/report/picking.xsl
+++ b/addons/stock/report/picking.xsl
@@ -22,7 +22,7 @@
 	
 	<xsl:template name="first_page_graphics_report">
 		<setFont name="Helvetica" size="16"/>
-		<drawCentredString x="105mm" y="28cm" t="1">PICKINGLIST</drawCentredString>
+		<drawCentredString x="105mm" y="28cm" t="1">PACKINGLIST</drawCentredString>
 	</xsl:template>
 	
 	<!-- stylesheet -->
@@ -100,7 +100,7 @@
 		<tr>
 			<td t="1">Customer ref.</td>
 			<td t="1">Shipping ref.</td>
-			<td t="1">Picking Date</td>
+			<td t="1">Packing Date</td>
 			<td t="1">Shipping Date</td>
 		</tr><tr>
 			<td><para><xsl:value-of select="corporation/id"/></para></td>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b29899b8d96..0b43e655ad2 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -310,9 +310,9 @@ stock_tracking()
 #----------------------------------------------------------
 class stock_picking(osv.osv):
 	_name = "stock.picking"
-	_description = "Picking list"
+	_description = "Packing list"
 	_columns = {
-		'name': fields.char('Picking Name', size=64, required=True, select=True),
+		'name': fields.char('Packing name', size=64, required=True, select=True),
 		'origin': fields.char('Origin', size=64),
 		'type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True),
 		'active': fields.boolean('Active'),
@@ -334,7 +334,7 @@ class stock_picking(osv.osv):
 
 		'move_lines': fields.one2many('stock.move', 'picking_id', 'Move Lines'),
 
-		'auto_picking': fields.boolean('Auto-Picking'),
+		'auto_picking': fields.boolean('Auto-Packing'),
 		'work': fields.boolean('Work todo'),
 		'loc_move_id': fields.many2one('stock.location', 'Move to Location'),
 		'address_id': fields.many2one('res.partner.address', 'Partner'),
@@ -660,7 +660,7 @@ class stock_move(osv.osv):
 		'move_dest_id': fields.many2one('stock.move', 'Dest. Move'),
 		'move_history_ids': fields.many2many('stock.move', 'stock_move_history_ids', 'parent_id', 'child_id', 'Move History'),
 		'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History'),
-		'picking_id': fields.many2one('stock.picking', 'Picking list', select=True),
+		'picking_id': fields.many2one('stock.picking', 'Packing list', select=True),
 
 		'note': fields.text('Notes'),
 
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 7476eaceea1..bc3ea12e6c2 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -12,7 +12,7 @@
 
 		<report
 			id="report_picking_list"
-			string="Picking List"
+			string="Packing list"
 			model="stock.picking"
 			name="stock.picking.list"
 			xml="stock/report/picking.xml"
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index c1446e248c1..3a057fdeb25 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -2,34 +2,34 @@
 <terp>
 <data noupdate="1">
 	<!--
-	Sequences for pickings
+	Sequences for packings
 	-->
 
 	<record model="ir.sequence.type" id="seq_type_picking_out">
-		<field name="name">Picking Out</field>
+		<field name="name">Packing Out</field>
 		<field name="code">stock.picking.out</field>
 	</record>
 	<record model="ir.sequence.type" id="seq_type_picking_in">
-		<field name="name">Picking In</field>
+		<field name="name">Packing In</field>
 		<field name="code">stock.picking.in</field>
 	</record>
 	<record model="ir.sequence.type" id="seq_type_picking_internal">
-		<field name="name">Picking Internal</field>
+		<field name="name">Packing Internal</field>
 		<field name="code">stock.picking.internal</field>
 	</record>
 
 	<record model="ir.sequence" id="seq_picking_out">
-		<field name="name">Picking Out</field>
+		<field name="name">Packing Out</field>
 		<field name="code">stock.picking.out</field>
 		<field name="prefix">OUT:</field>
 	</record>
 	<record model="ir.sequence" id="seq_picking_in">
-		<field name="name">Picking In</field>
+		<field name="name">Packing In</field>
 		<field name="code">stock.picking.in</field>
 		<field name="prefix">IN:</field>
 	</record>
 	<record model="ir.sequence" id="seq_picking_internal">
-		<field name="name">Picking Internal</field>
+		<field name="name">Packing Internal</field>
 		<field name="code">stock.picking.internal</field>
 		<field name="prefix">INTERNAL:</field>
 	</record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ff041e0b4d7..028062a9426 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -444,14 +444,14 @@
 	<menuitem name="Inventory Control/Configuration/Warehouse" id="menu_action_warehouse_form" action="action_warehouse_form"/>
 
 	=============================
-	Picking
+	Packing
 	=============================
 	<record model="ir.ui.view" id="vpicktree">
 		<field name="name">stock.picking.tree</field>
 		<field name="model">stock.picking</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
-			<tree string="Picking List" color="red:state=='cancel'">
+			<tree string="Packing list" color="red:state=='cancel'">
 				<field name="name" select="1" colspan="4"/>
 				<field name="date" select="1"/>
 				<field name="origin" select="1"/>
@@ -467,20 +467,20 @@
 		<field name="model">stock.picking</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
-			<form string="Picking List">
+			<form string="Packing list">
 				<notebook>
 				<page string="General Information">
 					<field name="name" select="1"/>
 					<field name="date" select="1"/>
 					<newline/>
-					<field name="type" select="1"/>
+					<field name="type" select="2"/>
 					<field name="move_type"/>
- 					<field name="invoice_state" select="1"/>
-					<field name="loc_move_id" select="1"/>
+ 					<field name="invoice_state" select="2"/>
+					<field name="loc_move_id" select="2"/>
 					<newline/>
 					<field name="location_id"/>
 					<field name="location_dest_id"/>
-					<field name="address_id" select="1"/>
+					<field name="address_id" select="2"/>
 					<field name="move_lines" widget="one2many_list" colspan="4" nolabel="1">
 						<form string="Stock Moves">
 							<separator string="Move Information" colspan="4"/>
@@ -528,8 +528,8 @@
 				</page><page string="Notes">
 					<field name="note" nolabel="1" colspan="4"/>
 				</page><page string="Others Infos">
-					<field name="origin" select="1"/>
-					<field name="active" select="1"/>
+					<field name="origin" select="2"/>
+					<field name="active" select="2"/>
 					<field name="auto_picking"/>
 					<newline/>
 					<field name="lot_id" colspan="4"/>
@@ -546,7 +546,7 @@
 		<field name="view_id" ref="view_picking_form"/>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists" id="menu_action_picking_form" action="action_picking_form"/>
+	<menuitem name="Inventory Control/Packing lists" id="menu_action_picking_form" action="action_picking_form"/>
 
 	<record model="ir.actions.act_window" id="action_picking_tree">
 		<field name="name">Sending Goods</field>
@@ -557,9 +557,9 @@
 		<field name="domain">[('type','=','out')]</field>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists/Sending Goods" id="menu_action_picking_tree" action="action_picking_tree"/>
+	<menuitem name="Inventory Control/Packing lists/Sending Goods" id="menu_action_picking_tree" action="action_picking_tree"/>
 	<record model="ir.actions.act_window" id="action_picking_tree2">
-		<field name="name">Assigned Pickings (sending goods)</field>
+		<field name="name">Assigned packings to send</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -567,9 +567,9 @@
 		<field name="domain">[('state','=','assigned'),('type','=','out')]</field>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists/Sending Goods/Assigned Pickings" action="action_picking_tree2" id="menu_picking_waiting"/>
+	<menuitem name="Inventory Control/Packing lists/Sending Goods/Assigned Packings" action="action_picking_tree2" id="menu_picking_waiting"/>
 	<record model="ir.actions.act_window" id="action_picking_tree3">
-		<field name="name">Confirmed Pickings (sending goods)</field>
+		<field name="name">Confirmed packings to send</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -577,7 +577,7 @@
 		<field name="domain">[('state','=','confirmed'),('type','=','out')]</field>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists/Sending Goods/Confirmed Pickings" id="menu_action_picking_tree3" action="action_picking_tree3"/>
+	<menuitem name="Inventory Control/Packing lists/Sending Goods/Confirmed packings" id="menu_action_picking_tree3" action="action_picking_tree3"/>
 
 
 	<record model="ir.actions.act_window" id="action_picking_tree4">
@@ -589,9 +589,9 @@
 		<field name="domain">[('type','=','in')]</field>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists/Getting Goods" id="menu_action_picking_tree4" action="action_picking_tree4"/>
+	<menuitem name="Inventory Control/Packing lists/Getting Goods" id="menu_action_picking_tree4" action="action_picking_tree4"/>
 	<record model="ir.actions.act_window" id="action_picking_tree5">
-		<field name="name">Pickings to process (getting goods)</field>
+		<field name="name">Packings to process</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -599,10 +599,10 @@
 		<field name="domain">[('state','=','assigned'),('type','=','in')]</field>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists/Getting Goods/Pickings to process" id="menu_action_picking_tree5" action="action_picking_tree5"/>
+	<menuitem name="Inventory Control/Packing lists/Getting Goods/Packings to process" id="menu_action_picking_tree5" action="action_picking_tree5"/>
 
 	<record model="ir.actions.act_window" id="action_picking_tree6">
-		<field name="name">Internal picking lists</field>
+		<field name="name">Internal packing lists</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -610,9 +610,9 @@
 		<field name="domain">[('type','=','internal')]</field>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists/Internal" id="menu_action_picking_tree6" action="action_picking_tree6"/>
+	<menuitem name="Inventory Control/Packing lists/Internal" id="menu_action_picking_tree6" action="action_picking_tree6"/>
 	<record model="ir.actions.act_window" id="action_picking_tree7">
-		<field name="name">Assigned Pickings (internal)</field>
+		<field name="name">Assigned packings (internal)</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -620,9 +620,9 @@
 		<field name="domain">[('state','=','assigned'),('type','=','internal')]</field>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists/Internal/Assigned Pickings" id="menu_action_picking_tree7" action="action_picking_tree7"/>
+	<menuitem name="Inventory Control/Packing lists/Internal/Assigned packings" id="menu_action_picking_tree7" action="action_picking_tree7"/>
 	<record model="ir.actions.act_window" id="action_picking_tree8">
-		<field name="name">Confirmed Pickings (internal)</field>
+		<field name="name">Confirmed packings (internal)</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -630,9 +630,9 @@
 		<field name="domain">[('state','=','confirmed'),('type','=','internal')]</field>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists/Internal/Confirmed Pickings" id="menu_action_picking_tree8" action="action_picking_tree8"/>
+	<menuitem name="Inventory Control/Packing lists/Internal/Confirmed Packings" id="menu_action_picking_tree8" action="action_picking_tree8"/>
 	<record model="ir.actions.act_window" id="action_picking_tree9">
-		<field name="name">Draft Pickings (internal)</field>
+		<field name="name">Draft packings (internal)</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -640,7 +640,7 @@
 		<field name="domain">[('state','=','draft'),('type','=','internal')]</field>
 		<field name="context">{'contact_display': 'partner'}</field>
 	</record>
-	<menuitem name="Inventory Control/Picking Lists/Internal/Draft Pickings" id="menu_action_picking_tree9" action="action_picking_tree9"/>
+	<menuitem name="Inventory Control/Packing lists/Internal/Draft Packings" id="menu_action_picking_tree9" action="action_picking_tree9"/>
 
 	=============================
 	Move Tracking
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 313b14057dd..be41cd86f13 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -13,13 +13,13 @@
 
 
 		<wizard string="Split move line" multi="True" model="stock.picking" name="stock.move.split" id="move_split" />
-		<wizard string="Partial picking" multi="True" model="stock.picking" name="stock.partial_picking" id="partial_picking" />
+		<wizard string="Partial packing" multi="True" model="stock.picking" name="stock.partial_picking" id="partial_picking" />
 		<wizard string="Track line" multi="True" model="stock.move" name="stock.move.track" id="track_line" />
-		<wizard string="Make Picking" multi="True" model="stock.picking" name="stock.picking.make" id="make_picking"/>
+		<wizard string="Make packing" multi="True" model="stock.picking" name="stock.picking.make" id="make_picking"/>
 		<!--
 		<wizard string="Replace element" model="stock.tracking" name="stock.move.replace" id="move_replace" />
 		-->
-		<wizard string="Return picking" model="stock.picking" name="stock.return.picking" id="return_picking"/>
+		<wizard string="Return packing" model="stock.picking" name="stock.return.picking" id="return_picking"/>
 
 		<wizard
 		string="Create invoice"
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index d8eeb5a8514..81349dd98cc 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -38,7 +38,7 @@ from osv import osv
 _moves_arch = UpdateableStr()
 _moves_fields = {}
 
-_moves_arch_end = '''<?xml version="1.0"?><form string="Picking Result"><label string="The picking has been successfully made !" colspan="4" /></form>'''
+_moves_arch_end = '''<?xml version="1.0"?><form string="Packing result"><label string="The packing has been successfully made !" colspan="4" /></form>'''
 _moves_fields_end = {}
 
 def make_default(val):
@@ -51,7 +51,7 @@ def _get_moves(self, cr, uid, data, context):
 	pick = pick_obj.browse(cr, uid, [data['id']])[0]
 	res = {}
 	_moves_fields.clear()
-	_moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make picking">']
+	_moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make packing">']
 	for m in pick.move_lines:
 		quantity = m.product_qty
 		if m.state<>'assigned':
diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py
index 077a31acdac..5808173cbae 100644
--- a/addons/stock/wizard/wizard_return.py
+++ b/addons/stock/wizard/wizard_return.py
@@ -103,7 +103,7 @@ def _action_open_window(self, cr, uid, data, context):
 		return {}
 	return {
 		'domain': "[('id', 'in', ["+str(res)+"])]",
-		'name': 'Picking List',
+		'name': 'Packing List',
 		'view_type':'form',
 		'view_mode':'tree,form',
 		'res_model':'stock.picking',