Commit 1c4d3c21 authored by Jérome Perrin's avatar Jérome Perrin

base: minor simplifications to Delivery_getODTDataDict

- use a variable for portal
- move some variables to top of the script
- use any() builtin instead of an equivalent for-loop
parent 59e1221c
# coding: utf-8 # coding: utf-8
translateString = context.Base_translateString portal = context.getPortalObject()
translateString = portal.Base_translateString
request = context.REQUEST request = context.REQUEST
tax_use_list = portal.portal_preferences.getPreferredTaxUseList() or ["use/trade/tax"]
# display only title line instead of description # display only title line instead of description
use_line_title = request.get('use_line_title', 0) use_line_title = request.get('use_line_title', 0)
...@@ -62,8 +65,7 @@ def getSocialCapital(reg_cap): ...@@ -62,8 +65,7 @@ def getSocialCapital(reg_cap):
s += '%s: %s€' % (translateString('Social Capital'), reg_cap) s += '%s: %s€' % (translateString('Social Capital'), reg_cap)
return s return s
preferred_date_order = context.getPortalObject().portal_preferences\ preferred_date_order = portal.portal_preferences.getPreferredDateOrder() or 'ymd'
.getPreferredDateOrder() or 'ymd'
def getOrderedDate(date): def getOrderedDate(date):
if date is None: if date is None:
return '' return ''
...@@ -147,11 +149,7 @@ for line in getSubLineList(context): ...@@ -147,11 +149,7 @@ for line in getSubLineList(context):
display_id = 'title' display_id = 'title'
variation_description = ', '.join([x[0] for x in line.getVariationCategoryItemList(display_id=display_id)]) variation_description = ', '.join([x[0] for x in line.getVariationCategoryItemList(display_id=display_id)])
desc = ('%s %s' % (desc[0], variation_description), ) desc = ('%s %s' % (desc[0], variation_description), )
is_tax = 0 is_tax = any(line.isMemberOf(tax_use) for tax_use in tax_use_list)
for tax_use in (context.getPortalObject().portal_preferences.getPreferredTaxUseList() or ["use/trade/tax"]):
if line.isMemberOf(tax_use):
is_tax = 1
break
#set the not_tax_line with the tax_number and the tax_line with the tax_name #set the not_tax_line with the tax_number and the tax_line with the tax_name
tax_number='' tax_number=''
...@@ -285,7 +283,7 @@ destination_decision = context.getDestinationDecisionValue() ...@@ -285,7 +283,7 @@ destination_decision = context.getDestinationDecisionValue()
if destination_decision is None: if destination_decision is None:
destination_decision = EmptyOrganisation() destination_decision = EmptyOrganisation()
if context.getPortalType() in context.getPortalObject().getPortalOrderTypeList(): if context.getPortalType() in portal.getPortalOrderTypeList():
report_title = context.getSimulationState() == "draft" and "Draft Order" or "Order" report_title = context.getSimulationState() == "draft" and "Draft Order" or "Order"
else: else:
report_title = context.getSimulationState() == "draft" and "Draft Packing List" or "Packing List" report_title = context.getSimulationState() == "draft" and "Draft Packing List" or "Packing List"
......
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