From d8adc7f68c5de0fa4072c01c7e655eabc67fdf1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 10 Sep 2007 08:27:34 +0000 Subject: [PATCH] s/range/xrange git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16202 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../AccountingTransactionModule_viewAnnualSalaryReport.xml | 6 +++--- .../erp5_payroll/PaySheetTransaction_createPayroll.xml | 4 ++-- .../PaySheetTransaction_getResignmentLegalDelay.xml | 4 ++-- bt5/erp5_payroll/bt/revision | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml index fb8c9a26a0..9048cd1c08 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml @@ -176,7 +176,7 @@ monthly_total = {}\n for ((person_path, person_title), person_dict) in gathered_data:\n person_total = 0\n print "<tr><td><a href=\\"%s\\">%s</a></td>" % (person_path, person_title)\n - for month in range(12) :\n + for month in xrange(12) :\n print "<td>"\n if person_dict.has_key(month) :\n person_total += person_dict[month]["salary"]\n @@ -194,7 +194,7 @@ for ((person_path, person_title), person_dict) in gathered_data:\n \n print "<th class=\'total\'>%s</th>" % (N_(\'Total\'))\n check_total = 0\n -for month in range(12):\n +for month in xrange(12):\n print "<td>"\n if monthly_total.has_key(month):\n print monthly_total[month]\n @@ -293,7 +293,7 @@ return printed\n <string>monthly_total</string> <string>person_dict</string> <string>person_total</string> - <string>range</string> + <string>xrange</string> <string>dup_ps</string> <string>check_total</string> </tuple> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayroll.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayroll.xml index 9c8e4b60dd..0e45f29057 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayroll.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createPayroll.xml @@ -80,7 +80,7 @@ payment_date = kw[\'payment_condition_payment_date\']\n currency = kw[\'resource\']\n \n kw = {\'skip_redirect\': True}\n -for line_index in range(len(listbox)):\n +for line_index in xrange(len(listbox)):\n line = listbox[line_index]\n \n # Ignore employee without gross salary\n @@ -186,7 +186,7 @@ context.REQUEST.RESPONSE.redirect("%s?portal_status_message=%s" % ( context.getP <string>currency</string> <string>True</string> <string>_getiter_</string> - <string>range</string> + <string>xrange</string> <string>len</string> <string>line_index</string> <string>line</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getResignmentLegalDelay.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getResignmentLegalDelay.xml index 362e76812b..b1c8248323 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getResignmentLegalDelay.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getResignmentLegalDelay.xml @@ -108,7 +108,7 @@ total_time = int(total_time + (DateTime() - current_start_date))\n \n \n # Get the legal resignment delay\n -for i in range(len(legal_delays)):\n +for i in xrange(len(legal_delays)):\n if i < len(legal_delays)-1:\n if legal_delays[i][\'days\'] >= total_time:\n return legal_delays[i][\'delay\']\n @@ -176,7 +176,7 @@ for i in range(len(legal_delays)):\n <string>TypeError</string> <string>int</string> <string>DateTime</string> - <string>range</string> + <string>xrange</string> <string>len</string> <string>i</string> </tuple> diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 2bab4226fc..147ea53ba1 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -157 \ No newline at end of file +158 \ No newline at end of file -- 2.30.9