Commit fd83712c authored by Kevin Deldycke's avatar Kevin Deldycke

* Update z_catalog_stock_list to v1.10

* remove logs
* correct encoding


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4569 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b94021c1
......@@ -280,9 +280,7 @@ WHERE\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getDestinationPaymentUid[loop_item], getDestinationFunctionUid[loop_item], getDestinationProjectUid[loop_item], getBaobabSourceSectionUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
</dtml-if>\n
<dtml-if "getBaobabSourceUid[loop_item]">\n
<dtml-if "getInventoriatedQuantity[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getSourcePaymentUid[loop_item], getSourceFunctionUid[loop_item], getSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getResourceUid[loop_item], -getInventoriatedQuantity[loop_item], getStartDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
</dtml-if>\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getSourcePaymentUid[loop_item], getSourceFunctionUid[loop_item], getSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getResourceUid[loop_item], -getInventoriatedQuantity[loop_item], getStartDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
</dtml-if>\n
</dtml-if>\n
</dtml-if>\n
......@@ -370,9 +368,7 @@ WHERE\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getDestinationPaymentUid[loop_item], getDestinationFunctionUid[loop_item], getDestinationProjectUid[loop_item], getBaobabSourceSectionUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], getStopDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
</dtml-if>\n
<dtml-if "getBaobabSourceUid[loop_item]">\n
<dtml-if "getInventoriatedQuantity[loop_item]">\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getSourcePaymentUid[loop_item], getSourceFunctionUid[loop_item], getSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getResourceUid[loop_item], -getInventoriatedQuantity[loop_item], getStartDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
</dtml-if>\n
<dtml-call expr="row_list.append([uid[loop_item], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getSourcePaymentUid[loop_item], getSourceFunctionUid[loop_item], getSourceProjectUid[loop_item], getBaobabDestinationSectionUid[loop_item], getResourceUid[loop_item], -getInventoriatedQuantity[loop_item], getStartDate[loop_item], getPrice[loop_item], isAccountable[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getVariationText[loop_item]])">\n
</dtml-if>\n
</dtml-if>\n
</dtml-if>\n
......
......@@ -65,7 +65,6 @@ class BankingOperation(Delivery,AccountingTransaction):
"""
Returns a calculated source
"""
LOG("KevClasses>> Banking operation >>> getBaobabSourceUid ",0,repr(self))
return self.getSourceUid()
security.declareProtected(Permissions.View, 'getBaobabDestinationUid')
......@@ -73,7 +72,6 @@ class BankingOperation(Delivery,AccountingTransaction):
"""
Returns a calculated destination
"""
LOG("KevClasses>> Banking operation >>> getBaobabDestinationUid ",0,repr(self))
return self.getDestinationUid()
security.declareProtected(Permissions.View, 'getBaobabSourceSectionUid')
......@@ -81,7 +79,6 @@ class BankingOperation(Delivery,AccountingTransaction):
"""
Returns a calculated source section
"""
LOG("KevClasses>> Banking operation >>> getBaobabSourceSectionUid ",0,repr(self))
return self.getSourceSectionUid()
security.declareProtected(Permissions.View, 'getBaobabDestinationSectionUid')
......@@ -89,7 +86,6 @@ class BankingOperation(Delivery,AccountingTransaction):
"""
Returns a calculated destination section
"""
LOG("KevClasses>> Banking operation >>> getBaobabDestinationSectionUid ",0,repr(self))
return self.getDestinationSectionUid()
# Dynamic patch
......
......@@ -54,7 +54,6 @@ class BankingOperationLine(AccountingTransactionLine):
"""
Returns a calculated source
"""
LOG("KevClasses>> Banking operation line >>> getBaobabSourceUid ",0,repr(self))
return self.getSourceUid()
security.declareProtected(Permissions.View, 'getBaobabDestinationUid')
......@@ -62,6 +61,5 @@ class BankingOperationLine(AccountingTransactionLine):
"""
Returns a calculated destination
"""
LOG("KevClasses>> Banking operation line >>> getBaobabDestinationUid ",0,repr(self))
return self.getDestinationUid()
......@@ -69,7 +69,7 @@ class CashCurrency(Resource):
def getTitle(self,**kw):
"""
The title will depend on the Portal Type and the value, for example :
Pie de 500
Piece de 500
"""
title = self.portal_types[self.getPortalType()].title
price = self.getBasePrice()
......
......@@ -75,7 +75,6 @@ class CashDeliveryLine(DeliveryLine):
"""
Returns a calculated source section
"""
LOG("KevClasses>> Cash Delivery Line >>> getBaobabSourceSectionUid ",0,repr(self))
return self.getSourceSectionUid()
security.declareProtected(Permissions.View, 'getBaobabDestinationSectionUid')
......@@ -83,7 +82,6 @@ class CashDeliveryLine(DeliveryLine):
"""
Returns a calculated destination section
"""
LOG("KevClasses>> Cash Delivery Line >>> getBaobabDestinationSectionUid ",0,repr(self))
return self.getDestinationSectionUid()
security.declareProtected(Permissions.View, 'getBaobabSource')
......@@ -91,7 +89,6 @@ class CashDeliveryLine(DeliveryLine):
"""
Returns a calculated source
"""
LOG("KevClasses>> Cash Delivery Line >>> getBaobabSource ",0,repr(self))
if self.portal_type in out_portal_type_list:
return self.portal_categories.resolveCategory(self.getSource()).unrestrictedTraverse('sortante').getRelativeUrl()
elif self.portal_type in in_portal_type_list:
......@@ -103,7 +100,6 @@ class CashDeliveryLine(DeliveryLine):
"""
Returns a calculated source
"""
LOG("KevClasses>> Cash Delivery Line >>> getBaobabSourceUid ",0,repr(self))
if self.portal_type in out_portal_type_list:
return self.portal_categories.resolveCategory(self.getSource()).unrestrictedTraverse('sortante').getUid()
elif self.portal_type in in_portal_type_list:
......@@ -115,7 +111,6 @@ class CashDeliveryLine(DeliveryLine):
"""
Returns a calculated destination
"""
LOG("KevClasses>> Cash Delivery Line >>> getBaobabDestinationUid ",0,repr(self))
if self.portal_type in in_portal_type_list:
return self.portal_categories.resolveCategory(self.getSource()).unrestrictedTraverse('entrante').getUid()
elif self.portal_type in out_portal_type_list :
......
2005-12-08 Kevin
* Delete custom version of ERP5Type_getSecurityCategoryFromAssignment. Move it to erp5_core.
* Update z_catalog_stock_list to v1.10.
2005-12-07 Kevin
* Move CashDetail_loadScript_example, Container_fastInputUpdate, Container_getContaineeTotalPrice, CounterModule_getVaultTransactionList, ImportCsvToCategories to erp5_baobab_config because they contain reference to the local currency.
......
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