From f640c610f551eada73ac91a2eb4b1734b7dcea1e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 12 Jul 2010 13:36:45 +0530
Subject: [PATCH] [ADD] delivery :Move the sale_delivery_report into delivery

bzr revid: sbh@tinyerp.com-20100712080645-ryvrfvtoixa3o6ck
---
 addons/delivery/__init__.py                                     | 1 +
 addons/delivery/__openerp__.py                                  | 1 +
 .../sale_delivery_report.xml => delivery/delivery_report.xml}   | 2 +-
 addons/{sale_delivery_report => delivery}/report/__init__.py    | 0
 addons/{sale_delivery_report => delivery}/report/shipping.py    | 0
 addons/{sale_delivery_report => delivery}/report/shipping.rml   | 0
 6 files changed, 3 insertions(+), 1 deletion(-)
 rename addons/{sale_delivery_report/sale_delivery_report.xml => delivery/delivery_report.xml} (79%)
 rename addons/{sale_delivery_report => delivery}/report/__init__.py (100%)
 rename addons/{sale_delivery_report => delivery}/report/shipping.py (100%)
 rename addons/{sale_delivery_report => delivery}/report/shipping.rml (100%)

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