[Erp5-report] r25196 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Jan 20 11:53:25 CET 2009


Author: fabien
Date: Tue Jan 20 11:53:23 2009
New Revision: 25196

URL: http://svn.erp5.org?rev=25196&view=rev
Log:
remove some unused logs and use short title if it's defined

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml?rev=25196&r1=25195&r2=25196&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml [utf8] Tue Jan 20 11:53:23 2009
@@ -82,7 +82,6 @@
 object_dict_list = []\n
 id = 0\n
 \n
-context.log(model_line_list)\n
 for model_line in model_line_list:\n
   base_category_list = model_line.getVariationBaseCategoryList()\n
   base_application_list = model_line.getBaseApplicationTitleList()\n
@@ -98,9 +97,7 @@
   previous_share = None\n
   object_dict = {}\n
 \n
-  if cartesian_product == [[]]:\n
-    context.log(\'rien\')\n
-    \n
+  if cartesian_product == [[]]: \n
     share_dict = {}\n
     if 0:\n
       share_dict[cell.getTaxCategory()+\'_price\'] = 0\n
@@ -108,8 +105,6 @@
     continue\n
 \n
   for tuple in cartesian_product:\n
-    context.log(tuple)\n
-\n
     share_dict = {}\n
     cell = model_line.getCell(*tuple)\n
     if cell is None:\n

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml?rev=25196&r1=25195&r2=25196&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml [utf8] Tue Jan 20 11:53:23 2009
@@ -125,7 +125,8 @@
     for item in tuple:\n
       # the dict key is the base category and value is the category path\n
       tuple_dict[item.split(\'/\')[0]] = \\\n
-          portal.portal_categories.restrictedTraverse(item).getTitle()\n
+        portal.portal_categories.restrictedTraverse(item).getShortTitle() or \\\n
+        portal.portal_categories.restrictedTraverse(item).getTitle()\n
       tuple_dict[item.split(\'/\')[0]+\'_relative_url\']=item\n
 \n
     # we want to display as lines as a paysheet line as slices\n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=25196&r1=25195&r2=25196&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Tue Jan 20 11:53:23 2009
@@ -1,1 +1,1 @@
-336
+337




More information about the Erp5-report mailing list