Merge branch 'release/3.4.2.1'

openlabs · Mar 18, 2015 · ad1e37e · ad1e37e
2 parents 6557b11 + 769f016
commit ad1e37e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/product.py b/product.py
@@ -9,7 +9,7 @@
 
 '''
 from collections import deque
-from sql import Table
+from sql import Table, Literal
 
 from nereid import render_template, route
 from nereid.globals import session, request, current_app
@@ -63,15 +63,15 @@ def __register__(cls, module_name):
 
             cursor.execute(*media_table.insert(
                 columns=[
+                    media_table.sequence,
                     media_table.product, media_table.template,
                     media_table.static_file,
                 ],
-                values=[
-                    imageset_table.select(
-                        imageset_table.product, imageset_table.template,
-                        imageset_table.image
-                    )
-                ]
+                values=imageset_table.select(
+                    Literal(10),
+                    imageset_table.product, imageset_table.template,
+                    imageset_table.image
+                )
             ))
 
             TableHandler.drop_table(

diff --git a/tryton.cfg b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.2.0
+version=3.4.2.1
 depends:
     product
     nereid