From 03ed83f511b9bdb7800186bbed2fdee289a58fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 9 Jun 2008 13:21:53 +0000
Subject: [PATCH] PaySheetModelLine_asCellRange: use translated_title for
display_id
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21427 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_payroll/PaySheetModelLine_asCellRange.xml | 12 ++++++++----
bt5/erp5_payroll/bt/revision | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
index 1e4d55c147..c0cbe06c16 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
@@ -81,8 +81,9 @@ def framing(cell, name):\n
# This error happens when the cell is not found in the parent model or any\n
# inherited model.\n
raise ValueError, "PaySheetModelLine_asCellRange: cell is None for %s" % name\n
- return \'%s <= %s < %s\' % (str(cell.getQuantityRangeMin()), name,\n
- str(cell.getQuantityRangeMax()))\n
+ return \'%s <= %s < %s\' % (cell.getQuantityRangeMin(),\n
+ name,\n
+ cell.getQuantityRangeMax())\n
\n
\n
translateString = context.Base_translateString\n
@@ -95,6 +96,7 @@ if matrixbox :\n
for base_category in base_category_list:\n
category_cell_range = []\n
category_item_list = context.getVariationCategoryItemList(base_category_list = (base_category,),\n
+ display_id=\'translated_logical_path\',\n
checked_permission=\'View\')\n
for category_item in category_item_list:\n
if base_category == \'salary_range\':\n
@@ -103,13 +105,14 @@ if matrixbox :\n
category_item[0])))\n
elif base_category == \'tax_category\':\n
category_cell_range.append((category_item[1], \n
- translateString(\'%s (Amount or Percent)\' % category_item[0])))\n
+ translateString(\'${tax_category_title} (Amount or Percent)\',\n
+ mapping=dict(tax_category_title=category_item[0]))))\n
else:\n
raise ValueError, "PaySheetModelLine_asCellRange: the two categories "\\\n
"must could be only tax_category and salary_range"\n
cell_range.append(category_cell_range)\n
\n
- cell_range = filter(lambda x: x != [], cell_range )\n
+ cell_range = filter(lambda x: x != [], cell_range)\n
return cell_range\n
else:\n
list_of_category_list = []\n
@@ -185,6 +188,7 @@ else:\n
<string>category_item_list</string>
<string>category_item</string>
<string>_getitem_</string>
+ <string>dict</string>
<string>ValueError</string>
<string>filter</string>
<string>list_of_category_list</string>
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index ce83bd94b3..9754915269 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-258
\ No newline at end of file
+259
\ No newline at end of file
--
2.30.9