[MERGE]Merge with hip branch

bzr revid: tch@tinyerp.com-20121005122319-3thpfgq9de323hbn

addons/sale/sale.py

@@ -87,6 +87,13 @@ class sale_order(osv.osv):
         return res
 
 
+    def test_state(self, cr, uid, ids, mode, *args):
+        return True
+    def action_ship_create(self, cr, uid, ids, context=None):
+        return True
+    def action_ship_end(self, cr, uid, ids, context=None):
+        return True
+
     def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):

addons/sale/test/sale_order_demo.yml

@@ -2,6 +2,7 @@
   In order to test process of the Sale Order, I create sale order
 -
   !record {model: sale.order, id: sale_order_test1}:
+    name: self.pool.get('ir.sequence').get(cr, uid, 'sale.order')
     partner_id: base.res_partner_2
     note: Invoice after delivery
     payment_term: account.account_payment_term