diff --git a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_stock_list.xml b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_stock_list.xml index 5a2f49cc347018a7bf263d46554669f5304bd52a..4f09e91e04abd4d9471879b795be25ae85452a74 100755 --- a/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_stock_list.xml +++ b/bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_stock_list.xml @@ -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 diff --git a/bt5/erp5_banking_core/DocumentTemplateItem/BankingOperation.py b/bt5/erp5_banking_core/DocumentTemplateItem/BankingOperation.py index 5c6795f5820a8823f981d48b25726922da6ccc3b..d827b8dc0aafe6909f570e2b11f428b95989cab6 100755 --- a/bt5/erp5_banking_core/DocumentTemplateItem/BankingOperation.py +++ b/bt5/erp5_banking_core/DocumentTemplateItem/BankingOperation.py @@ -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 diff --git a/bt5/erp5_banking_core/DocumentTemplateItem/BankingOperationLine.py b/bt5/erp5_banking_core/DocumentTemplateItem/BankingOperationLine.py index 5ee82da4dce7ceb75c77c477463dfbad43cb99cd..dc0ff6c6a861266653781f677043171fac155ddc 100755 --- a/bt5/erp5_banking_core/DocumentTemplateItem/BankingOperationLine.py +++ b/bt5/erp5_banking_core/DocumentTemplateItem/BankingOperationLine.py @@ -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() diff --git a/bt5/erp5_banking_core/DocumentTemplateItem/CashCurrency.py b/bt5/erp5_banking_core/DocumentTemplateItem/CashCurrency.py index 2148cd9f75626d2f0223265e8a4cf0a76eab1bf4..31e915d9caea9271c481d9ad6ff5e57451250bf5 100755 --- a/bt5/erp5_banking_core/DocumentTemplateItem/CashCurrency.py +++ b/bt5/erp5_banking_core/DocumentTemplateItem/CashCurrency.py @@ -69,7 +69,7 @@ class CashCurrency(Resource): def getTitle(self,**kw): """ The title will depend on the Portal Type and the value, for example : - Pi锟絜 de 500 + Piece de 500 """ title = self.portal_types[self.getPortalType()].title price = self.getBasePrice() diff --git a/bt5/erp5_banking_core/DocumentTemplateItem/CashDeliveryLine.py b/bt5/erp5_banking_core/DocumentTemplateItem/CashDeliveryLine.py index ddce82e933a8f584aacb3bfd12b040827a5e561e..b38a2ed301c3f6d3158bb628a5bf488caecbf263 100755 --- a/bt5/erp5_banking_core/DocumentTemplateItem/CashDeliveryLine.py +++ b/bt5/erp5_banking_core/DocumentTemplateItem/CashDeliveryLine.py @@ -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 : diff --git a/bt5/erp5_banking_core/bt/change_log b/bt5/erp5_banking_core/bt/change_log index 0bf47fdc92f8fb7fb480bd60148ec4f4e28105f8..8ea6361aa628fb8b55d9a97ecb3593992df51960 100755 --- a/bt5/erp5_banking_core/bt/change_log +++ b/bt5/erp5_banking_core/bt/change_log @@ -1,5 +1,6 @@ 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.