From 36533273969975bea9fd4d8a0cc0df190e5cd958 Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Mon, 3 Jan 2005 15:42:09 +0000
Subject: [PATCH] do not use variation, only categories

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2168 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/product/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py b/product/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py
index 9b68f2543e..1a18aba248 100755
--- a/product/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py
+++ b/product/ERP5SyncML/Conduit/ERP5ShopOrderConduit.py
@@ -843,7 +843,11 @@ class ERP5ShopOrderConduit(ERP5Conduit):
         category_list.append(customer_product_variation_list[variation_key])
       #object.setVariationBaseCategoryList(customer_product_base_variation_list)
 #       # TODO : fix this
-      object.setVariationCategoryList(category_list)
+      #object.setVariationCategoryList(category_list)
+      previous_category_list = object.getCategoryList()
+      LOG('ERP5ShopOrderConduit, previous_category_list',0,previous_category_list)
+      category_list = list(previous_category_list) + list(category_list)
+      object.setCategoryList(category_list)
 
     # Do all workflow change at the end
     LOG("enter workflow loop >>>>>>>>",0,repr(workflow_joblist))
-- 
2.30.9