Commit df30aedc authored by Yusei Tahara's avatar Yusei Tahara

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
parent 827365e8
...@@ -56,8 +56,12 @@ ...@@ -56,8 +56,12 @@
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
translateString = context.Base_translateString\n translateString = context.Base_translateString\n
model = context.getSpecialiseValue().getEffectiveModel(\\\n specialise_value = context.getSpecialiseValue()\n
start_date=context.getStartDate(), stop_date=context.getStopDate())\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 \n
def getFieldAsString(field):\n def getFieldAsString(field):\n
return \', \'.join(getFieldAsLineList(field))\n return \', \'.join(getFieldAsLineList(field))\n
...@@ -148,6 +152,7 @@ def getPaymentConditionText(order):\n ...@@ -148,6 +152,7 @@ def getPaymentConditionText(order):\n
\n \n
def getSocialOrganisationValue():\n def getSocialOrganisationValue():\n
model = context.getSpecialiseValue()\n model = context.getSpecialiseValue()\n
if model is not None:\n
business_process_list = model.findSpecialiseValueList(\\\n business_process_list = model.findSpecialiseValueList(\\\n
context=context, portal_type_list=[\'Business Process\'])\n context=context, portal_type_list=[\'Business Process\'])\n
business_process = None\n business_process = None\n
...@@ -429,6 +434,8 @@ return unicodeDict(data_dict)\n ...@@ -429,6 +434,8 @@ return unicodeDict(data_dict)\n
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>translateString</string> <string>translateString</string>
<string>specialise_value</string>
<string>None</string>
<string>model</string> <string>model</string>
<string>getFieldAsLineList</string> <string>getFieldAsLineList</string>
<string>getFieldAsString</string> <string>getFieldAsString</string>
...@@ -453,7 +460,6 @@ return unicodeDict(data_dict)\n ...@@ -453,7 +460,6 @@ return unicodeDict(data_dict)\n
<string>inch_cm_ratio</string> <string>inch_cm_ratio</string>
<string>EmptyOrganisation</string> <string>EmptyOrganisation</string>
<string>source</string> <string>source</string>
<string>None</string>
<string>destination</string> <string>destination</string>
<string>source_section</string> <string>source_section</string>
<string>destination_section</string> <string>destination_section</string>
......
2009-12-5 yusei
* Fix PaySheetTransaction_getODTDataDict. Make print pay slip works without pay sheet model.
2009-10-16 yusei 2009-10-16 yusei
* Update for the changes of new portal types of portal types. * Update for the changes of new portal types of portal types.
......
535 536
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment