From ea8e8eaeaf58246a09608f8ecec6fe9baa447ca0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 9 May 2012 01:09:06 +0200
Subject: [PATCH] [REF] stock: put back the last translation of stock made in
 trunk, forgot to unshelve during the previous merge commit + some cleaning

bzr revid: qdp-launchpad@openerp.com-20120508230906-s635tfzkgiosyhwc
---
 addons/sale/sale_view.xml                     |  2 +-
 addons/stock/i18n/mn.po                       | 10 +++----
 .../wizard/stock_return_picking_view.xml      | 30 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9e2f9280f47..e4b40d0f618 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -247,7 +247,7 @@
                             <separator colspan="4" string="Invoices"/>
                             <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
                             <separator colspan="4" string="Delivery Orders"/>
-                            <field colspan="4" name="picking_ids" nolabel="1" context="{'form_view_ref':'stock.view_picking_out_form', 'default_type': 'out'}">
+                            <field colspan="4" name="picking_ids" nolabel="1" context="{'default_type': 'out'}">
                                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                                     <field name="name"/>
                                     <field name="partner_id"/>
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 8ee5c73ec08..169832e2cdd 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2010-12-20 10:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-05-03 08:58+0000\n"
+"Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:59+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-05-04 04:48+0000\n"
+"X-Generator: Launchpad (build 15195)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -104,7 +104,7 @@ msgstr "Хөдөлгөөний шинжилгээ"
 msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
-msgstr ""
+msgstr "Үйлдвэрийн серийн дугаараас ялгаатай бол дотоод код"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:47
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 4936bf48586..7735801624d 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -2,29 +2,29 @@
 <openerp>
     <data>
          <act_window name="Return Shipment"
-		    res_model="stock.return.picking"
-		    src_model="stock.picking"
-		    view_mode="form"
-		    target="new"
+            res_model="stock.return.picking"
+            src_model="stock.picking"
+            view_mode="form"
+            target="new"
             key2="client_action_multi"
             multi="True"
-		    id="act_stock_return_picking"/>
+            id="act_stock_return_picking"/>
          <act_window name="Return Shipment"
-		    res_model="stock.return.picking"
-		    src_model="stock.picking.in"
-		    view_mode="form"
-		    target="new"
+            res_model="stock.return.picking"
+            src_model="stock.picking.in"
+            view_mode="form"
+            target="new"
             key2="client_action_multi"
             multi="True"
-		    id="act_stock_return_picking_in"/>
+            id="act_stock_return_picking_in"/>
          <act_window name="Return Shipment"
-		    res_model="stock.return.picking"
-		    src_model="stock.picking.out"
-		    view_mode="form"
-		    target="new"
+            res_model="stock.return.picking"
+            src_model="stock.picking.out"
+            view_mode="form"
+            target="new"
             key2="client_action_multi"
             multi="True"
-		    id="act_stock_return_picking_out"/>
+            id="act_stock_return_picking_out"/>
 
         <record id="stock_return_memory_tree_in" model="ir.ui.view">
             <field name="name">stock.return.picking.memory.tree</field>