[Erp5-report] r31361 jerome - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Dec 16 19:08:50 2009
New Revision: 31361

URL: http://svn.erp5.org?rev=31361&view=rev
Log:
Show correctly supplier reference or client reference

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml?rev=31361&r1=31360&r2=31361&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_getODTDataDict.xml [utf8] Wed Dec 16 19:08:50 2009
@@ -56,9 +56,7 @@
             <value> <string>def getSourceReference(line):\n
   category_list = line.getAcquiredCategoryList()\n
   portal_type_list = (\'Purchase Supply Line\',\n
-                      \'Purchase Supply Cell\',\n
-                      \'Sale Supply Line\',\n
-                      \'Sale Supply Cell\',)\n
+                      \'Purchase Supply Cell\',)\n
   tmp_context = line.asContext(context=line, categories=category_list)\n
   predicate_list = context.portal_domains.searchPredicateList(tmp_context, portal_type=portal_type_list)\n
   for predicate in predicate_list:\n
@@ -66,6 +64,24 @@
     if source_reference:\n
      return source_reference\n
   return \'\'\n
+\n
+def getDestinationReference(line):\n
+  category_list = line.getAcquiredCategoryList()\n
+  portal_type_list = (\'Sale Supply Line\',\n
+                      \'Sale Supply Cell\',)\n
+  tmp_context = line.asContext(context=line, categories=category_list)\n
+  predicate_list = context.portal_domains.searchPredicateList(tmp_context, portal_type=portal_type_list)\n
+  for predicate in predicate_list:\n
+    destination_reference = predicate.getDestinationReference()\n
+    if destination_reference:\n
+     return destination_reference\n
+  return \'\'\n
+\n
+#if context.getPortalType() in context.getPortalSaleTypeList():\n
+if \'Sale\' in context.getPortalType():\n
+  reference_method = getDestinationReference\n
+else:\n
+  reference_method = getSourceReference\n
 \n
 def getSubLineList(obj):\n
   sub_list = []\n
@@ -78,7 +94,7 @@
     sub_list.extend(getSubLineList(x))\n
   return sub_list\n
 \n
-return context.Delivery_getODTDataDict(getSourceReference, getSubLineList)\n
+return context.Delivery_getODTDataDict(reference_method, getSubLineList)\n
 </string> </value>
         </item>
         <item>
@@ -116,9 +132,11 @@
                         <value>
                           <tuple>
                             <string>getSourceReference</string>
-                            <string>getSubLineList</string>
+                            <string>getDestinationReference</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>reference_method</string>
+                            <string>getSubLineList</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=31361&r1=31360&r2=31361&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Wed Dec 16 19:08:50 2009
@@ -1,1 +1,1 @@
-812
+813