diff --git a/product/ERP5/ERP5Defaults.py b/product/ERP5/ERP5Defaults.py index 7f9a82b8222eee242ae40506df91f08cd2958cc4..fd2e23eb682e0b997d16c5ba476c81b0bd1e406e 100755 --- a/product/ERP5/ERP5Defaults.py +++ b/product/ERP5/ERP5Defaults.py @@ -167,7 +167,7 @@ portal_payment_condition_type_list = ('Condition Paiement',) portal_supply_type_list = ('Purchase Supply','Sale Supply') -portal_supply_movement_type_list = ('Supply Line','Supply Cell') +portal_supply_path_type_list = ('Supply Line','Supply Cell') # This transaction lines are special because destination must be None. portal_balance_transaction_line_type_list = ('Balance Transaction Line',) diff --git a/product/ERP5/ERP5Site.py b/product/ERP5/ERP5Site.py index 37c30162d028f36f49177521a826ae9aaa5a0f43..1a4d75cdbf028735c858126861890e5fb30461d7 100755 --- a/product/ERP5/ERP5Site.py +++ b/product/ERP5/ERP5Site.py @@ -464,13 +464,13 @@ class ERP5Site ( FolderMixIn, CMFSite ): self._getPortalConfiguration('portal_supply_type_list') security.declareProtected(Permissions.AccessContentsInformation, - 'getPortalSupplyMovementTypeList') - def getPortalSupplyMovementTypeList(self): + 'getPortalSupplyPathTypeList') + def getPortalSupplyPathTypeList(self): """ Return supply movement types. """ - return self._getPortalGroupedTypeList('supply_movement') or\ - self._getPortalConfiguration('portal_supply_movement_type_list') + return self._getPortalGroupedTypeList('supply_path') or\ + self._getPortalConfiguration('portal_supply_path_type_list') security.declareProtected(Permissions.AccessContentsInformation, 'getPortalAcquisitionMovementTypeList') @@ -480,8 +480,7 @@ class ERP5Site ( FolderMixIn, CMFSite ): """ return tuple(list(self.getPortalOrderMovementTypeList()) + list(self.getPortalDeliveryMovementTypeList()) + - list(self.getPortalInvoiceMovementTypeList()) + - list(self.getPortalSupplyMovementTypeList())) + list(self.getPortalInvoiceMovementTypeList())) security.declareProtected(Permissions.AccessContentsInformation, 'getPortalMovementTypeList')