diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index ada4f7d29fe..7a614a16211 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -309,7 +309,7 @@
                     context="{'invisible_section': False}">
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
-                        domain="[('section_id.user_id','=',uid)]"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         help="My Sales Team"/>
                     <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 6cc8059b1a6..6759590d89d 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -294,7 +294,7 @@
                            <field name="partner_id" select="1" />
                            <field name="section_id" select="1" widget="selection">
                                <filter icon="terp-personal+"
-                                   domain="[('section_id','=',context.get('section_id',False))]"
+                                   domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                    help="My Sale Team" />
                            </field>
                            <field name="user_id" select="1"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index b08ceaf898e..4bcdb8afa49 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -291,7 +291,7 @@
                             context="{'invisible_section': False}"
                             widget="selection">
                             <filter icon="terp-personal+"
-                                domain="[('section_id.user_id','=',uid)]"
+                                domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                 context="{'invisible_section': False}"
                                 help="My Sales Team" />
                             <filter icon="terp-personal+"
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index c61ec1ff0b5..702be16dbea 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -273,7 +273,7 @@
                <field name="section_id"
                    select="1" widget="selection" string="Sales Team">
                    <filter icon="terp-personal+"
-                       domain="[('section_id','=',context.get('section_id',False))]"
+                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                        help="My Sale Team" />
                </field>
                <newline/>
diff --git a/addons/crm/wizard/crm_custom_create_menu_view.xml b/addons/crm/wizard/crm_custom_create_menu_view.xml
index ddd4f2339f0..ad36e51b744 100644
--- a/addons/crm/wizard/crm_custom_create_menu_view.xml
+++ b/addons/crm/wizard/crm_custom_create_menu_view.xml
@@ -11,9 +11,7 @@
                     <field name="name"/>
                     <field name="menu_parent_id"/>
                     <field name="section_id"/>
-                    <label string="This wizard will create all sub-menus, within the selected menu." align="0.0" colspan="4"/>
-                    <label string="You may want to create a new parent menu to put all the created menus in." align="0.0" colspan="4"/>
-                    <separator string="Select Views (Empty for default)" colspan="4"/>
+                    <separator string="Select Views (Empty for Default)" colspan="4"/>
                     <field name="view_form"/>
                     <field name="view_tree"/>
                     <field name="view_calendar"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index b671b15f3dc..22a437e4142 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -291,7 +291,7 @@
                             </field>
                             <field name="section_id" select="1" widget="selection" string="Sales Team">
                                 <filter icon="terp-personal+"
-                                    domain="[('section_id','=',context.get('section_id',False))]"
+                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                                     help="My section" />
                             </field>
                         </group>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 9fb6b673eb2..19f1d9555d5 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -250,7 +250,7 @@
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id" select="1" widget="selection" string="Sales Team">
                         <filter icon="terp-personal+"
-                            domain="[('section_id','=',context.get('section_id',False))]"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="My section" />
                     </field>
                     <newline/>
diff --git a/addons/delivery/__init__.py b/addons/delivery/__init__.py
index 850b14fb7eb..1a504ed97c3 100644
--- a/addons/delivery/__init__.py
+++ b/addons/delivery/__init__.py
@@ -22,6 +22,7 @@
 import delivery
 import partner
 import wizard
+import report
 import sale
 import stock
 
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 9cdc402ae56..b5def0592c6 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -35,6 +35,7 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'wizard/delivery_sale_order_view.xml',
+        'delivery_report.xml',
         'delivery_view.xml',        
         'partner_view.xml'
     ],
diff --git a/addons/sale_delivery_report/sale_delivery_report.xml b/addons/delivery/delivery_report.xml
similarity index 79%
rename from addons/sale_delivery_report/sale_delivery_report.xml
rename to addons/delivery/delivery_report.xml
index 3ba1beeb960..14c1d241131 100644
--- a/addons/sale_delivery_report/sale_delivery_report.xml
+++ b/addons/delivery/delivery_report.xml
@@ -6,7 +6,7 @@
             id="report_shipping"
             model="stock.picking"
             name="sale.shipping"
-            rml="sale_delivery_report/report/shipping.rml" 
+            rml="delivery/report/shipping.rml" 
             string="Delivery order"/>
 
     </data>
diff --git a/addons/sale_delivery_report/report/__init__.py b/addons/delivery/report/__init__.py
similarity index 100%
rename from addons/sale_delivery_report/report/__init__.py
rename to addons/delivery/report/__init__.py
diff --git a/addons/sale_delivery_report/report/shipping.py b/addons/delivery/report/shipping.py
similarity index 100%
rename from addons/sale_delivery_report/report/shipping.py
rename to addons/delivery/report/shipping.py
diff --git a/addons/sale_delivery_report/report/shipping.rml b/addons/delivery/report/shipping.rml
similarity index 100%
rename from addons/sale_delivery_report/report/shipping.rml
rename to addons/delivery/report/shipping.rml
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 34a5c029d51..e7a5f1c195a 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -372,6 +372,9 @@ class procurement_order(osv.osv):
                     cr.execute('update procurement_order set message=%s where id=%s', (_('Not enough stock and no minimum orderpoint rule defined.'), procurement.id))
                     message = _('Procurement ') + " '" + procurement.name + "' "+ _("has an exception.") + _('Not enough stock and no minimum orderpoint rule defined.')
                     self.log(cr, uid, procurement.id, message)
+            if procurement.state=='exception' and procurement.message=='':
+                cr.execute('update procurement_order set message=%s where id=%s', (_('Not enough stock '), procurement.id))                
+                        
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context={}):
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index cd3e0dfb8fa..51dc6941f3f 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -72,6 +72,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
@@ -79,6 +80,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_All_Total_Detail">
       <blockAlignment value="LEFT"/>
@@ -98,18 +100,16 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -132,8 +132,8 @@
     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
@@ -155,13 +155,13 @@
               <td>
                 <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
                 <para style="terp_default_Bold_9">Shipping address :</para>
-                <para style="P1">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
-                <para style="P1">[[ addr.title or '' ]] [[ addr.name ]]</para>
-                <para style="P1">[[ addr.street ]]</para>
-                <para style="P1">[[ addr.street2 or '' ]]</para>
-                <para style="P1">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
-                <para style="P1">[[ addr.state_id and addr.state_id.name or '' ]]</para>
-                <para style="P2">[[ addr.country_id and addr.country_id.name or '' ]]</para>
+                <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+                <para style="terp_default_9">[[ addr.title or '' ]] [[ addr.name ]]</para>
+                <para style="terp_default_9">[[ addr.street ]]</para>
+                <para style="terp_default_9">[[ addr.street2 or '' ]]</para>
+                <para style="terp_default_9">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
+                <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or '' ]]</para>
+                <para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -175,19 +175,19 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street2 or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
-          <para style="P1">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="P1">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
-          <para style="P1">Fax : [[ o.partner_address_id.fax or '' ]]</para>
-          <para style="P1">TVA : [[ o.partner_id.vat or '' ]]</para>
+          <para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
+          <para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para>
+          <para style="terp_default_9">TVA : [[ o.partner_id.vat or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -240,7 +240,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="202.0,57.0,106.0,46.0,59.0,62.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="179.0,82.0,73.0,64.0,56.0,79.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -258,13 +258,13 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Net Price</para>
+          <para style="terp_tblheader_Details_Centre">Net Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="200.0,58.0,106.0,28.0,20.0,59.0,63.0" style="Table_Order_Pur_line_Content">
+      <blockTable colWidths="179.0,82.0,73.0,44.0,20.0,58.0,56.0,23.0" style="Table_Order_Pur_line_Content">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]]</para>
@@ -287,6 +287,9 @@
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]]</para>
           </td>
+          <td>
+            <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+          </td>
         </tr>
         <tr>
           <td>
@@ -322,10 +325,15 @@
               <font color="white"> </font>
             </para>
           </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="413.0,59.0,42.0,20.0" style="Table_All_Total_Detail">
+    <blockTable colWidths="391.0,55.0,66.0,23.0" style="Table_All_Total_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index 1b1256cee19..5f535a05371 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -68,6 +68,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -91,14 +92,14 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -108,8 +109,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -123,10 +124,10 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Italic" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Preformatted Text" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
@@ -217,7 +218,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="208.0,99.0,64.0,59.0,43.0,65.0" repeatRows="1" style="Table4">
+    <blockTable colWidths="203.0,94.0,68.0,59.0,43.0,70.0" repeatRows="1" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -226,7 +227,7 @@
           <para style="terp_tblheader_Details_Centre">VAT</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -235,13 +236,13 @@
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
+          <para style="terp_tblheader_Details_Centre">Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="207.0,99.0,43.0,21.0,59.0,43.0,65.0" style="Table5">
+      <blockTable colWidths="203.0,94.0,47.0,22.0,59.0,42.0,49.0,21.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]]</para>
@@ -264,6 +265,9 @@
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]]</para>
           </td>
+          <td>
+            <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
+          </td>
         </tr>
         <tr>
           <td>
@@ -299,10 +303,15 @@
               <font color="white"> </font>
             </para>
           </td>
+          <td>
+            <para style="terp_default_Right_9">
+              <font color="white"> </font>
+            </para>
+          </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="384.0,67.0,64.0,22.0" style="Table6">
+    <blockTable colWidths="387.0,56.0,73.0,21.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -371,4 +380,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/sale_delivery_report/__init__.py b/addons/sale_delivery_report/__init__.py
deleted file mode 100644
index 7a3708accd9..00000000000
--- a/addons/sale_delivery_report/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_delivery_report/__openerp__.py b/addons/sale_delivery_report/__openerp__.py
deleted file mode 100644
index dfcbe1acb29..00000000000
--- a/addons/sale_delivery_report/__openerp__.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Print Delivery Order',
-    'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
-    'description': """Allows to print a delivery order.""",
-    'author': 'Tiny',
-    'depends': ['sale', 'delivery'],
-    'init_xml': [],
-    'update_xml': [
-        'sale_delivery_report.xml'
-    ],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '00803459507494914221',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_delivery_report/i18n/ar.po b/addons/sale_delivery_report/i18n/ar.po
deleted file mode 100644
index 27fafe39ced..00000000000
--- a/addons/sale_delivery_report/i18n/ar.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/sale_delivery_report/i18n/bg.po b/addons/sale_delivery_report/i18n/bg.po
deleted file mode 100644
index b02604cfb47..00000000000
--- a/addons/sale_delivery_report/i18n/bg.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-16 21:00+0000\n"
-"Last-Translator: Boris <boris.t.ivanov@gmail.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Дата на поръчка"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Отпратка към поръчка"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Тегло"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Предназначение"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Поръчка за доставка :"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Поръчка за доставка"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Отпечатай поръчката за доставка"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Превозвач"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Фактурирано към"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Партида"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Дата на доставка"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Количество"
diff --git a/addons/sale_delivery_report/i18n/bs.po b/addons/sale_delivery_report/i18n/bs.po
deleted file mode 100644
index 27fafe39ced..00000000000
--- a/addons/sale_delivery_report/i18n/bs.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/sale_delivery_report/i18n/ca.po b/addons/sale_delivery_report/i18n/ca.po
deleted file mode 100644
index 4540779bda6..00000000000
--- a/addons/sale_delivery_report/i18n/ca.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-30 08:24+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Data comanda"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. comanda"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Pes"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Destinatari"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Ordre d'enviament :"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Ordre de lliurament"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Imprimeix ordre de lliurament"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Transportista"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturat a"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data d'enviament"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Quantitat"
diff --git a/addons/sale_delivery_report/i18n/cs.po b/addons/sale_delivery_report/i18n/cs.po
deleted file mode 100644
index 2317dae5d5f..00000000000
--- a/addons/sale_delivery_report/i18n/cs.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Datum objednávky"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Hmotnost"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Označení"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Stav dodávky:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Stav dodávky"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Vytisknout stav dodávky"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Nosič"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturovány"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Nmožství"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Datum odeslání"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Množství"
diff --git a/addons/sale_delivery_report/i18n/da.po b/addons/sale_delivery_report/i18n/da.po
deleted file mode 100644
index 5d857632a52..00000000000
--- a/addons/sale_delivery_report/i18n/da.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:38+0000\n"
-"Last-Translator: SmartWi <kurt@smartwi.net>\n"
-"Language-Team: Danish <da@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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Order dato"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Order"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Vægt"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Betegnelse"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Leverings order:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Leverings order"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Udskriv leverings order"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Transportør"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Faktura til"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Forsendelses dato"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Antal"
diff --git a/addons/sale_delivery_report/i18n/de.po b/addons/sale_delivery_report/i18n/de.po
deleted file mode 100644
index 7032995e2ac..00000000000
--- a/addons/sale_delivery_report/i18n/de.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:38+0000\n"
-"Last-Translator: Ferdinand-chricar <Unknown>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Bestelldatum"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Referenz Auftrag"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Gewicht"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Ausschreiben"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Lieferschein:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Lieferschein"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Druck Lieferauftrag"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Frachtführer"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Verrechnet an"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Fertigungslos"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Versanddatum"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Menge"
diff --git a/addons/sale_delivery_report/i18n/el.po b/addons/sale_delivery_report/i18n/el.po
deleted file mode 100644
index d04f45e9e7f..00000000000
--- a/addons/sale_delivery_report/i18n/el.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-16 20:08+0000\n"
-"Last-Translator: Andreas Porevopoulos <Unknown>\n"
-"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Country: GREECE\n"
-"X-Poedit-Language: Greek\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Ημερ/νία Παραγελίας"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Παρ. Παραγγελίας"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Βάρος"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Χαρακτηρισμός"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Εντολή παράδοσης:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Εντολή παράδοσης"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Εκτύπωση εντολής παράδοσης"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Μεταφορέας"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Τιμολογημένο σε"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Παρτίδα"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Ημερ/νία Αποστολής"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Ποσότητα"
diff --git a/addons/sale_delivery_report/i18n/es.po b/addons/sale_delivery_report/i18n/es.po
deleted file mode 100644
index 3b09015a4a2..00000000000
--- a/addons/sale_delivery_report/i18n/es.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-28 07:59+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Fecha pedido"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. pedido"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Destinatario"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Orden de entrega :"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Orden de entrega"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Imprimir orden de entrega"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Transportista"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturado a"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Lote"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Fecha de envío"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Cantidad"
diff --git a/addons/sale_delivery_report/i18n/es_AR.po b/addons/sale_delivery_report/i18n/es_AR.po
deleted file mode 100644
index 4eef31fb531..00000000000
--- a/addons/sale_delivery_report/i18n/es_AR.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-22 19:56+0000\n"
-"Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Fecha pedido"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ref. pedido"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Destinatario"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Orden de entrega :"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Orden de entrega"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Imprimir orden de entrega"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Transportista"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturar a"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Lote"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Fecha de embarque"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Cantidad"
diff --git a/addons/sale_delivery_report/i18n/et.po b/addons/sale_delivery_report/i18n/et.po
deleted file mode 100644
index fd50ae0b897..00000000000
--- a/addons/sale_delivery_report/i18n/et.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 19:56+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Tellimuse kuupäev"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Tellimuse viide"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Kaal"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Sihtkoht"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Tarnetellimus :"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Tarnetellimus"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Prindi kättetoimetamise aruanne"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Tarnija"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Kellele arveldatud:"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Partii"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Tarnimise kuupäev"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Kogus"
diff --git a/addons/sale_delivery_report/i18n/fr.po b/addons/sale_delivery_report/i18n/fr.po
deleted file mode 100644
index 0d885e68b14..00000000000
--- a/addons/sale_delivery_report/i18n/fr.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 19:56+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Date de commande"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Réf. Commande"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Poids brut"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Désignation"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Ordre de livraison :"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Bordereau de livraison"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Imprimer le bordereau de livraison"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Transporteur"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Facturé à"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Date de Livraison"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Quantité"
diff --git a/addons/sale_delivery_report/i18n/hr.po b/addons/sale_delivery_report/i18n/hr.po
deleted file mode 100644
index 4150d402d6e..00000000000
--- a/addons/sale_delivery_report/i18n/hr.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:38+0000\n"
-"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Datum Narudžbe"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Narudžba Ref."
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Težina"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Naznaka"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Otpremna Narudžba"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Otpremna narudžba"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Ispiši Otpremnu Narudžbu"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Nosač"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturirano na"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Datum Otpreme"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Količina"
diff --git a/addons/sale_delivery_report/i18n/hu.po b/addons/sale_delivery_report/i18n/hu.po
deleted file mode 100644
index 27fafe39ced..00000000000
--- a/addons/sale_delivery_report/i18n/hu.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/sale_delivery_report/i18n/id.po b/addons/sale_delivery_report/i18n/id.po
deleted file mode 100644
index f70ebf0da9d..00000000000
--- a/addons/sale_delivery_report/i18n/id.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:57+0000\n"
-"Last-Translator: <>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/sale_delivery_report/i18n/it.po b/addons/sale_delivery_report/i18n/it.po
deleted file mode 100644
index b5507ba748d..00000000000
--- a/addons/sale_delivery_report/i18n/it.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-09 13:20+0000\n"
-"Last-Translator: Carlo - didotech.com <Unknown>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Data Ordine"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Rif. Ordine"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Nomina"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Ordine di consegna:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Ordine di Consegna"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Stampa ordine consegna"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Trasportatore"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fatturato a"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Lotto"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data Spedizione"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Quantità"
diff --git a/addons/sale_delivery_report/i18n/ko.po b/addons/sale_delivery_report/i18n/ko.po
deleted file mode 100644
index 55154f3ce46..00000000000
--- a/addons/sale_delivery_report/i18n/ko.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:31+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
-"Language-Team: Korean <ko@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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "주문 날짜"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "주문 참조"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "무게"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "목적지"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "배송 주문:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "배송 주문"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "배송 주문 인쇄"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "운송자"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "인보이스 대상"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "로트"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "선적 날짜"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "수량"
diff --git a/addons/sale_delivery_report/i18n/lt.po b/addons/sale_delivery_report/i18n/lt.po
deleted file mode 100644
index 27fafe39ced..00000000000
--- a/addons/sale_delivery_report/i18n/lt.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/sale_delivery_report/i18n/nl.po b/addons/sale_delivery_report/i18n/nl.po
deleted file mode 100644
index 82f78ac28e6..00000000000
--- a/addons/sale_delivery_report/i18n/nl.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:41+0000\n"
-"Last-Translator: Freerk Kalsbeek (Mindswitch BV) <f.kalsbeek@mindswitch.nl>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Orderdatum"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Order ref."
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Gewicht"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Term"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Leveringsopdracht:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Leveringsopdracht"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Afdrukken leveringsbon"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Transporteur"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Gefactureerd aan"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Overdoos"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Verzenddatum"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Aantal"
diff --git a/addons/sale_delivery_report/i18n/nl_BE.po b/addons/sale_delivery_report/i18n/nl_BE.po
deleted file mode 100644
index 07da07688da..00000000000
--- a/addons/sale_delivery_report/i18n/nl_BE.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-24 15:11+0000\n"
-"Last-Translator: <>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/sale_delivery_report/i18n/pl.po b/addons/sale_delivery_report/i18n/pl.po
deleted file mode 100644
index f1e9b21b633..00000000000
--- a/addons/sale_delivery_report/i18n/pl.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Data zamówienia"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Odn. zamówienia"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Waga"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Zamówienie dostawy :"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Zamówienie dostawy"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Drukuj zamówienie dostawy"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Przewoźnik"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Zafakturowany na"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Partia"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Data wysyłki"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Ilość"
diff --git a/addons/sale_delivery_report/i18n/pt.po b/addons/sale_delivery_report/i18n/pt.po
deleted file mode 100644
index 81ae8849f86..00000000000
--- a/addons/sale_delivery_report/i18n/pt.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-15 17:20+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Designação"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Quantidade"
diff --git a/addons/sale_delivery_report/i18n/pt_BR.po b/addons/sale_delivery_report/i18n/pt_BR.po
deleted file mode 100644
index e056d693f0c..00000000000
--- a/addons/sale_delivery_report/i18n/pt_BR.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:23+0000\n"
-"Last-Translator: Ronei Junior <ronei.junior@gmail.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/sale_delivery_report/i18n/ro.po b/addons/sale_delivery_report/i18n/ro.po
deleted file mode 100644
index 5222a362fb9..00000000000
--- a/addons/sale_delivery_report/i18n/ro.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:51+0000\n"
-"Last-Translator: Valentin <vali_ile@tybmad.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/sale_delivery_report/i18n/ru.po b/addons/sale_delivery_report/i18n/ru.po
deleted file mode 100644
index 532c7d77c35..00000000000
--- a/addons/sale_delivery_report/i18n/ru.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-08 11:44+0000\n"
-"Last-Translator: Dr.Pedro <Unknown>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Дата заказа"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Ссылка заказа"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Вес"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Обозначение"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Заказ на доставку:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Заказ на доставку"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Печать заказа на доставку"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Перевозчик"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "счет-фактура"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Лот"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Дата отгрузки"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Количество"
diff --git a/addons/sale_delivery_report/i18n/sale_delivery_report.pot b/addons/sale_delivery_report/i18n/sale_delivery_report.pot
deleted file mode 100644
index 625f36a66a3..00000000000
--- a/addons/sale_delivery_report/i18n/sale_delivery_report.pot
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
-
diff --git a/addons/sale_delivery_report/i18n/sl.po b/addons/sale_delivery_report/i18n/sl.po
deleted file mode 100644
index a35d0d24447..00000000000
--- a/addons/sale_delivery_report/i18n/sl.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Datum naročila"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Sklic naročila"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Teža"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Cilj"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Dobavnica:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Dobavnica"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Izpiši dobavnico"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Nosilec"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Zaračunano"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Lot"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Datum odpošiljanja"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Količina"
diff --git a/addons/sale_delivery_report/i18n/sq.po b/addons/sale_delivery_report/i18n/sq.po
deleted file mode 100644
index 6464b25f70c..00000000000
--- a/addons/sale_delivery_report/i18n/sq.po
+++ /dev/null
@@ -1,154 +0,0 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
-
diff --git a/addons/sale_delivery_report/i18n/sv.po b/addons/sale_delivery_report/i18n/sv.po
deleted file mode 100644
index 50e61907a32..00000000000
--- a/addons/sale_delivery_report/i18n/sv.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-24 14:36+0000\n"
-"Last-Translator: Jeanette <jd@mobilasystem.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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Orderdatum"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Order Ref."
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Vikt"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Leveransorder:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Leveransorder"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Skriv ut leveransorder"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fakturamottagare"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Antal"
diff --git a/addons/sale_delivery_report/i18n/tlh.po b/addons/sale_delivery_report/i18n/tlh.po
deleted file mode 100644
index f8de3aee3a8..00000000000
--- a/addons/sale_delivery_report/i18n/tlh.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/sale_delivery_report/i18n/tr.po b/addons/sale_delivery_report/i18n/tr.po
deleted file mode 100644
index cecd1ae341e..00000000000
--- a/addons/sale_delivery_report/i18n/tr.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "Sipariş Tarihi"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "Sipariş Ref."
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Ağırlık"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Tahsis"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Dağıtım Siparişi:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "Dağıtım sırası"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "Dağıtım Siparişini Yazdır"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "Taşıyıcı"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "Fatura Edilen"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "Yer"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "Nakliye Tarihi"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Miktar"
diff --git a/addons/sale_delivery_report/i18n/uk.po b/addons/sale_delivery_report/i18n/uk.po
deleted file mode 100644
index 8876e38fac1..00000000000
--- a/addons/sale_delivery_report/i18n/uk.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:50+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "Вага"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "Призначення"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "Orden de entrega :"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "Кількість"
diff --git a/addons/sale_delivery_report/i18n/vi.po b/addons/sale_delivery_report/i18n/vi.po
deleted file mode 100644
index ddf1bbd07fc..00000000000
--- a/addons/sale_delivery_report/i18n/vi.po
+++ /dev/null
@@ -1,154 +0,0 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
-
diff --git a/addons/sale_delivery_report/i18n/zh_CN.po b/addons/sale_delivery_report/i18n/zh_CN.po
deleted file mode 100644
index 60d510afdcb..00000000000
--- a/addons/sale_delivery_report/i18n/zh_CN.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 10:16+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr "订单日期"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr "订单参考"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr "重量"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr "目标"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr "送货单:"
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr "送货单"
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr "打印送货单"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr "运送者"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr "开票到"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr "批次"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr "运送日期"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr "数量"
-
-#~ msgid "Allows to print a delivery order."
-#~ msgstr "允许打印这送货单"
diff --git a/addons/sale_delivery_report/i18n/zh_TW.po b/addons/sale_delivery_report/i18n/zh_TW.po
deleted file mode 100644
index 0b02ff76668..00000000000
--- a/addons/sale_delivery_report/i18n/zh_TW.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_delivery_report
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-26 14:45+0000\n"
-"Last-Translator: <>\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: 2010-06-22 04:19+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Order Ref."
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Designation"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Delivery Order :"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
-msgid "Delivery order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
-msgid "Print Delivery Order"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Carrier"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Invoiced to"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Lot"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Shipping Date"
-msgstr ""
-
-#. module: sale_delivery_report
-#: rml:sale.shipping:0
-msgid "Quantity"
-msgstr ""
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index 13db9c5da80..ccbd2db9772 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Tools',
     'description': """Module for Warnings form onchange Event.""",
     'author': 'Tiny',
-    'depends': ['base', 'sale'],
+    'depends': ['base', 'sale', 'purchase'],
     'update_xml': ['warning_view.xml'],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
index 67c7bf7b4c3..a54122e0231 100644
--- a/addons/wiki/security/ir.model.access.csv
+++ b/addons/wiki/security/ir.model.access.csv
@@ -3,5 +3,4 @@
 "wiki_groups_all","wiki.groups","model_wiki_groups",,1,0,0,0
 "wiki_wiki","wiki.wiki","model_wiki_wiki","base.group_user",1,1,1,1
 "wiki_groups","wiki.groups","model_wiki_groups","base.group_system",1,1,1,1
-"wiki_groups_link","wiki.groups.link","model_wiki_groups_link","base.group_system",1,1,1,1
 "wiki_wiki_history","wiki.wiki.history","model_wiki_wiki_history","base.group_user",1,0,1,0
diff --git a/addons/wiki/test/wiki_test00.yml b/addons/wiki/test/wiki_test00.yml
index e53871ed277..c77e714b961 100755
--- a/addons/wiki/test/wiki_test00.yml
+++ b/addons/wiki/test/wiki_test00.yml
@@ -21,16 +21,24 @@
       FAQs, quality manuals, technical references, etc.
 
       '
-
+-
+    Creating a wiki make index record
+-
+    !record {model: wiki.make.index, id: wiki_make_index_1}:
+    {}
 -
     I create Index on this current page by clicking on "Create Index" wizard
 -
     !python {model: wiki.make.index}: |
-      ids = self.search(cr, uid, [])
-      self.wiki_do_index(cr, uid, ids , {'active_ids': [ref('wiki_wiki_openerpwikiediting0')]})
+      self.wiki_do_index(cr, uid, [ref("wiki_make_index_1")], {"active_model":
+      wiki.wiki, "active_ids": [ref("wiki_wiki_openerpwikiediting0")], "tz": False, "active_id":
+      ref("wiki_wiki_openerpwikiediting0"), })
 -
-    # Remaining Act window
     I check the page history for the current page by clicking on "Page History".After that find difference between history.
+-
+    !python {model: wizard.wiki.history.show_diff}: |
+      ids = self.search(cr, uid, [])
+      self.get_diff(cr, uid, {'active_id': [ref('wiki_wiki_openerpwikiediting0')]})
 -
     I create a new wiki group on the Given Home Page
 -
@@ -38,13 +46,11 @@
       name: Wiki Group Editing
       home: wiki.wiki_wiki_quickstart0
 -
-    I open a wiki page on this given group and page by clicking on Open wiki Page wizard.
+    I Open the page for click on  "Open Wiki Page" button.
 -
-    !python {model: wiki.wiki.page.open}: |
-      ids = self.search(cr, uid, [])
-      self.open_wiki_page(cr, uid, ids, {'active_ids': [ref('wiki_groups_wikigroupediting0')]})
+    !python {model: wiki.groups}: |
+      self.open_wiki_page(cr, uid, [ref("wiki_groups_wikigroupediting0")], context)
 -
-    # Remaining beacuse of Act window (I search the page by clicking on the "search page".)
     In order to create a menu I will create wizard data
 -
     !record {model: wiki.groups, id: wiki.wiki_groups_wikiformatting0}:
@@ -55,7 +61,6 @@
     !record {model: wiki.create.menu, id: wiki_create_menu_0}:
       menu_name: Wiki Test menu
       menu_parent_id: base.menu_base_partner
-      page: wiki.wiki_wiki_openerpwikiediting0
 -
     I fill in the form and create the menu
 -
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 3fe9d25fcc5..1f85f04afd2 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -1,31 +1,25 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2006 TINY SPRL. (http://axelor.com) All Rights Reserved.
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
+
 from osv import fields, osv
 from tools.translate import _
 import difflib
@@ -53,30 +47,56 @@ class WikiGroup(osv.osv):
        'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
                                    ('tree', 'Tree')], 'Display Method'),
        'home':fields.many2one('wiki.wiki', 'Home Page'),
+       'menu_id': fields.many2one('ir.ui.menu', "Menu", readonly=True),
     }
 
     _defaults = {
         'method': lambda *a: 'page',
     }
 
+    def open_wiki_page(self, cr, uid, ids, context):
+
+        """ Opens Wiki Page of Group
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of open wiki group’s IDs
+        @return: dictionay of open wiki window on give group id
+        """
+        if not context:
+            context = {}
+        if type(ids) in (int,long,):
+            ids = [ids]
+        group_id = False
+        if ids:
+            group_id = ids[0]
+        if not group_id:
+            return {}
+        value = {            
+            'name': 'Wiki Page',
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'wiki.wiki',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+        }
+        group = self.browse(cr, uid, group_id, context=context)
+        value['domain'] = "[('group_id','=',%d)]" % (group.id)
+        if group.method == 'page':
+            value['res_id'] = group.home.id
+        elif group.method == 'list':
+            value['view_type'] = 'form'
+            value['view_mode'] = 'tree,form'
+        elif group.method == 'tree':
+            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            value['view_id'] = view_id
+            value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
+            value['view_type'] = 'tree'
+
+        return value
 WikiGroup()
 
 
-class GroupLink(osv.osv):
-    """ Apply Group Link """
-
-    _name = "wiki.groups.link"
-    _description = "Wiki Groups Links"
-    _rec_name = 'action_id'
-
-    _columns = {
-       'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
-       'action_id': fields.many2one('ir.ui.menu', 'Menu')
-    }
-
-GroupLink()
-
-
 class Wiki2(osv.osv):
     """ Wiki Page """
 
@@ -96,11 +116,11 @@ class Wiki2(osv.osv):
         'minor_edit': fields.boolean('Minor edit', select=True),
         'summary': fields.char('Summary', size=256),
         'section': fields.char('Section', size=32, help="Use page section code like 1.2.1", select=True),
-        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null', 
+        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null',
             help="Topic, also called Wiki Group"),
-        'toc': fields.boolean('Table of Contents', 
+        'toc': fields.boolean('Table of Contents',
             help="Indicates that this pages is a table of contents (linking to other pages)"),
-        'review': fields.boolean('Needs Review', select=True, 
+        'review': fields.boolean('Needs Review', select=True,
             help="Indicates that this page should be reviewed, raising the attention of other contributors"),
         'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
         'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 5a0a3d557bf..6e6d608855a 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -48,11 +48,18 @@
                         <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
                     </page>
                     </notebook>
+                     <field name="menu_id"/>
                      <button
                          name="%(wiki.action_wiki_create_menu)d"
                          string="Create Menu"
                           type="action"
-                          icon="gtk-justify-fill" />
+                          icon="gtk-justify-fill"
+                          attrs="{'invisible':[('menu_id','!=',False)]}"/>
+                     <button
+                         name="open_wiki_page"
+                         string="Open Wiki Page"
+                          type="object"
+                          icon="gtk-ok" />
                 </form>
             </field>
         </record>
@@ -125,7 +132,7 @@
                     <group col="8" colspan="4">
                         <field name="name" select="1" colspan="8"/>
                         <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="section" invisible="not context.get('section',False)"/>
+                        <field name="section"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Content">
@@ -144,7 +151,7 @@
             </field>
         </record>
 
-<!-- wiki Search view  -->
+    <!-- wiki Search view  -->
 
         <record id="view_wiki_filter" model="ir.ui.view">
             <field name="name">wiki.wiki.search</field>
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index f1b28382976..7cee4f88e96 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -29,7 +29,6 @@ class wiki_create_menu(osv.osv_memory):
     _columns = {
         'menu_name': fields.char('Menu Name', size=256, select=True, required=True),
         'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
-        'page': fields.many2one('wiki.wiki', 'Group Home Page'),
     }
 
     def wiki_menu_create(self, cr, uid, ids, context):
@@ -40,28 +39,51 @@ class wiki_create_menu(osv.osv_memory):
         @param ids: List of create menu’s IDs
 
         """
-        mod_obj = self.pool.get('ir.model.data')
-        for menu in self.browse(cr, uid, ids):
-            action_id = mod_obj._get_id(cr, uid, 'wiki', 'action_view_wiki_wiki_page_open')
-            action_id = mod_obj.copy(cr, uid, action_id, context=context, default={
-                'domain':"[('group_id','=',"+str(context.get('active_id',False))+"]",
-                "name": menu.menu_name
-            })
+        obj_wiki_group = self.pool.get('wiki.groups')
+        obj_view = self.pool.get('ir.ui.view')
+        obj_menu = self.pool.get('ir.ui.menu')
+        obj_action = self.pool.get('ir.actions.act_window')
+        group_id = context.get('active_id', False)
+        if not group_id:
+            return {}
 
-            menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
-                            'name': menu.menu_name,
-                            'parent_id':menu.menu_parent_id.id,
-                            'icon': 'STOCK_DIALOG_QUESTION',
-                            'action': 'ir.actions.act_window,'+ str(action_id)
-                            }, context)
-            home = menu.page.id
-            group_id = menu.id
-            res = {
-                    'home': home,
-                    }
-            self.pool.get('wiki.groups').write(cr, uid, ids, res)
-            self.pool.get('wiki.groups.link').create(cr, uid,
-                                {'group_id': group_id, 'action_id': menu_id})
+        datas = self.browse(cr, uid, ids, context=context)
+        data = False
+        if datas:
+            data = datas[0]
+        if not data:
+            return {}
+        value = {            
+            'name': 'Wiki Page',
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'wiki.wiki',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+        }
+        group = obj_wiki_group.browse(cr, uid, group_id, context=context)
+        value['domain'] = "[('group_id','=',%d)]" % (group.id)
+        if group.method == 'page':
+            value['res_id'] = group.home.id
+        elif group.method == 'list':
+            value['view_type'] = 'form'
+            value['view_mode'] = 'tree,form'
+        elif group.method == 'tree':
+            view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            value['view_id'] = view_id
+            value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
+            value['view_type'] = 'tree'
+
+        action_id = obj_action.create(cr, uid, value)
+            
+        menu_id = obj_menu.create(cr, uid, {
+                        'name': data.menu_name,
+                        'parent_id':data.menu_parent_id.id,
+                        'icon': 'STOCK_DIALOG_QUESTION',
+                        'action': 'ir.actions.act_window,'+ str(action_id),
+                        }, context)
+        obj_wiki_group.write(cr, uid, [group_id], {'menu_id':menu_id})        
         return {}
 
 
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index e62f9647ecd..c8f46619235 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -13,7 +13,6 @@
              		<separator string="Menu Information" colspan="4" />
                 	<field name="menu_name" />
                 	<field name="menu_parent_id" />
-                	<field name="page" colspan="4" />
 	                <separator string="" colspan="4" />
     	            <label string="" colspan="2" />
         	        <button special="cancel" string="Cancel" />
diff --git a/addons/wiki/wizard/wiki_show_diff.py b/addons/wiki/wizard/wiki_show_diff.py
index d1a17f0fa45..7654ce3e153 100644
--- a/addons/wiki/wizard/wiki_show_diff.py
+++ b/addons/wiki/wizard/wiki_show_diff.py
@@ -21,6 +21,7 @@
 
 from osv import fields, osv
 from tools.translate import _
+import base64
 
 class showdiff(osv.osv_memory):
     """ Disp[ay Difference for History """
@@ -34,29 +35,31 @@ class showdiff(osv.osv_memory):
         """
         history = self.pool.get('wiki.wiki.history')
         ids = context.get('active_ids')
+
         diff = ""
         if len(ids) == 2:
             if ids[0] > ids[1]:
-                diff = history.getDiff(cr, uid, ids[1], ids[0])
+                diff = base64.encodestring(history.getDiff(cr, uid, ids[1], ids[0]))
             else:
-                diff = history.getDiff(cr, uid, ids[0], ids[1])
+                diff = base64.encodestring(history.getDiff(cr, uid, ids[0], ids[1]))
 
         elif len(ids) == 1:
             old = history.browse(cr, uid, ids[0])
             nids = history.search(cr, uid, [('wiki_id', '=', old.wiki_id.id)])
             nids.sort()
-            diff = history.getDiff(cr, uid, ids[0], nids[-1])
+            diff = base64.encodestring(history.getDiff(cr, uid, ids[0], nids[-1]))
         else:
             raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!'))
 
+
         return diff
 
     _columns = {
-        'diff': fields.text('Diff'),
+        'file_path':fields.binary('Diff', readonly=True),
     }
 
     _defaults = {
-        'diff': get_diff
+        'file_path': get_diff
     }
 
 showdiff()
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index ec8fcb3ca6d..b9a8264cc81 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -11,10 +11,10 @@
             <field name="arch" type="xml">
               <form string="Difference">
     			 <separator colspan="4" string="Notes"/>
-    			 <field name="diff" nolabel="1" colspan="4" width="300"/>
+    			  <field name="file_path" colspan="4" width="300"/>
     	        <label string="" colspan="2" />
     	        <group>
-        	    <button special="cancel" string="OK" icon="gtk-ok" />
+        	    <button special="cancel" string="Close" icon="gtk-close" />
             	</group>
 			</form>
             </field>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 507f3d5cdac..bc876416caa 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -32,12 +32,5 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
     	</record>
-
-<!-- Open Page Action window  -->
-
-    	<act_window id="action_view_wiki_wiki_page_open_vals"
-    		key2="client_action_multi" name="Open Wiki Page"
-    		res_model="wiki.wiki.page.open" src_model="wiki.groups"
-    		view_mode="form" target="new" view_type="form" />
     </data>
 </openerp>