diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml index ecc24f53267c8d4d90d871a50baaa939f419f6c3..8b6529f1e124d193b1953a499e80dca2316301c7 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml @@ -82,7 +82,6 @@ line_list = []\n 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 @@ for model_line in model_line_list:\n 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 @@ for model_line in model_line_list:\n 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 diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml index 80ba3374f01aade136ad024d942f62cb8bc4a901..12d46a58b6d6e22bbbfcded223833ac4138c6fc9 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml @@ -125,7 +125,8 @@ for paysheet_line in paysheet_line_list:\n 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 diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index d61d31715dc7e2f5c05934136b599cc817ce097a..ef491079a37cc374abca2e517e35441c362236d2 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -336 \ No newline at end of file +337 \ No newline at end of file