From df30aedca8c8164229675a44d01fa04129d4b32a Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Sat, 5 Dec 2009 12:56:49 +0000 Subject: [PATCH] 2009-12-5 yusei * Fix PaySheetTransaction_getODTDataDict. Make print pay slip works without pay sheet model. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31100 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../PaySheetTransaction_getODTDataDict.xml | 46 +++++++++++-------- bt5/erp5_payroll/bt/change_log | 3 ++ bt5/erp5_payroll/bt/revision | 2 +- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml index 4af0108dcd..714f389216 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml @@ -56,8 +56,12 @@ <value> <string encoding="cdata"><![CDATA[ translateString = context.Base_translateString\n -model = context.getSpecialiseValue().getEffectiveModel(\\\n - start_date=context.getStartDate(), stop_date=context.getStopDate())\n +specialise_value = context.getSpecialiseValue()\n +\n +#XXX `model` is not used.\n +model = None\n +if specialise_value is not None:\n + model = specialise_value.getEffectiveModel(start_date=context.getStartDate(), stop_date=context.getStopDate())\n \n def getFieldAsString(field):\n return \', \'.join(getFieldAsLineList(field))\n @@ -148,23 +152,24 @@ def getPaymentConditionText(order):\n \n def getSocialOrganisationValue():\n model = context.getSpecialiseValue()\n - business_process_list = model.findSpecialiseValueList(\\\n - context=context, portal_type_list=[\'Business Process\'])\n - business_process = None\n - if len(business_process_list):\n - # XXX currently, is too complicated to use more than\n - # one Business Process, so the first (which is the nearest from the\n - # delivery) is took\n - business_process = business_process_list[0]\n - business_path_list = business_process.getPathValueList(trade_phase=\\\n - \'payroll/invoicing/social_security\')\n - if len(business_path_list) > 1:\n - raise NotImplementedError, \'For now, it can not support more \'\\\n - \'than one business_path with same trade_phase. \'\\\n - \'%s have same trade_phase\' % repr(business_path_list)\n - if len(business_path_list) == 1:\n - business_path = business_path_list[0]\n - return business_path.getSourceSectionValue()\n + if model is not None:\n + business_process_list = model.findSpecialiseValueList(\\\n + context=context, portal_type_list=[\'Business Process\'])\n + business_process = None\n + if len(business_process_list):\n + # XXX currently, is too complicated to use more than\n + # one Business Process, so the first (which is the nearest from the\n + # delivery) is took\n + business_process = business_process_list[0]\n + business_path_list = business_process.getPathValueList(trade_phase=\\\n + \'payroll/invoicing/social_security\')\n + if len(business_path_list) > 1:\n + raise NotImplementedError, \'For now, it can not support more \'\\\n + \'than one business_path with same trade_phase. \'\\\n + \'%s have same trade_phase\' % repr(business_path_list)\n + if len(business_path_list) == 1:\n + business_path = business_path_list[0]\n + return business_path.getSourceSectionValue()\n \n return None\n \n @@ -429,6 +434,8 @@ return unicodeDict(data_dict)\n <string>_getattr_</string> <string>context</string> <string>translateString</string> + <string>specialise_value</string> + <string>None</string> <string>model</string> <string>getFieldAsLineList</string> <string>getFieldAsString</string> @@ -453,7 +460,6 @@ return unicodeDict(data_dict)\n <string>inch_cm_ratio</string> <string>EmptyOrganisation</string> <string>source</string> - <string>None</string> <string>destination</string> <string>source_section</string> <string>destination_section</string> diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log index 4682ec656c..b1a73606fb 100644 --- a/bt5/erp5_payroll/bt/change_log +++ b/bt5/erp5_payroll/bt/change_log @@ -1,3 +1,6 @@ +2009-12-5 yusei +* Fix PaySheetTransaction_getODTDataDict. Make print pay slip works without pay sheet model. + 2009-10-16 yusei * Update for the changes of new portal types of portal types. diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index b18fcc5ba2..db3a73389d 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -535 \ No newline at end of file +536 \ No newline at end of file -- 2.30.9