[MERGE]merged with trunk-survey-layout-tta

bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg

9 files changed, 355 insertions, 286 deletions

diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 4792388c664..4277647110e 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-08-03 23:22+0000\n"
-"Last-Translator: Stefan Lind <Unknown>\n"
+"PO-Revision-Date: 2012-06-26 07:07+0000\n"
+"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:41+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-27 05:28+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -54,13 +54,13 @@ msgstr "Datum när detta dokument blev skapat"
 #: view:purchase.order:0 view:purchase.order.line:0 view:purchase.report:0
 #: view:stock.picking:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: purchase
 #: field:purchase.order,create_uid:0 view:purchase.report:0
 #: field:purchase.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarig"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -86,7 +86,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "Godkänd inköpsorder"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,partner_id:0
@@ -99,12 +99,12 @@ msgstr "Supplier"
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr ""
+msgstr "Prislistor"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Att fakturera"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
@@ -128,7 +128,7 @@ msgstr "Leverantörsfakturor"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr ""
+msgstr "Inköpsorderstatistik"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
@@ -145,7 +145,7 @@ msgstr "No Pricelist !"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
 msgid "purchase.config.wizard"
-msgstr ""
+msgstr "purchase.config.wizard"
 
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
@@ -155,7 +155,7 @@ msgstr "Offertförfrågan"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Receptions"
-msgstr ""
+msgstr "Baserad på mottagning"
 
 #. module: purchase
 #: field:purchase.order,company_id:0 field:purchase.order.line,company_id:0
@@ -172,7 +172,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr ""
+msgstr "Månatlig försäljning per kategori"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -187,7 +187,7 @@ msgstr "Invoice Exception"
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr "Default Purchase Pricelist"
+msgstr "Standardinköpslista"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -217,12 +217,12 @@ msgstr "Fax :"
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Att godkänna"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Inköpsegenskaper"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
@@ -242,22 +242,22 @@ msgstr "Approve Purchase"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "Baserad på genererad preleminär faktura"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr ""
+msgstr "Dagens ordrar"
 
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "Månatliga inköp per kategori"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -267,7 +267,7 @@ msgstr "Inköp"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "Preleminära inköpsorder"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -283,7 +283,7 @@ msgstr "Anteckningar"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "september"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order,amount_tax:0
@@ -341,7 +341,7 @@ msgstr "Cancelled"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "Konvertera till inköpsorder"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0 field:purchase.report,pricelist_id:0
@@ -356,7 +356,7 @@ msgstr "Shipping Exception"
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Fakturarader"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
@@ -382,13 +382,14 @@ msgstr "Reference"
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Lagertransaktion"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:419
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
 msgstr ""
+"Du måste först avbryta all fakturering med anknytning till denna inköpsorder"
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
@@ -404,7 +405,7 @@ msgstr "TVA :"
 #: code:addons/purchase/purchase.py:326
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "Inköpsorder '%s' har åter fått status utkast."
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
@@ -414,7 +415,7 @@ msgstr "Analytic Account"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# Rader"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754 code:addons/purchase/purchase.py:769
@@ -422,7 +423,7 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: purchase
 #: field:purchase.order,validator:0 view:purchase.report:0
@@ -432,7 +433,7 @@ msgstr "Validerad av"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "Ordrar under senaste månaden"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:412
@@ -443,7 +444,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Preliminär"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -458,7 +459,7 @@ msgstr "Order Line"
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "Anger att plockningen är klar."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -479,7 +480,7 @@ msgstr "Confirmed"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Snittpris"
 
 #. module: purchase
 #: view:stock.picking:0
@@ -502,17 +503,17 @@ msgstr "Bekräfta"
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "Baserad på mottagning"
 
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "Leverantörens referens"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -563,7 +564,7 @@ msgstr "Skriv ut"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "Sammanslagna inköpsordrar"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
@@ -584,32 +585,32 @@ msgstr "Fax:"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Totalt belopp"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "Skapa eller importera leverantörer"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Available"
-msgstr ""
+msgstr "Tillgänglig"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "Kontaktadressnamn"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr "Shipping address :"
+msgstr "Leveransadress :"
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Fakturor skapade för en inköpsorder"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285 code:addons/purchase/purchase.py:348
@@ -639,6 +640,8 @@ msgstr ""
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
+"Det finns ingen inköpssjournal definierad för det här företaget: \"%s\" "
+"(id:%d)"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -664,7 +667,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Allmänt"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:769
@@ -692,7 +695,7 @@ msgstr "Create invoice"
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "Enhet"
 
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
@@ -713,13 +716,13 @@ msgstr "Fiscal Position"
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "juli"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -756,22 +759,22 @@ msgstr "RFQ"
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDI-prislista (%s)"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Väntar på godkännande"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "januari"
 
 #. module: purchase
 #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase
 msgid "Auto-email confirmed purchase orders"
-msgstr ""
+msgstr "Automatisk e-post bekräftade inköpsorder"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
@@ -783,18 +786,18 @@ msgstr ""
 #: field:purchase.order,date_order:0 field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0 view:stock.picking:0
 msgid "Order Date"
-msgstr ""
+msgstr "Orderdatum"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Du måste tilldela ett produktionsbatch för denna produkt"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0 view:stock.picking:0
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -810,7 +813,7 @@ msgstr "Qty"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Månad-1"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -824,17 +827,17 @@ msgstr ""
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "Inköpsorderradsammanslagning"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "Ordrar i innevarande månad"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "Dagar för att leverera"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
@@ -845,22 +848,22 @@ msgstr "Ta emot Produkter"
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Anskaffning"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Fakturor"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "december"
 
 #. module: purchase
 #: field:purchase.config.wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Bild"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -870,17 +873,17 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "Godkända inköpsordrar"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -895,12 +898,12 @@ msgstr "Inköpsorder för godkännande"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "Totalt ex moms"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_user
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #. module: purchase
 #: field:purchase.order,shipped:0 field:purchase.order,shipped_rate:0
@@ -922,18 +925,18 @@ msgstr ""
 #. module: purchase
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "Är en restorder"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Skall granskas av bokföraren."
 
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "Den totala summan"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -943,18 +946,18 @@ msgstr "Taxes :"
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0 field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr "Invoiced"
+msgstr "Fakturerad"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr ""
+msgstr "Status för inköpsordern."
 
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
@@ -964,12 +967,12 @@ msgstr "Destination Address"
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Orderstatus"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Product Categories"
-msgstr ""
+msgstr "Produktkategorier"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
@@ -979,12 +982,12 @@ msgstr ""
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "Skapa fakturor"
 
 #. module: purchase
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Bolagsnamnet måste vara unikt !"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
@@ -1005,7 +1008,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "Summa utan moms."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754
@@ -1017,7 +1020,7 @@ msgstr ""
 #: code:addons/purchase/purchase.py:907
 #, python-format
 msgid "PO: %s"
-msgstr ""
+msgstr "IO: %s"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1035,22 +1038,22 @@ msgstr "Untaxed Amount"
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Anger att en faktura är betald."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr ""
+msgstr "Utlevererade produkter att fakturera"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "augusti"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Du försöker tilldela ett parti som inte är från samma produkt."
 
 #. module: purchase
 #: help:purchase.order,date_order:0
@@ -1060,12 +1063,12 @@ msgstr "Date on which this document has been created."
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Försäljning och inköp"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "juni"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1079,17 +1082,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_email_templates
 #: model:ir.ui.menu,name:purchase.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "E-postmallar"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "Inköpsorder"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "Manuella fakturor"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
@@ -1100,17 +1103,17 @@ msgstr "Invoice Control"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Enhetskategorier"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "november"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1130,21 +1133,24 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Skapa eller Importera leverantörer och deras kontakter manuellt från detta "
+"formulär eller så kan du importera dina befintliga företag med CSV-filer "
+"från \"Importera data\" guiden."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "Plocklista skapad"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "Undantag"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "oktober"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1154,17 +1160,17 @@ msgstr "Compute"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "Inkommande leveranser tillgängliga."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
 msgid "Address Book"
-msgstr ""
+msgstr "Adressbok"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Bolag"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1194,12 +1200,12 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Infopanel"
 
 #. module: purchase
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referensen måste vara unik per bolag!"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_standard:0
@@ -1209,17 +1215,17 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
-msgstr ""
+msgstr "Företagskategorier"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "Moms"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Offerter"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -1233,7 +1239,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "Adresser"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
@@ -1306,7 +1312,7 @@ msgstr ""
 #: view:purchase.order.line:0 field:purchase.order.line,state:0
 #: view:purchase.report:0 view:stock.picking:0
 msgid "State"
-msgstr ""
+msgstr "Tillstånd"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
@@ -1318,7 +1324,7 @@ msgstr "Approved"
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Allmän information"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1351,7 +1357,7 @@ msgstr "Faktura"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "Bekräftade inköpsorder att fakturera"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1384,12 +1390,12 @@ msgstr "Inköpsordrar"
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Orderreferensen måste vara unik per bolag!"
 
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Källdokument"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1404,7 +1410,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Inkommande leveranser"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
@@ -1425,7 +1431,7 @@ msgstr "Tél. :"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "Ordrar denna månad"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1484,7 +1490,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planerat datum"
 
 #. module: purchase
 #: field:purchase.order,product_id:0 view:purchase.order.line:0
@@ -1497,7 +1503,7 @@ msgstr "Product"
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "Bekräftan"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,name:0
@@ -1508,7 +1514,7 @@ msgstr "Beskrivning"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
-msgstr ""
+msgstr "Ordrar i år"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1518,7 +1524,7 @@ msgstr "Expected Delivery address:"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
@@ -1529,7 +1535,7 @@ msgstr "Mottagningsanalys"
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "Leverantörens ledtid"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1547,7 +1553,7 @@ msgstr "Delivery"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in done state."
-msgstr ""
+msgstr "Klara inköpsordrar"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -1567,7 +1573,7 @@ msgstr "Väntar"
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adress"
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
@@ -1592,7 +1598,7 @@ msgstr "Untaxed amount"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "Plockning att fakturera"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1611,13 +1617,13 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "februari"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr ""
+msgstr "Inköpsanalys"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1647,17 +1653,17 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr "Purchase Control"
+msgstr "Inköpskontroll"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "mars"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "april"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1689,7 +1695,7 @@ msgstr ""
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr "Purchase Pricelist"
+msgstr "Inköpsprislista"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -1699,7 +1705,7 @@ msgstr "Invoicing Control"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Restordrar"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1709,7 +1715,7 @@ msgstr "Approve"
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr "Default Purchase Pricelist Version"
+msgstr "Standardinköpsprislisteversion"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1732,7 +1738,7 @@ msgstr ""
 #: code:addons/purchase/purchase.py:426
 #, python-format
 msgid "Purchase order '%s' is cancelled."
-msgstr ""
+msgstr "Inköpsorder '%s' är avbruten."
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -1742,12 +1748,12 @@ msgstr "Total"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Prislisteversioner"
 
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
@@ -1839,32 +1845,32 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "maj"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_manager
 msgid "Manager"
-msgstr ""
+msgstr "Chef"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "Ordrar i innevarande år"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "Inköp"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
@@ -1892,7 +1898,7 @@ msgstr "Välj en öppen säljorder"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Orders"
-msgstr ""
+msgstr "Ordrar"
 
 #. module: purchase
 #: help:purchase.order,name:0
@@ -1906,7 +1912,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "Inköpsorder infopanel"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -2177,3 +2183,6 @@ msgstr ""
 
 #~ msgid "Products Categories"
 #~ msgstr "Produktkategorier"
+
+#~ msgid "Not invoiced"
+#~ msgstr "Icke fakturerat"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 47ff616b548..e74ca83a92b 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -733,10 +733,10 @@ class purchase_order(osv.osv):
     # --------------------------------------
     
     def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = dict.fromkeys(ids, [])
+        result = super(purchase_order, self).get_needaction_user_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.state == 'approved':
-                result[obj.id] = [obj.validator.id]
+                result[obj.id].append(obj.validator.id)
         return result
     
     def create_send_note(self, cr, uid, ids, context=None):
@@ -913,7 +913,7 @@ class purchase_order_line(osv.osv):
 
         # - determine product_qty and date_planned based on seller info
         if not date_order:
-            date_order = fields.date.context_today(cr,uid,context=context)
+            date_order = fields.date.context_today(self,cr,uid,context=context)
 
         qty = qty or 1.0
         supplierinfo = False
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0d39f9b7388..0be6b8ddf8c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -52,10 +52,10 @@
             action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Categories"
             parent="purchase.menu_purchase_partner_cat" groups="base.group_no_one"/>
 
-     <!--supplier menu-->
+    <!--supplier menu-->
     <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
-            parent="menu_procurement_management"
-            action="base.action_partner_supplier_form" sequence="15"/>
+        parent="menu_procurement_management"
+        action="base.action_partner_supplier_form" sequence="15"/>
 
           <!--Inventory control-->
       <menuitem id="menu_procurement_management_inventory" name="Receive Products"
@@ -65,9 +65,9 @@
       <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
             parent="menu_procurement_management_inventory" sequence="11"/>
 
-     <!--Invoice control-->
-     <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
-          parent="base.menu_purchase_root" sequence="6"/>
+    <!--Invoice control-->
+    <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
+        parent="base.menu_purchase_root" sequence="6"/>
 
     <record id="action_invoice_pending" model="ir.actions.act_window">
         <field name="name">Based on Draft Invoices</field>
@@ -101,6 +101,43 @@
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
           parent="menu_procurement_management_product"/>
 
+        <!-- Purchase order Read/Unread actions -->
+        <record id="actions_server_purchase_order_unread" model="ir.actions.server">
+            <field name="name">Mark unread</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_purchase_order"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_purchase_order_unread" model="ir.values">
+            <field name="name">action_purchase_order_unread</field>
+            <field name="action_id" ref="actions_server_purchase_order_unread"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_purchase_order_unread'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_purchase_order" />
+            <field name="model">purchase.order</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
+        <record id="actions_server_purchase_order_read" model="ir.actions.server">
+            <field name="name">Mark read</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_purchase_order"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_purchase_order_read" model="ir.values">
+            <field name="name">action_purchase_order_read</field>
+            <field name="action_id" ref="actions_server_purchase_order_read"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_purchase_order_read'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_purchase_order" />
+            <field name="model">purchase.order</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
        <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
             <field name="model">purchase.order</field>
@@ -133,29 +170,31 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/>
+                    <button name="purchase_confirm" states="draft,sent" string="Confirm Quotation" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
-                    <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object"/>
+                    <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
                     <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
                     <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" class="oe_highlight"/>
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
-                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}"/>
-                    <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}"/>
-                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object"/>
+                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
+                    <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
+                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,wait_auth,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                 </header>
                 <sheet>
-                    <h1>
-                        <label string="Draft Purchase Order " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
-                        <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
-                        <field name="name" class="oe_inline" readonly="1"/>
-                    </h1>
+                    <div class="oe_title">
+                        <h1>
+                            <label string="Quotation " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
+                            <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
+                            <field name="name" class="oe_inline" readonly="1"/>
+                        </h1>
+                    </div>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"  options='{"quick_create": false}'/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"/>
                             <field name="partner_ref"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/>
                         </group>
@@ -175,15 +214,17 @@
                                     <field name="product_qty"/>
                                     <field name="product_uom" groups="product.group_uom"/>
                                     <field name="price_unit"/>
-                                    <field name="price_subtotal"/>
+                                    <field name="price_subtotal"/>  
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
+                            <group class="oe_subtotal_footer oe_right">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                            </group>
+                                <div class="oe_subtotal_footer_separator oe_inline" colspan="2">
+                                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" class="oe_inline oe_left"/>
+                                    <field name="amount_total"/>
+                                </div>
+                            </group>                         
                             <div class="oe_clear"/>
                             <label for="notes"/>
                             <field name="notes"/>
@@ -191,28 +232,32 @@
                         <page string="Delivery &amp; Invoicing">
                             <group>
                                 <group string="Delivery">
-                                    <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
+                                    <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
                                     <field name="minimum_planned_date"/>
                                     <field name="location_id" groups="stock.group_locations"/>
-                                    <field name="shipped"/>
+                                    <field name="shipped" groups="base.group_no_one"/>
+                                </group>
+                                <group>
+                                    <field name="validator" groups="base.group_no_one"/>
+                                    <field name="date_approve"/>
                                 </group>
-                                <group string="Invoice Control">
+                            </group>
+                            <group string="Invoicing">
+                                <group>
                                     <field name="invoice_method"/>
-                                    <field name="fiscal_position" widget="selection"/>
-                                    <field name="invoiced" groups="base.group_no_one"/>
+                                    <field name="invoiced"/>
                                 </group>
-                                <group groups="base.group_no_one" string="Purchase Control">
-                                    <field name="validator"/>
-                                    <field name="date_approve"/>
+                                <group>
+                                    <field name="fiscal_position"/>
                                 </group>
-                                <separator string="Invoices"/>
-                                <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
                             </group>
+                            <separator string="Invoices"/>
+                            <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
                         </page>
                     </notebook>
                 </sheet>
                 <footer>
-                   <field name="message_ids" widget="ThreadView"/>
+                   <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -259,6 +304,11 @@
                  <group>
                     <field name="name" string="Reference"/>
                     <separator orientation="vertical"/>
+                    <filter icon="terp-mail-message-new"
+                        string="Inbox" help="Unread messages"
+                        name="needaction_pending"
+                        domain="[('needaction_pending','=',True)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
@@ -336,7 +386,6 @@
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" sequence="6"/>
 
-
         <record id="purchase_order_line_form" model="ir.ui.view">
             <field name="name">purchase.order.line.form</field>
             <field name="model">purchase.order.line</field>
@@ -344,9 +393,6 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
                     <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <label for="product_id" class="oe_edit_only"/>
                         <group>
                             <group>
                                 <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
@@ -356,23 +402,23 @@
                                     <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
                                 </div>
                                 <field name="price_unit"/>
+                                <field name="taxes_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> 
                             </group>
                             <group>
+                                <field name="name"/>
                                 <field name="date_planned" widget="date"/>
+                                <field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
-                                <field name="taxes_id" widget="many2many_tags"
-                                    domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                             </group>
                             <group string="Notes" colspan="4">
-                                <field name="notes"/>
+                                <field name="notes" nolabel="1" placeholder="Add a note on the purchase line..."/>
                             </group>
                             <group string="Invoices" colspan="4">
-                                <field name="invoiced"/>
-                                <field name="invoice_lines" nolabel="1" colspan="2"/>
+                                <field name="invoice_lines" nolabel="1"/>
+                            </group>
+                            <group string="Stock Moves" colspan="4">
+                                <field name="move_ids" nolabel="1"/>
                             </group>
-                            <separator string="Stock Moves"/>
-                            <field name="move_ids"/>
                         </group>
                     </sheet>
                 </form>
@@ -406,42 +452,42 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
-                	<sheet>
-	                    <label for="order_id" class="oe_edit_only"/>
-	                    <h1>
-	                        <field name="order_id" class="oe_inline"/>, 
-	                        <field name="date_order" class="oe_inline"/>
-	                    </h1>
-	                    <label for="partner_id" class="oe_edit_only"/>
-	                    <h2><field name="partner_id"/></h2>
-	
-	                    <group>
-	                        <group>
-	                            <field name="name"/>
-	                            <field name="product_id" readonly="1"/>
-	                            <label for="product_qty"/>
-	                            <div>
-	                                <field name="product_qty" readonly="1" class="oe_inline"/>
-	                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
-	                            </div>
-	                            <field name="price_unit"/>
-	                        </group>
-	                        <group>
-	                            <field name="date_planned" widget="date"  readonly="1"/>
-	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-	                            <field name="taxes_id" widget="many2many_tags"
-	                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
-	                            <field name="invoiced"/>
-	                        </group>
-	                    </group>
-	                    <separator string="Manual Invoices"/>
-	                    <field name="invoice_lines"/>
-	                    <separator string="Notes"/>
-	                    <field name="notes"/>
-	                    <separator string="Stock Moves"/>
-	                    <field name="move_ids"/>
-	            	</sheet>
+                    <sheet>
+                        <label for="order_id" class="oe_edit_only"/>
+                        <h1>
+                            <field name="order_id" class="oe_inline"/>
+                            <label string="," attrs="{'invisible':[('date_order','=',False)]}"/> 
+                            <field name="date_order" class="oe_inline"/>
+                        </h1>
+                        <label for="partner_id" class="oe_edit_only"/>
+                        <h2><field name="partner_id"/></h2>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="product_id" readonly="1"/>
+                                <label for="product_qty"/>
+                                <div>
+                                    <field name="product_qty" readonly="1" class="oe_inline"/>
+                                    <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
+                                </div>
+                                <field name="price_unit"/>
+                            </group>
+                            <group>
+                                <field name="date_planned" widget="date" readonly="1"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                                <field name="taxes_id" widget="many2many_tags"
+                                    domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+                                <field name="invoiced"/>
+                            </group>
+                        </group>
+                        <separator string="Manual Invoices"/>
+                        <field name="invoice_lines"/>
+                        <separator string="Notes"/>
+                        <field name="notes"/>
+                        <separator string="Stock Moves"/>
+                        <field name="move_ids"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 0342afec893..00fb5517568 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -199,9 +199,9 @@
             <field name="act_from" ref="act_invoice_end"/>
             <field name="act_to" ref="act_done"/>
         </record>
-	
-	<!-- Procurement -->
-		<record id="act_buy" model="workflow.activity">
+    
+    <!-- Procurement -->
+        <record id="act_buy" model="workflow.activity">
             <field name="wkf_id" ref="procurement.wkf_procurement"/>
             <field name="name">buy</field>
             <field name="kind">subflow</field>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 23914769c0d..c5e72db9f1a 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -32,7 +32,7 @@ class purchase_config_settings(osv.osv_memory):
             [('manual', 'Based on Purchase Order Lines'),
              ('picking', 'Based on Receptions'),
              ('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
-            ], 'Invoicing Method', required=True, default_model='purchase.order'),
+            ], 'Default Invoicing Control Method', required=True, default_model='purchase.order'),
         'group_purchase_pricelist':fields.boolean("Pricelist per Supplier",
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
@@ -48,24 +48,18 @@ class purchase_config_settings(osv.osv_memory):
                 lines on a purchase order between several accounts and analytic plans.
                 This installs the module purchase_analytic_plans."""),
         'module_warning': fields.boolean("Alerts by Products or Supplier",
-            help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier. 
+            help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
             Example: Product: this product is deprecated, do not purchase more than 5.
                     Supplier: don't forget to ask for an express delivery."""),
-        'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
-            help="""This allows you to define the following for a product:
-                    * Manufacturer
-                    * Manufacturer Product Name
-                    * Manufacturer Product Code
-                    * Product Attributes.
-                This installs the module product_manufacturer."""),
+
         'module_purchase_double_validation': fields.boolean("Two Levels of Approval",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
-        'module_purchase_requisition': fields.boolean("Use Purchase Requisition",
-            help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products. 
-            You can configure per product if you directly do a Request for Quotation 
+        'module_purchase_requisition': fields.boolean("Manage Purchase Requisitions",
+            help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
+            You can configure per product if you directly do a Request for Quotation
             to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
-        'decimal_precision': fields.integer('Decimal Precision on Price'),                
+        'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices   like: 9.99 EUR, whereas a decimal precision of 4 will allow prices  like:  0.0231 EUR per unit."),
     }
 
     _defaults = {
@@ -87,10 +81,14 @@ class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
         'module_purchase_analytic_plans': fields.boolean('Several Analytic Accounts on Purchases',
-            help="""This allows install module purchase_analytic_plans."""),                 
+            help="""This allows install module purchase_analytic_plans."""),
         'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases',
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
     }
 
+    def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None):
+        """ change group_analytic_account_for_purchases following module_purchase_analytic_plans """
+        return {'value': {'group_analytic_account_for_purchases': module_purchase_analytic_plans}}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index e7be392b0c2..06b06c7bae4 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -8,26 +8,29 @@
             <field name="arch" type="xml">
                 <form string="Configure Purchases" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group col="4">
-                        <separator string="Invoicing" colspan="4"/>
-                        <field name="default_invoice_method"/>
-                        <field name="decimal_precision"/>
-
-                        <separator string="Purchase Order" colspan="4"/>
-                        <field name="group_purchase_pricelist"/>
-                        <field name="group_uom"/>
-                        <field name="group_purchase_delivery_address"/>
-                        <field name="module_purchase_double_validation"/>
-                        <field name="module_purchase_requisition"/>
-                        <field name="module_warning"/>
-                        <field name="module_purchase_analytic_plans"/>
-
-                        <separator string="Products" colspan="4"/>
-                        <field name="module_product_manufacturer"/>
-                    </group>
+                    <sheet>
+                        <group string="Invoicing">
+                            <field name="default_invoice_method"/>
+                            <field name="decimal_precision"/>
+                        </group>
+                        <group string="Purchase Order">
+                            <group>
+                                <field name="group_purchase_pricelist"/>
+                                <field name="group_uom"/>
+                                <field name="group_purchase_delivery_address"/>
+                            </group>
+                            <group>
+                                <field name="module_purchase_double_validation"/>
+                                <field name="module_purchase_requisition"/>
+                                <field name="module_warning"/>
+                                <field name="module_purchase_analytic_plans"/>
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -55,7 +58,7 @@
                 </group>
                 <group name="analytic_accounting" position="inside">
                     <field name="group_analytic_account_for_purchases"/>
-                    <field name="module_purchase_analytic_plans"/>
+                    <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
                 </group>
             </field>
         </record>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index df6ba9531f3..f9d6239e0a5 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -24,27 +24,6 @@
             </field>
         </record>
 
-        <act_window
-            domain="[('purchase_id', '=', active_id)]"
-            id="act_purchase_order_2_stock_picking"
-            name="Incoming Shipments"
-            res_model="stock.picking.in"
-            src_model="purchase.order"
-            context="{'default_purchase_id': active_id, 'contact_display': 'partner', 'default_type': 'in'}" />
-       
-        <record id="action_picking_in_tree_view" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="stock.view_picking_in_tree"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
-        </record>
-        <record id="action_picking_in_form_view" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="stock.view_picking_in_form"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
-        </record>
-        
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
             <field name="name">Incoming Picking Inherited</field>
             <field name="model">stock.picking.in</field>
@@ -78,6 +57,7 @@
                         <separator orientation="vertical"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="purchase_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
@@ -96,7 +76,33 @@
                 </search>
             </field>
         </record>
- 
+        <record id="act_purchase_order_2_stock_picking" model="ir.actions.act_window">
+            <field name="name">Incoming Shipments</field>
+            <field name="res_model">stock.picking.in</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="domain">[('type','=','in')]</field>
+            <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
+            <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
+        </record>
+        
+        <record id="purchase_order_2_stock_picking" model="ir.ui.view">
+            <field name="name">Purchase Picking Inherited</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                 <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
+                    <div class="oe_right oe_button_box" name="buttons">
+                        <button type="action"
+                            name="%(act_purchase_order_2_stock_picking)d"
+                            string="Incoming Shipments" states="approved"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+        
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
             <field name="name">Based on Incoming Shipments</field>
             <field name="res_model">stock.picking</field>
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 40f081076f6..9ece8f0eb04 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -11,10 +11,13 @@
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
                     <header>
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
-                        <button name="makeInvoices" string="Confirm" type="object" icon="gtk-ok" />
+                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <label string="Do you want to generate the supplier invoices?"/>
+                    <group>
+                        <label string="Do you want to generate the supplier invoices?"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index 50c75668068..d82d6f7fb2f 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -8,11 +8,13 @@
             <field name="arch" type="xml">
                <form string="Merge orders" version="7.0">
                     <header>
-                        <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <separator string="Are you sure you want to merge these orders?"/>
-                    <label string="
+                    <group>
+                        <separator string="Are you sure you want to merge these orders?"/>
+                        <label string="
 Please note that: &#10; &#10;
 Orders will only be merged if: &#10;
 * Purchase Orders are in draft &#10;
@@ -21,6 +23,8 @@ Orders will only be merged if: &#10;
 Lines will only be merged if: &#10;
 * Order lines are exactly the same except for the product,quantity and unit &#10;
 " colspan="4"/>
+                    </group>
+                    
                 </form>
             </field>
         </record>