diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index b6067ff6c71..5c67b69b820 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -53,8 +53,8 @@ Dashboard for Sales Manager that includes:
     'images': ['images/deliveries_to_invoice.jpeg','images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
     'depends': ['account_voucher'],
     'data': [
-        'wizard/sale_make_invoice_advance.xml',
         'wizard/sale_line_invoice.xml',
+        'wizard/sale_make_invoice_advance.xml',
         'wizard/sale_make_invoice.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index dcaf0828aef..478606e35ea 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -28,10 +28,10 @@
     <!-- Mail template and workflow bindings are done in a NOUPDATE block
          so users can freely customize/delete them -->
     <data noupdate="1">
-         <!-- bind the mailing server action to sale.order confirmed activity
+         <!-- bind the mailing server action to sale.order confirmed activity-->
         <record id="sale.act_wait_ship" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_sale"/>
-        </record> -->
+        </record>
 
 
         <!--Email template -->
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 988b4d86cf6..5e6e24e0083 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -635,11 +635,11 @@ class sale_order(osv.osv):
 
     def cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
             
     def done_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> has been <b>done</b>") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> has been <b>done</b>") % (obj.partner_id.name), context=context)
 
     def invoice_paid_send_note(self, cr, uid, ids, context=None):
         self.message_post(cr, uid, ids, body=_("Invoice has been <b>paid</b>."), context=context)
diff --git a/addons/sale_stock/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
similarity index 100%
rename from addons/sale_stock/wizard/sale_make_invoice.py
rename to addons/sale/wizard/sale_make_invoice.py
diff --git a/addons/sale_stock/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
similarity index 100%
rename from addons/sale_stock/wizard/sale_make_invoice.xml
rename to addons/sale/wizard/sale_make_invoice.xml
diff --git a/addons/sale_stock/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
similarity index 100%
rename from addons/sale_stock/wizard/sale_make_invoice_advance.py
rename to addons/sale/wizard/sale_make_invoice_advance.py
diff --git a/addons/sale_stock/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
similarity index 100%
rename from addons/sale_stock/wizard/sale_make_invoice_advance.xml
rename to addons/sale/wizard/sale_make_invoice_advance.xml
diff --git a/addons/sale_stock/__init__.py b/addons/sale_stock/__init__.py
index 1b63b8b2b8b..b5899113530 100644
--- a/addons/sale_stock/__init__.py
+++ b/addons/sale_stock/__init__.py
@@ -21,7 +21,6 @@
 
 import sale_stock
 import stock
-import wizard
 import report
 import company
 import res_config
diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
index ff4ef80e5ea..7ad341fd741 100644
--- a/addons/sale_stock/__openerp__.py
+++ b/addons/sale_stock/__openerp__.py
@@ -69,10 +69,9 @@ Dashboard for Sales Manager that includes:
                    'company_view.xml',
                    'sale_stock_view.xml',
                    'sale_stock_workflow.xml',
-                    'res_config_view.xml',
-                    'report/sale_report_view.xml',
-                    'process/sale_stock_process.xml',
-                   
+                   'res_config_view.xml',
+                   'report/sale_report_view.xml',
+                   'process/sale_stock_process.xml',
                    ],
    'data': ['sale_stock_data.xml'],
    'demo_xml': ['sale_stock_demo.xml'],
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index c23f8ff46b8..ad4d185b6e0 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -507,10 +507,10 @@ class sale_order(osv.osv):
                 # convert it to the user TZ and re-render it with %Z to add the timezone
                 picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
                 picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
-                self.message_append_note(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
     
     def delivery_end_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Order <b>delivered</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Order <b>delivered</b>."), context=context)
     
     
 class sale_order_line(osv.osv):
diff --git a/addons/sale_stock/wizard/__init__.py b/addons/sale_stock/wizard/__init__.py
index 504e6eddbc0..53c4cba0865 100644
--- a/addons/sale_stock/wizard/__init__.py
+++ b/addons/sale_stock/wizard/__init__.py
@@ -19,7 +19,4 @@
 #
 ##############################################################################
 
-import sale_make_invoice
-import sale_make_invoice_advance
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file