Commit b5de8e3b authored by Fabien Morin's avatar Fabien Morin

don't get Description from Model dependence tree but only from paysheet. If...

don't get Description from Model dependence tree but only from paysheet. If nothing is found, nothing is displayed

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27997 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 912c1259
...@@ -231,8 +231,7 @@ data_dict = {\n ...@@ -231,8 +231,7 @@ data_dict = {\n
and getPaymentConditionText(context) or \'\',\n and getPaymentConditionText(context) or \'\',\n
\'price_currency\': getPriceCurrencyId(context.getPriceCurrencyReference() or \'\'),\n \'price_currency\': getPriceCurrencyId(context.getPriceCurrencyReference() or \'\'),\n
\'year\': str(context.getStartDate() is not None and context.getStartDate().year() or \'\'),\n \'year\': str(context.getStartDate() is not None and context.getStartDate().year() or \'\'),\n
\'description\': getFieldAsLineList(context.getDescription() or\n \'description\': getFieldAsLineList(context.getDescription() or \'\'),\n
model.getModelIneritanceEffectiveProperty(context, \'description\') or \'\'),\n
\'year_to_date_gross_salary\': year_to_date_gross_salary,\n \'year_to_date_gross_salary\': year_to_date_gross_salary,\n
\'year_to_date_slice_a\': year_to_date_slice_a,\n \'year_to_date_slice_a\': year_to_date_slice_a,\n
\'year_to_date_worked_hour_count\': year_to_date_worked_hour_count,\n \'year_to_date_worked_hour_count\': year_to_date_worked_hour_count,\n
......
101 104
\ 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