[MERGE] forward port branch saas-6 up to 490f9cf

addons/l10n_be_intrastat/wizard/xml_decl.py

@@ -316,8 +316,10 @@ class xml_decl(osv.TransientModel):
 
         numlgn = 0
         for linekey in entries:
-            numlgn += 1
             amounts = entries[linekey]
+            if round(amounts[0], 0) == 0:
+                continue
+            numlgn += 1
             item = ET.SubElement(datas, 'Item')
             self._set_Dim(item, 'EXSEQCODE', unicode(numlgn))
             self._set_Dim(item, 'EXTRF', unicode(linekey.EXTRF))

addons/website_sale/controllers/main.py

@@ -134,7 +134,8 @@ class website_sale(http.Controller):
 
     def _get_search_order(self, post):
         # OrderBy will be parsed in orm and so no direct sql injection
-        return 'website_published desc,%s' % post.get('order', 'website_sequence desc')
+        # id is added to be sure that order is a unique sort key
+        return 'website_published desc,%s , id desc' % post.get('order', 'website_sequence desc')
 
     @http.route(['/shop/change_pricelist/<model("product.pricelist"):pl_id>'], type='http', auth="public", website=True)
     def pricelist_change(self, pl_id, **post):