Skip to content

erp5
erp5
Commit 1c60256f authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

*: refactor with a modified 2to3's raise fixer 

The fixer was modified to not rewrite:

raise E, V, T -> raise E(V).with_traceback(T)
raise E, None, T -> raise E.with_traceback(T)

which is python3 only syntax
parent 4e5ad574
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1128 additions and 1143 deletions
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/scripts/checkDates.py
View file @ 1c60256f
......@@ -10,7 +10,7 @@ start_date = closing_period.getStartDate()
stop_date = closing_period.getStopDate()
if start_date > stop_date:
raise ValidationFailed, translateString("Start date is after stop date.")
raise ValidationFailed(translateString("Start date is after stop date."))
period_list = closing_period.getParentValue().searchFolder(
simulation_state=valid_state_list,
......@@ -21,18 +21,18 @@ for period in period_list:
period = period.getObject()
if period.getSimulationState() in valid_state_list:
if start_date <= period.getStopDate() and not stop_date <= period.getStartDate():
raise ValidationFailed, translateString(
raise ValidationFailed(translateString(
"${date} is already in an open accounting period.",
mapping={'date': start_date})
mapping={'date': start_date}))
if len(period_list) > 1:
last_period = period_list[-1].getObject()
if last_period.getId() == closing_period.getId():
last_period = period_list[-2].getObject()
if (start_date - last_period.getStopDate()) > 1:
raise ValidationFailed, translateString(
raise ValidationFailed(translateString(
"Last opened period ends on ${last_openned_date},"+
" this period starts on ${this_period_start_date}."+
" Accounting Periods must be consecutive.",
mapping = { 'last_openned_date': last_period.getStopDate(),
'this_period_start_date': start_date } )
'this_period_start_date': start_date } ))
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/scripts/checkTransactionsState.py
View file @ 1c60256f
......@@ -34,7 +34,7 @@ while section.getPortalType() == period.getPortalType():
section_category = section.getGroup(base=True)
if not section_category:
raise ValidationFailed, translateString("This Organisation must be member of a Group")
raise ValidationFailed(translateString("This Organisation must be member of a Group"))
# XXX copy and paste from AccountingPeriod_createBalanceTransaction !
......@@ -81,5 +81,5 @@ movement_list = portal.portal_simulation.getMovementHistoryList(
limit=1)
if movement_list:
raise ValidationFailed, translateString(
"All Accounting Transactions for this organisation during the period have to be closed first.")
raise ValidationFailed(translateString(
"All Accounting Transactions for this organisation during the period have to be closed first."))
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransactionLines.py
View file @ 1c60256f
......@@ -32,21 +32,21 @@ for line in transaction_lines:
):
if account is not None and account.getValidationState() != 'validated':
raise ValidationFailed, translateString(
raise ValidationFailed(translateString(
"Account ${account_title} is not validated.",
mapping=dict(account_title=account.Account_getFormattedTitle()))
mapping=dict(account_title=account.Account_getFormattedTitle())))
if third_party is not None and\
third_party.getValidationState() in invalid_state_list:
raise ValidationFailed, translateString(
raise ValidationFailed(translateString(
"Third party ${third_party_name} is invalid.",
mapping=dict(third_party_name=third_party.getTitle()))
mapping=dict(third_party_name=third_party.getTitle())))
if bank_account is not None:
if bank_account.getValidationState() in invalid_state_list:
raise ValidationFailed, translateString(
raise ValidationFailed(translateString(
"Bank Account ${bank_account_reference} is invalid.",
mapping=dict(bank_account_reference=bank_account.getReference()))
mapping=dict(bank_account_reference=bank_account.getReference())))
if account is not None and account.isMemberOf('account_type/asset/cash/bank'):
# also check that currencies are consistent if we use this quantity for
......@@ -54,11 +54,11 @@ for line in transaction_lines:
bank_account_currency = bank_account.getProperty('price_currency')
if bank_account_currency is not None and \
bank_account_currency != line.getResource():
raise ValidationFailed, translateString(
raise ValidationFailed(translateString(
"Bank Account ${bank_account_reference} "
"uses ${bank_account_currency} as default currency.",
mapping=dict(bank_account_reference=bank_account.getReference(),
bank_account_currency=bank_account.getPriceCurrencyReference()))
bank_account_currency=bank_account.getPriceCurrencyReference())))
source_currency = None
source_section = line.getSourceSectionValue()
......
bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoice_postGeneration.py
View file @ 1c60256f
......@@ -4,7 +4,7 @@ the new Invoice.
from Products.ERP5Type.Message import translateString
if related_simulation_movement_path_list is None:
raise RuntimeError, 'related_simulation_movement_path_list is missing. Update ERP5 Product.'
raise RuntimeError('related_simulation_movement_path_list is missing. Update ERP5 Product.')
invoice = context
......
bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_inventory_workflow/scripts/validateConsistency.py
View file @ 1c60256f
......@@ -8,17 +8,17 @@ start_date = inventory.getStartDate()
if start_date is None:
text = "Sorry, you must define the inventory date"
message = Message(domain='ui', message=text)
raise ValidationFailed, message
raise ValidationFailed(message)
# Make sure the node is defined
node = inventory.getDestination()
if node is None:
text = "Sorry, you must define the inventory warehouse"
message = Message(domain='ui', message=text)
raise ValidationFailed, message
raise ValidationFailed(message)
# use of the constraint
error_list = inventory.checkConsistency()
if len(error_list) > 0:
raise ValidationFailed, (error_list[0].getTranslatedMessage(),)
raise ValidationFailed(error_list[0].getTranslatedMessage(),)
bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts/checkArchive.py
View file @ 1c60256f
......@@ -11,7 +11,7 @@ catalog_id = archive.getCatalogId()
if "deferred" not in archive.getDeferredConnectionId():
msg = Message(domain='ui', message='Deferred connection ID choose is not a deferred connection.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
def sort_max_date(a, b):
return cmp(a.getStopDateRangeMax(), b.getStopDateRangeMax())
......@@ -32,7 +32,7 @@ if archive.getStopDateRangeMax() is not None:
break
if previous_archive.getStopDateRangeMax().Date() != min_stop_date:
msg = Message(domain='ui', message='Archive are not contiguous.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
else:
previous_archive_list = [x.getObject() for x in archive.portal_catalog(portal_type="Archive",
validation_state='ready')]
......@@ -47,7 +47,7 @@ else:
break
if previous_archive.getStopDateRangeMax().Date() != min_stop_date:
msg = Message(domain='ui', message='Archive are not contiguous.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Check the catalog
......@@ -57,4 +57,4 @@ previous_archive_list = [x.getObject() for x in archive.portal_catalog(portal_ty
for arch in previous_archive_list:
if arch.getCatalogId() == catalog_id and arch is not previous_archive:
msg = Message(domain='ui', message='Use of a former catalog is prohibited.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashExchange_getBaobabSource.py
View file @ 1c60256f
......@@ -9,4 +9,4 @@ for site in site_list:
return site
from Products.ERP5Type.Message import Message
message = Message(domain="ui", message="The owner is not assigned to the right vault.")
raise ValueError,message
raise ValueError(message)
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashToCurrencyPurchase_getBaobabSource.py
View file @ 1c60256f
......@@ -9,4 +9,4 @@ for site in site_list:
return site
from Products.ERP5Type.Message import Message
message = Message(domain="ui", message="The owner is not assigned to the right vault.")
raise ValueError,message
raise ValueError(message)
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashToCurrencySale_getBaobabSource.py
View file @ 1c60256f
......@@ -9,4 +9,4 @@ for site in site_list:
return site
from Products.ERP5Type.Message import Message
message = Message(domain="ui", message="The owner is not assigned to the right vault.")
raise ValueError,message
raise ValueError(message)
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ClassificationSurvey_init.py
View file @ 1c60256f
site_list = context.Baobab_getUserAssignedSiteList()
if len(site_list) == 0:
raise ValueError, "Unable to determine site"
raise ValueError("Unable to determine site")
site = site_list[0]
site = context.Baobab_getVaultSite(site)
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CounterRendering_getBaobabSource.py
View file @ 1c60256f
......@@ -9,4 +9,4 @@ for site in site_list:
return site
from Products.ERP5Type.Message import Message
message = Message(domain="ui", message="Object owner is not assigned to a counter.")
raise ValueError,message
raise ValueError(message)
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CurrencySaleOrPurchase_validateVaultBalance.py
View file @ 1c60256f
......@@ -21,15 +21,15 @@ else:
# check if an exchange rate is defined
if total_quantity is None:
raise ValidationFailed, (Message(domain='ui',
raise ValidationFailed(Message(domain='ui',
message="No exchange rate defined for this currency at document date."))
# check resource on currency fastinput
doc_resource = context.getResource()
for line in context.contentValues(portal_type=foreign_currency_portal_type):
if line.getResourceValue().getPriceCurrency() != doc_resource:
raise ValidationFailed, (Message(domain="ui",
message="Resource defined on document is different from currency cash."), )
raise ValidationFailed(Message(domain="ui",
message="Resource defined on document is different from currency cash."),)
# check outgoing amount
if is_currency_sale:
......@@ -38,7 +38,7 @@ else:
amount = context.getQuantity()
if amount is None or amount <= 0:
msg = Message(domain="ui", message="Amount is not valid.")
raise ValidationFailed, (msg, )
raise ValidationFailed(msg,)
# Reverse error messages in cash of currency purchase
default_msg = "Received amount is different from input cash."
......@@ -49,18 +49,18 @@ if not is_currency_sale:
# Check default currency amount consistency
if context.getTotalPrice(portal_type=[default_currency_portal_type,
'Cash Delivery Cell'], fast=0) != context.getQuantity():
raise ValidationFailed, (Message(domain="ui", message=default_msg), )
raise ValidationFailed(Message(domain="ui", message=default_msg),)
# Check foreign currency amount consistency
if context.getTotalPrice(portal_type=[foreign_currency_portal_type,
'Cash Delivery Cell'], fast=0) != context.getSourceTotalAssetPrice():
raise ValidationFailed, (Message(domain="ui", message=foreign_msg), )
raise ValidationFailed(Message(domain="ui", message=foreign_msg),)
# Check outgoing inventory
resource_one = context.CashDelivery_checkCounterInventory(
portal_type=outgoing_portal_type)
if resource_one == 2:
raise ValidationFailed, (Message(domain="ui", message="No Resource."), )
raise ValidationFailed(Message(domain="ui", message="No Resource."),)
elif resource_one == 1:
raise ValidationFailed, (Message(domain="ui",
message="Insufficient balance"), )
raise ValidationFailed(Message(domain="ui",
message="Insufficient balance"),)
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/DestructionSurvey_init.py
View file @ 1c60256f
......@@ -2,7 +2,7 @@ site = context.Baobab_getUserAssignedRootSite()
if site in ('', None):
from Products.ERP5Type.Message import Message
message = Message(domain="ui", message="The owner is not assigned to the right vault.")
raise ValueError,message
raise ValueError(message)
context.setSource("%s/caveau/auxiliaire/encaisse_des_billets_a_ventiler_et_a_detruire" %(site,))
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyDeposit_getBaobabDestination.py
View file @ 1c60256f
......@@ -9,4 +9,4 @@ for site in site_list:
return site + '/encaisse_des_billets_et_monnaies/entrante'
from Products.ERP5Type.Message import Message
message = Message(domain="ui", message="Object owner is not assigned to a counter.")
raise ValueError,message
raise ValueError(message)
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MoneyDeposit_getBaobabDestination.py
View file @ 1c60256f
......@@ -15,6 +15,6 @@ if source_trade is None or context.getSimulationState() != 'delivered':
return source_trade
from Products.ERP5Type.Message import Message
message = Message(domain="ui", message="The owner is not assigned to the right vault.")
raise ValueError,message
raise ValueError(message)
else:
return source_trade
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_init.py
View file @ 1c60256f
user_site = context.Baobab_getUserAssignedRootSite()
user_counter = context.Baobab_getUserAssignedSiteList()[0]
if user_site in ('', None) or user_counter in ('', None):
raise ValueError, "Unable to determine site"
raise ValueError("Unable to determine site")
if 'guichet' not in user_counter:
raise ValueError, "You are not assigned to a counter"
raise ValueError("You are not assigned to a counter")
context.edit(source=user_counter, source_trade=user_site)
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.py
View file @ 1c60256f
......@@ -21,7 +21,7 @@ if resource_portal_type == 'Banknote':
# This case is/must be protected by a constraint: a document containing a
# line matching this condition must not get validated.
# XXX: Maybe we should return None here instead of raising.
raise Exception, 'Should not be here'
raise Exception('Should not be here')
elif emission_letter == site_letter:
if cash_status == "valid":
# banknote 'valid' from same country -> caisse de reserve / billets et monnaies
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -9,7 +9,7 @@ vault = transaction.getSource()
if not (vault.endswith('encaisse_des_billets_et_monnaies') or vault.endswith('encaisse_des_externes')or \
'encaisse_des_devises' in vault):
msg = Message(domain="ui", message="Invalid source.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
root_site = context.Baobab_getVaultSite(vault)
site_emission_letter = context.Baobab_getSiteEmissionLetter(site=root_site)
......@@ -17,7 +17,7 @@ if vault.endswith('encaisse_des_externes'):
for line in transaction.getMovementList(portal_type=['Outgoing Cash Balance Regulation Line','Cash Delivery Cell']):
if line.getEmissionLetter() == site_emission_letter:
msg = Message(domain="ui", message="You must not select the local emission letter.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check resource between line and document
doc_resource = transaction.getResource()
......@@ -27,10 +27,10 @@ for line in transaction.contentValues(portal_type=['Outgoing Cash Balance Regula
res = line.getResourceValue()
if res.getPriceCurrency() != doc_resource:
msg = Message(domain="ui", message="Resource defined on document is different from input cash.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if resource_type is not None and res.getPortalType() != resource_type:
msg = Message(domain="ui", message="You can't use both banknote and coin on same document.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
resource_type = res.getPortalType()
# check again that we are in the good accounting date
......@@ -56,19 +56,19 @@ outgoing_total = transaction.getTotalPrice(portal_type =['Outgoing Cash Balance
if amount != incoming_total:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if resource_one == 2:
msg = Message(domain="ui", message="No resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource_one == 1:
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if resource_two == 2:
msg = Message(domain="ui", message="No resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if incoming_total != outgoing_total:
msg = Message(domain="ui", message="No same balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -39,16 +39,16 @@ amount_total = transaction.getSourceTotalAssetPrice()
if resource_two == 2:
msg = Message(domain="ui", message="No resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource_two == 1:
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if incoming_total != outgoing_total:
msg = Message(domain="ui", message="No same balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if amount_total != outgoing_total:
msg = Message(domain="ui", message="Amount not correct.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_new_not_emitted_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -14,14 +14,14 @@ transaction.Baobab_checkCounterDateOpen(site=vault, date=transaction.getStartDat
vliste = transaction.checkConsistency()
transaction.log('vliste', vliste)
if len(vliste) != 0:
raise ValidationFailed, (vliste[0].getMessage(),)
raise ValidationFailed(vliste[0].getMessage(),)
portal_type_with_no_space = transaction.getPortalType().replace(' ','')
check_path_script = getattr(transaction,'%s_checkPath' % portal_type_with_no_space,None)
if check_path_script is not None:
message = check_path_script()
if message is not None:
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type='Cash Movement New Not Emitted Line')
......@@ -32,10 +32,10 @@ total_price = transaction.getTotalPrice(portal_type=['Cash Movement New Not Emit
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/setMovementStopDate.py
View file @ 1c60256f
......@@ -8,6 +8,6 @@ transaction = state_change['object']
stop_date_key = 'stop_date'
if not state_change.kwargs.has_key(stop_date_key):
msg = Message(domain = "ui", message="No stop date provided")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
transaction.setStopDate(state_change.kwargs[stop_date_key])
context.validateDestinationCounterDate(state_change, **kw)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -9,12 +9,12 @@ vaultDestination = transaction.getDestination()
if vault is None:
msg = Message(domain="ui",
message="Sorry, you must define a source.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if transaction.isCurrencyHandover() and vaultDestination is not None:
msg = Message(domain="ui",
message="Sorry, you must not set a destination in case of currency handover.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# if not transaction.isCurrencyHandover() and vaultDestination is not None:
# msg = Message(domain="ui",
......@@ -24,7 +24,7 @@ if transaction.isCurrencyHandover() and vaultDestination is not None:
if not transaction.isCurrencyHandover() and vaultDestination is None:
msg = Message(domain="ui",
message="Sorry, you must define a destination.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# use of the constraint : Test source and destination
......@@ -46,7 +46,7 @@ if check_path_script is not None:
message = check_path_script()
transaction.log('check_path_script','found')
if message is not None:
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type='Cash Delivery Line')
......@@ -57,10 +57,10 @@ total_price = transaction.getTotalPrice(portal_type=['Cash Delivery Line','Cash
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_statistic_workflow/scripts/checkConsistency.py
View file @ 1c60256f
......@@ -18,4 +18,4 @@ for resource, total_quantity in resource_dict.items():
resource_value = portal.restrictedTraverse(resource)
message = Message(domain='ui', message="Sorry, you must have a quantity of 1 for : $resource_title",
mapping={'resource_title': resource_value.getTranslatedTitle()})
raise ValidationFailed, message
raise ValidationFailed(message)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/scripts/validateBalance.py
View file @ 1c60256f
......@@ -6,7 +6,7 @@ transaction = state_change['object']
# use of the constraint : Test if quantity is multiple of 1000
vliste = transaction.checkConsistency()
if len(vliste) != 0:
raise ValidationFailed, (vliste[0].getMessage(),)
raise ValidationFailed(vliste[0].getMessage(),)
# check again that we are in the good accounting date
vault = transaction.getSource()
......@@ -23,10 +23,10 @@ resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_
if input_cash != output_cash :
msg=Message(domain="ui", message="Incoming cash amount is different from outgoing cash amount.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif price != output_cash :
msg=Message(domain='ui',message='Amount differs from cash total.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource != 0 :
msg=Message(domain='ui',message='Insufficient Balance.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/scripts/validateBalance.py
View file @ 1c60256f
......@@ -22,10 +22,10 @@ output_cash = transaction.getTotalPrice(portal_type=['Outgoing Classification Su
if input_cash != output_cash :
msg=Message(domain="ui", message="Incoming cash amount is different from outgoing cash amount.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif price != output_cash :
msg=Message(domain='ui',message='Amount differs from cash total.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource != 0 :
msg=Message(domain='ui',message='Insufficient Balance.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -26,10 +26,10 @@ total_price = transaction.getTotalPrice(portal_type=['Cash Delivery Line','Cash
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -15,10 +15,10 @@ total_price = transaction.getTotalPrice(portal_type=['Cash Delivery Line','Cash
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/scripts/checkConsistency.py
View file @ 1c60256f
......@@ -9,18 +9,18 @@ transaction = state_change['object']
vliste = object.checkConsistency()
object.log('vliste', vliste)
if len(vliste) != 0:
raise ValidationFailed, (vliste[0].getMessage(),)
raise ValidationFailed(vliste[0].getMessage(),)
dest = object.getDestination()
# check again that we are in the good accounting date
transaction.Baobab_checkCounterDateOpen(site=dest, date=transaction.getStartDate())
if not 'encaisse_des_devises' in object.getDestination():
msg = Message(domain="ui", message="Wrong Destination Selected.")
raise validationFailed, (msg,)
raise validationFailed(msg,)
object_price = object.getSourceTotalAssetPrice()
line_price = object.getTotalPrice(portal_type=['Cash Delivery Line','Cash Delivery Cell'],fast=0)
if object_price != line_price:
msg = Message(domain="ui", message="Amount differs between document and lines.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/historical_operation_workflow/scripts/checkConsistency.py
View file @ 1c60256f
......@@ -7,13 +7,13 @@ total_cash = delivery.getTotalPrice(fast=0,portal_type=('Cash Delivery Line','Ca
if len(delivery.objectValues(portal_type="Cash Delivery Line")) == 0:
msg=Message(domain='ui',message='No resource defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if total_cash != delivery.getSourceTotalAssetPrice():
msg=Message(domain='ui',message='Amount differs from cash total.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
historical_operation_type = delivery.getHistoricalOperationTypeValue()
if historical_operation_type is None:
msg=Message(domain='ui',message='You must define an historical operation type.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/scripts/validateCounter.py
View file @ 1c60256f
......@@ -16,7 +16,7 @@ context.Baobab_checkCounterOpened(destination)
if transaction.getResource() is None:
msg = Message(domain="ui", message="No resource defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Check getBaobabSource and getBaobabDestination
#transaction.Base_checkBaobabSourceAndDestination()
......@@ -29,11 +29,11 @@ lettering = transaction.getGroupingReference()
if lettering is None:
msg = Message(domain='ui', message='No lettering defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if destination is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
......@@ -43,4 +43,4 @@ cash_detail = transaction.getTotalPrice(portal_type = ['Cash Delivery Line', 'Ca
if price != cash_detail:
msg = Message(domain="ui", message="Amount differs from input.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_payment_workflow/scripts/validateCounter.py
View file @ 1c60256f
......@@ -16,7 +16,7 @@ context.Baobab_checkCounterOpened(source)
if transaction.getPaymentType() in (None, ""):
msg = Message(domain="ui", message="No payment type defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
#test if the source or the destination is correct
......@@ -28,11 +28,11 @@ total_price = transaction.getTotalPrice(portal_type=('Cash Delivery Line','Cash
if amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if source is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
......@@ -47,4 +47,4 @@ resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_t
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/setMovementStopDate.py
View file @ 1c60256f
......@@ -8,6 +8,6 @@ transaction = state_change['object']
stop_date_key = 'stop_date'
if not state_change.kwargs.has_key(stop_date_key):
msg = Message(domain = "ui", message="No stop date provided")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
transaction.setStopDate(state_change.kwargs[stop_date_key])
context.validateDestinationCounterDate(state_change, **kw)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -13,13 +13,13 @@ if check_source_counter_date:
if 'encaisse_des_externes' not in vault and \
'encaisse_des_billets_retires_de_la_circulation' not in vault:
msg = Message(domain="ui", message="Invalid source.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if 'encaisse_des_externes' in vault:
source_section = transaction.getSourceSection()
if source_section is None:
msg = Message(domain="ui", message="Invalid Foreign Agency.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# In case of dematerialization, we must have only coins
......@@ -27,43 +27,43 @@ if transaction.isDematerialization():
for line in transaction.objectValues(portal_type='Monetary Destruction Line'):
if line.getResourceValue().getPortalType() != 'Coin':
msg = Message(domain="ui", message="Sorry, dematerialization is possible only with coins.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Not possible from auxiliary agency
if 'auxiliaire' in vault:
msg = Message(domain="ui", message="You can't do this operation on auxiliary site.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Also we must make sure that the source_section is defined
source_section = transaction.getSourceSection()
if source_section is None:
msg = Message(domain="ui", message="Sorry, dematerialization is possible only if the external agency is defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if 'encaisse_des_billets_retires_de_la_circulation' not in vault:
msg = Message(domain="ui", message="Invalid source.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if source_section in source_object.getPath():
msg = Message(domain="ui", message="You can't used this site.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Check specific for auxiliary agencies
elif "principale" not in vault:
site = transaction.getSourceSection()
if site in (None, ""):
msg = Message(domain="ui", message="You must select a foreign agency.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
source_country_site = transaction.Baobab_getVaultSite(source_object)
source_country = transaction.Baobab_getCountryForSite(source_country_site)
site_country = transaction.Baobab_getCountryForSite(site)
if 'encaisse_des_externes' in vault and \
site_country == source_country:
msg = Message(domain="ui", message="You must select an agency from a foreign country.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif 'encaisse_des_billets_retires_de_la_circulation' in vault and \
site_country != source_country:
msg = Message(domain="ui", message="You must select an agency from the same country.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Get price and total_price.
......@@ -73,10 +73,10 @@ resource = transaction.CashDelivery_checkCounterInventory(source=source_object.g
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -7,7 +7,7 @@ transaction = state_change['object']
vliste = transaction.checkConsistency()
transaction.log('vliste', vliste)
if len(vliste) != 0:
raise ValidationFailed, (vliste[0].getMessage(),)
raise ValidationFailed(vliste[0].getMessage(),)
vault = transaction.getSource()
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type='Monetary Issue Line')
......@@ -21,10 +21,10 @@ total_price = transaction.getTotalPrice(portal_type=['Monetary Issue Line','Cash
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/scripts/ValidateVaultBalance.py
View file @ 1c60256f
......@@ -7,7 +7,7 @@ vault = transaction.getSource()
if ('encaisse_des_billets_et_monnaies' not in vault):
msg = Message(domain="ui", message="Invalid source.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type='Monetary Recall Line')
......@@ -25,10 +25,10 @@ total_price = transaction.getTotalPrice(portal_type=['Monetary Recall Line','Cas
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/scripts/checkDestination.py
View file @ 1c60256f
......@@ -7,18 +7,18 @@ object = state_change['object']
vliste = object.checkConsistency()
object.log('vliste', vliste)
if len(vliste) != 0:
raise ValidationFailed, (vliste[0].getMessage(),)
raise ValidationFailed(vliste[0].getMessage(),)
# first check if we have line defined
if len(object.objectValues(portal_type='Cash Delivery Line')) == 0:
msg = Message(domain="ui", message="No line defined on document.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
dest = object.getDestinationValue()
if dest is None or 'encaisse_des_billets_retires_de_la_circulation' in dest.getRelativeUrl():
msg = Message(domain="ui", message="Wrong Destination Selected.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check again that we are in the good accounting date
object.Baobab_checkCounterDateOpen(site=dest, date=object.getStartDate())
......@@ -32,4 +32,4 @@ if 'transit' not in dest.getRelativeUrl():
line_letter = first_movement.getEmissionLetter()
if line_letter.lower() != dest.getCodification()[0].lower():
msg = Message(domain="ui", message="Letter defined on line do not correspond to destination site.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -8,7 +8,7 @@ destination = transaction.getDestination()
if vault is None or destination is None:
msg = Message(domain="ui", message="You must define source and destination.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check we are in an opened accounting day
......@@ -16,19 +16,19 @@ transaction.Baobab_checkCounterDateOpen(site=vault, date=date)
if ('encaisse_des_billets_et_monnaies' not in vault) and ('encaisse_des_billets_a_ventiler_et_a_detruire' not in vault):
msg = Message(domain="ui", message="Invalid source.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if ('encaisse_des_billets_et_monnaies' not in destination) and ('encaisse_des_billets_a_ventiler_et_a_detruire' not in destination):
msg = Message(domain="ui", message="Invalid destination.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if ('encaisse_des_billets_et_monnaies' in vault) and ('encaisse_des_billets_a_ventiler_et_a_detruire' not in destination):
msg = Message(domain="ui", message="Impossible Monetary Survey.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if ('encaisse_des_billets_a_ventiler_et_a_detruire' in vault) and ('encaisse_des_billets_et_monnaies' not in destination):
msg = Message(domain="ui", message="Impossible Monetary Survey Reintregration.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type='Cash Delivery Line')
# Get price and total_price.
......@@ -37,10 +37,10 @@ total_price = transaction.getTotalPrice(portal_type=['Cash Delivery Line','Cash
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -22,10 +22,10 @@ total_price = transaction.getTotalPrice(portal_type=['Cash Delivery Line','Cash
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateCounter.py
View file @ 1c60256f
......@@ -9,12 +9,12 @@ transaction.log('destination:',destination)
amount = transaction.getSourceTotalAssetPrice()
if amount is None:
msg = Message(domain="ui", message="Sorry, you have to define a quantity.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
destination_payment = transaction.getDestinationPayment()
if destination_payment is None:
msg = Message(domain="ui", message="Sorry, you have to define an account.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
var_state = transaction.getSimulationState()
if var_state == 'confirmed':
......@@ -24,11 +24,11 @@ if var_state == 'confirmed':
if amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if destination is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check we are in an opened accounting day
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -40,10 +40,10 @@ cash_detail = transaction.getTotalPrice(portal_type=['Cash Delivery Line','Cash
#transaction.log("price vs cash detail", str((price, cash_detail)))
if resource == 3:
msg = Message(domain="ui", message="No banknote or coin defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource == 2:
msg = Message(domain="ui", message="No resource defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif price != cash_detail:
msg = Message(domain="ui", message="Amount differs from input.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/scripts/CheckTransitionDeliver.py
View file @ 1c60256f
......@@ -18,15 +18,15 @@ for outgoing_line in ob.objectValues(portal_type="Outgoing Mutilated Banknote Li
if len(ob.objectValues(portal_type="Outgoing Mutilated Banknote Line")) == 0:
msg = Message(domain = "ui", message="You must defined returned banknote.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if ob.getDestinationTotalAssetPrice() != ob.getTotalPrice(portal_type="Outgoing Mutilated Banknote Line", fast=0):
msg = Message(domain = "ui", message="Returned value different from exchanged value.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# now check balance
resource = ob.CashDelivery_checkCounterInventory(source=vault, portal_type='Outgoing Mutilated Banknote Line', same_source=1)
if resource == 2:
msg = Message(domain="ui", message="No Returned banknote defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/scripts/CheckTransitionFinish.py
View file @ 1c60256f
......@@ -12,14 +12,14 @@ for exchanged_line in ob.objectValues(portal_type='Exchanged Mutilated Banknote
if ob.getDestinationTotalAssetPrice() == 0:
msg = Message(domain = "ui", message="Exchanged amount must be defined on document.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if len(ob.objectValues(portal_type='Exchanged Mutilated Banknote Line')) == 0:
msg = Message(domain = "ui", message="You must defined exchanged banknote line.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
exchanged_mutilated_banknote_total_price = ob.getTotalPrice(portal_type='Exchanged Mutilated Banknote Line', fast=0)
if exchanged_mutilated_banknote_total_price > ob.getTotalPrice(portal_type='Incoming Mutilated Banknote Line', fast=0):
msg = Message(domain = "ui", message="Total exchanged greater than total supply.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if exchanged_mutilated_banknote_total_price != ob.getDestinationTotalAssetPrice():
msg = Message(domain = "ui", message="Exchanged amount differ between line and document.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/scripts/CheckTransitionPlan.py
View file @ 1c60256f
......@@ -6,4 +6,4 @@ ob = state_change['object']
# check presence of banknote
if len(ob.objectValues(portal_type="Exchanged Mutilated Banknote Line")) != 0:
msg = Message(domain = "ui", message="Transition forbidden with exchanged banknote line defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/scripts/CheckTransitionStop.py
View file @ 1c60256f
......@@ -10,19 +10,19 @@ ob.Baobab_checkCounterDateOpen(site=ob.getSource(), date=ob.getStartDate())
# check presence of banknote
if len(ob.objectValues()) == 0:
msg = Message(domain = "ui", message="No mutilated banknotes defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check price defined
if ob.getSourceTotalAssetPrice() != ob.getTotalPrice(portal_type='Incoming Mutilated Banknote Line', fast=0):
msg = Message(domain = "ui", message="Amount differ between document and line.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check reporter defined
if ob.getDeponent() in (None, ""):
msg = Message(domain = "ui", message="You must define a reporter.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check original site defined is hq
if "siege" in ob.getSource() and ob.getSourceTrade() is None:
msg = Message(domain = "ui", message="You must define the original site.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -9,7 +9,7 @@ vaultDestination = transaction.getDestination()
# use of the constraint
vliste = transaction.checkConsistency()
if len(vliste) != 0:
raise ValidationFailed, (vliste[0].getTranslatedMessage(),)
raise ValidationFailed(vliste[0].getTranslatedMessage(),)
# check we are in an opened accounting day
transaction.Baobab_checkCounterDateOpen(site=vault, date=date)
......@@ -19,7 +19,7 @@ if 'reserve' in vault and 'salle_tri' in vaultDestination:
mapping={'source':transaction.getSourceValue().getParentValue().getTitle(),
'destination':transaction.getDestinationValue().getParentValue().getTitle()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type='Cash Delivery Line')
# Get price and total_price.
......@@ -28,10 +28,10 @@ total_price = transaction.getTotalPrice(portal_type=['Cash Delivery Line','Cash
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -19,7 +19,7 @@ context.Baobab_checkCounterOpened(source_counter)
vliste = transaction.checkConsistency()
transaction.log('vliste', vliste)
if len(vliste) != 0:
raise ValidationFailed, (vliste[0].getMessage(),)
raise ValidationFailed(vliste[0].getMessage(),)
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type='Cash Delivery Line')
......@@ -29,10 +29,10 @@ total_price = transaction.getTotalPrice(portal_type=['Cash Delivery Line','Cash
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -8,13 +8,13 @@ vaultDestination = transaction.getDestination()
if vault is None or vaultDestination is None:
msg = Message(domain="ui", message="You must define vaults.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# use of the constraint : Test source and destination
vliste = transaction.checkConsistency()
transaction.log('vliste', vliste)
if len(vliste) != 0:
raise ValidationFailed, (vliste[0].getMessage(),)
raise ValidationFailed(vliste[0].getMessage(),)
# check we are in an opened accounting day
transaction.Baobab_checkCounterDateOpen(site=vaultDestination, date=date)
......@@ -25,7 +25,7 @@ if 'reserve' in vault and 'salle_tri' in vaultDestination:
mapping={'source':transaction.getSourceValue().getParentValue().getTitle(),
'destination':transaction.getDestinationValue().getParentValue().getTitle()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
resource = transaction.CashDelivery_checkCounterInventory(source=vault, portal_type='Vault Transfer Line')
# Get price and total_price.
......@@ -34,10 +34,10 @@ total_price = transaction.getTotalPrice(portal_type=['Vault Transfer Line','Vaul
if resource == 2:
msg = Message(domain="ui", message="No Resource.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif amount != total_price:
msg = Message(domain="ui", message="Amount differ from total price.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource <> 0 :
msg = Message(domain="ui", message="Insufficient Balance.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_check/ExtensionTemplateItem/portal_components/extension.erp5.CheckbookReceptionImport.py
View file @ 1c60256f
......@@ -43,7 +43,7 @@ def CheckbookReception_importItemFile(self, import_file=None, REQUEST=None, **kw
'Check Model'],
reference = reference_dict[checkbook_type])
if len(resource_list) != 1:
raise ValueError, "The import does not support this type : %s" % checkbook_type
raise ValueError("The import does not support this type : %s" % checkbook_type)
resource = resource_list[0].getObject()
resource_relative_url = resource.getRelativeUrl()
resource_amount_dict = {}
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkCheck.py
View file @ 1c60256f
......@@ -18,6 +18,6 @@ if simulation_state != 'confirmed':
msg = Message(domain='ui', message=bad_simulation_state_dict[simulation_state])
else:
msg = 'Invalid and unhandled simulation state: %s' % (simulation_state, )
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
return check
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkOrCreateCheck.py
View file @ 1c60256f
......@@ -15,11 +15,11 @@ if bank_account is None:
if bank_account is None:
msg = Message(domain='ui',message='Sorry, you must select an account')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if resource is None:
msg = Message(domain='ui',message='Sorry, you must select a resource')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if reference is not None:
reference_list = [reference]
......@@ -38,11 +38,11 @@ elif reference_range_min is not None or reference_range_max is not None:
reference_range_max = int(reference_range_max)
except ValueError:
msg = Message(domain='ui', message='Sorry, make sure you have entered the right check number.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if reference_range_min>reference_range_max :
msg = Message(domain='ui', message='Sorry, the min number must be less than the max number.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
for ref in range(reference_range_min,reference_range_max+1):
# We will look for each reference and add the right number
......@@ -59,7 +59,7 @@ for check_reference in reference_list:
# just raise an error.
if context.portal_activities.countMessageWithTag(message_tag) != 0:
msg = Message(domain='ui', message="There are operations pending that prevent to validate this document. Please try again later.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
result = context.portal_catalog(portal_type = 'Check', reference = check_reference,
destination_payment_uid = bank_account.getUid(),
default_resource_uid = resource_value.uid,
......@@ -70,13 +70,13 @@ for check_reference in reference_list:
msg = Message(domain = "ui", message="Sorry, the $type $reference for the account $account does not exist",
mapping={'reference' : check_reference, 'account': bank_account.getInternalBankAccountNumber(),
'type': resource_value.getTitle()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif result_len > 1:
msg = Message(domain = "ui", message="Sorry, the $type $reference for the account $account is duplicated",
mapping={'reference' : reference, 'account': bank_account.getInternalBankAccountNumber(),
'type': resource_value.getTitle()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
reference_dict[check_reference] = {}
reference_dict[check_reference]['result'] = result
......@@ -96,10 +96,10 @@ for check_reference in reference_list:
composition_related_list = resource_value.getCompositionRelatedValueList()
if len(composition_related_list) == 0:
msg = Message(domain = "ui", message="Sorry, no checkbook model found")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if len(composition_related_list) != 1:
msg = Message(domain = "ui", message="Sorry, too many many checkbook model found")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
generic_model = composition_related_list[0]
#generic_model = context.portal_catalog(portal_type = 'Checkbook Model', title = 'Generic')[0].getObject()
......@@ -120,7 +120,7 @@ for check_reference in reference_list:
checkbook_tag = "checkbook_%s_%s" % (resource, bank_account_uid)
if context.portal_activities.countMessageWithTag(checkbook_tag) != 0:
msg = Message(domain='ui', message="There are operations pending that prevent to validate this document. Please try again later.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
checkbook = context.checkbook_module.newContent(portal_type = 'Checkbook',
title = 'Generic',
resource_value = generic_model,
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.py
View file @ 1c60256f
......@@ -43,7 +43,7 @@ def convertTravelerCheckReferenceToInt(traveler_check_reference):
def convertCheckReferenceToInt(check_reference):
if len(check_reference) != 7:
raise ValueError, 'Check reference must be 7-char long.'
raise ValueError('Check reference must be 7-char long.')
return int(check_reference)
# listbox is not passed at the first time when this script is called.
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_checkAggregateStockList.py
View file @ 1c60256f
......@@ -16,4 +16,4 @@ for line in context.getMovementList():
reference = '%s - %s' % (aggregate_value.getReferenceRangeMin() or '', aggregate_value.getReferenceRangeMax() or '')
msg = Message(domain="ui", message="Sorry, the item with reference $reference is not available any more",
mapping={'reference':reference})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.py
View file @ 1c60256f
......@@ -27,7 +27,7 @@ def validateTravelerCheckReferenceFormat(traveler_check_reference):
"""
if len(traveler_check_reference) != 10:
message = Message(domain='ui', message='Traveler check reference must be 10-char long.')
raise ValueError, (message,)
raise ValueError(message,)
int(traveler_check_reference[4:])
def getTravelerCheckReferenceNumber(traveler_check_reference):
......@@ -51,10 +51,10 @@ def generateTravelerCheckReference(number, original_traveler_check_reference):
"""
if not same_type(number, 0):
message = Message(domain='ui', message='Traveler check number must be only numeric.')
raise ValueError, (message, )
raise ValueError(message,)
if len(str(number)) > 6:
message = Message(domain='ui', message='Traveler check number representation length must not exceed 6 char.')
raise ValueError, (message,)
raise ValueError(message,)
prefix = getTravelerCheckReferencePrefix(original_traveler_check_reference)
return '%s%06d' % (prefix, number)
......@@ -69,7 +69,7 @@ def assertReferenceMatchListEmpty(match_list, internal_bank_account_number):
matched_reference_list.append('%s (%s)' % (match.getReference(), internal_bank_account_number))
message = Message(domain='ui', message='The following references are already allocated : $reference_list',
mapping={'reference_list': matched_reference_list})
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
def checkReferenceListUniqueness(reference_list, model_uid, destination_payment_value, unique_per_account):
"""
......@@ -101,7 +101,7 @@ def checkReferenceListUniqueness(reference_list, model_uid, destination_payment_
if encountered_check_identifiers_dict.has_key(tag):
message = Message(domain='ui', message='The following references are already allocated : $reference_list',
mapping={'reference_list': ['%s (%s)' % (reference, internal_bank_account_number) ]})
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
encountered_check_identifiers_dict[tag] = None
start_date = checkbook_reception.getStartDate()
......@@ -149,7 +149,7 @@ if resource.getAccountNumberEnabled():
context.log('context.getRelativeUrl() before getUid of destination payment', context.getRelativeUrl())
if destination_payment_value is None:
message = Message(domain='ui', message='There is not destination payment on line with id: $id', mapping={'id': context.getId()})
raise ValueError, (message,)
raise ValueError(message,)
destination_trade = line.getDestinationTrade()
else:
destination_payment_value = None
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.py
View file @ 1c60256f
......@@ -12,7 +12,7 @@ from Products.ERP5Type.Message import Message
destination_id = context.getDestinationId()
if destination_id is None:
msg = Message(domain='ui', message='Sorry, you must define the site')
raise ValidationFailed, (msg, )
raise ValidationFailed(msg,)
# serialize destination vault to only have one operation at a time
destination_value = context.getDestinationValue()
......@@ -28,7 +28,7 @@ else:
msg = Message(domain='ui', message='Sorry, there is already a checkbook reception newly validated')
checkbook_reception_tag = "CheckbookReception_%s" % destination_id
if context.portal_activities.countMessageWithTag(checkbook_reception_tag) != 0:
raise ValidationFailed, (msg, )
raise ValidationFailed(msg,)
if check == 1:
encountered_check_identifiers_dict = {}
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckPurchase_init.py
View file @ 1c60256f
......@@ -27,5 +27,5 @@ for site in site_list:
if user_site is None:
from Products.ERP5Type.Message import Message
message = Message(domain="ui", message="The owner is not assigned to the right vault.")
raise ValueError,message
raise ValueError(message)
context.setSource(user_site)
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/TravelerCheckSale_getBaobabSource.py
View file @ 1c60256f
......@@ -9,4 +9,4 @@ for site in site_list:
return site + '/encaisse_des_billets_et_monnaies'
from Products.ERP5Type.Message import Message
message = Message(domain="ui", message="The owner is not assigned to the right vault.")
raise ValueError,message
raise ValueError(message)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/checkAccountIsOverdraftFacility.py
View file @ 1c60256f
......@@ -9,8 +9,8 @@ for line in txn.contentValues(filter = {'portal_type' : 'Check Operation Line'}
if account is None:
msg = Message(domain='ui', message="No account defined on line")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if not account.isOverdraftFacility():
msg = Message(domain='ui', message="Can't sent to manual validation because of not overdraft facility for this bank account")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/checkCheckBeforeDelivery.py
View file @ 1c60256f
......@@ -37,14 +37,14 @@ else:
if error['error_code'] == 1:
msg = Message(domain='ui', message="Bank account $account is not sufficient on line $line.",
mapping={"account": source_bank_account.getInternalBankAccountNumber(), "line" : check_operation_line.getId()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] == 2:
msg = Message(domain='ui', message="Bank account $account is not valid on $line.",
mapping={"account": source_bank_account.getInternalBankAccountNumber(), "line" : check_operation_line.getId()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] != 0:
msg = Message(domain='ui', message="Unknown error code.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
context.validateSourceAndDestination(state_change)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateConsistency.py
View file @ 1c60256f
......@@ -12,34 +12,34 @@ transaction.Baobab_checkAccountingDateOpen(site=site, date=date)
if transaction.getDestinationSection() not in ("", None) and \
transaction.getDestinationPayment() not in ("", None):
msg = Message(domain='ui', message="You can't defined both account and accounting code.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if transaction.getDestinationSection() in ("", None) and \
transaction.getDestinationPayment() in ("", None):
msg = Message(domain='ui', message="You must defined an account or and accounting code as destination.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if transaction.getSite() in ("", None):
msg = Message(domain='ui', message="You must defined site on document.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Check the amount.
price = transaction.getSourceTotalAssetPrice()
if price is None or price <= 0:
msg = Message(domain='ui', message='Amount is not valid.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Check the bank account.
destination_bank_account = transaction.getDestinationPaymentValue()
if destination_bank_account is not None:
if destination_bank_account.getValidationState() != 'valid':
msg = Message(domain='ui', message='Destination bank account is not valid.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Check if the total price is equal to the total asset price.
if transaction.getTotalPrice(fast=0, portal_type = 'Check Operation Line') != transaction.getSourceTotalAssetPrice():
msg = Message(domain='ui', message="Total price doesn't match.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
seen_check_dict = {}
......@@ -51,13 +51,13 @@ for check_operation_line in transaction.contentValues(filter = {'portal_type' :
if check_operation_line.getDescription() in (None, ''):
msg = Message(domain='ui', message='The description is not defined on line $line.'
, mapping={"line" : check_operation_line.getId()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
source_bank_account = check_operation_line.getSourcePaymentValue()
if source_bank_account is None:
msg = Message(domain='ui', message='Bank account not defined on line $line.'
, mapping={"line" : check_operation_line.getId()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
check_number = check_operation_line.getAggregateFreeText()
check_type = check_operation_line.getAggregateResource()
......@@ -65,29 +65,29 @@ for check_operation_line in transaction.contentValues(filter = {'portal_type' :
if check_number:
msg = Message(domain='ui', message='Check is defined on line $line.'
, mapping={"line" : check_operation_line.getId()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if check_type is not None:
msg = Message(domain='ui', message='Check type is defined on line $line.'
, mapping={"line" : check_operation_line.getId()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
else:
if not check_number:
msg = Message(domain='ui', message='Check is not defined on line $line.'
, mapping={"line" : check_operation_line.getId()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if check_type is None:
msg = Message(domain='ui', message='Check type is not defined on line $line.'
, mapping={"line" : check_operation_line.getId()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
seen_check_dict_key = (source_bank_account, check_type, check_number)
seen_check = seen_check_dict.get(seen_check_dict_key)
if seen_check is not None:
msg = Message(domain='ui', message='Check on line $line is already used on line $oldline.'
, mapping={"line" : check_operation_line.getId(), "oldline": seen_check})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
seen_check_dict[seen_check_dict_key] = check_operation_line.getId()
# Test check is valid based on date
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validatePlanActionConsistency.py
View file @ 1c60256f
......@@ -15,13 +15,13 @@ for account_path, amount in amount_dict.items():
error = transaction.BankAccount_checkBalance(account_path, amount)['error_code']
source_bank_account = bank_account_dict[account_path]
if error == 1:
raise ValidationFailed, (Message(domain='ui', message="Bank account $account is not sufficient.",
mapping={"account": source_bank_account.getInternalBankAccountNumber()}), )
raise ValidationFailed(Message(domain='ui', message="Bank account $account is not sufficient.",
mapping={"account": source_bank_account.getInternalBankAccountNumber()}),)
elif error == 2:
raise ValidationFailed, (Message(domain='ui', message="Bank account $account is not valid.",
mapping={"account": source_bank_account.getInternalBankAccountNumber()}), )
raise ValidationFailed(Message(domain='ui', message="Bank account $account is not valid.",
mapping={"account": source_bank_account.getInternalBankAccountNumber()}),)
elif error != 0:
raise ValidationFailed, (Message(domain='ui', message="Unknown error code."),)
raise ValidationFailed(Message(domain='ui', message="Unknown error code."),)
context.validateConsistency(state_change)
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/checkAccountIsOverdraftFacility.py
View file @ 1c60256f
......@@ -6,7 +6,7 @@ date = transaction.getStartDate()
source = transaction.getSource(None)
if source is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check we are in an opened accounting day
transaction.Baobab_checkCounterDateOpen(site=source, date=date)
......@@ -21,7 +21,7 @@ bank_account = transaction.getDestinationPaymentValue()
if not bank_account.isOverdraftFacility():
msg = Message(domain='ui', message="Can't sent to manual validation because of not overdraft facility for this bank account")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
price = transaction.getSourceTotalAssetPrice()
......@@ -31,7 +31,7 @@ bank_account.serialize()
# Make sure there are no other operations pending for this account
if transaction.BankAccount_isMessagePending(bank_account):
msg = Message(domain='ui', message="There are operations pending for this account that prevent form calculating its position. Please try again later.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Index the banking operation line so it impacts account position
transaction.BankingOperationLine_index(line)
......@@ -39,4 +39,4 @@ transaction.BankingOperationLine_index(line)
# Check if the banking operation is correct. Do not depend on catalog because line might not be indexed immediatelly.
if - price != (line.getPrice() * line.getQuantity()):
msg = Message(domain='ui', message='Banking operation and check payment price do not match.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateConsistency.py
View file @ 1c60256f
......@@ -16,14 +16,14 @@ else:
while True:
if not hasattr(site, 'getVaultTypeList'):
msg = Message(domain = 'ui', message = 'The site value is misconfigured; report this to system administrators.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if 'site' in site.getVaultTypeList():
break
site = site.getParentValue()
if site is None:
msg = Message(domain = 'ui', message = 'Impossible to determine site for the transaction.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
date = transaction.getStartDate()
......@@ -40,13 +40,13 @@ document_date = DateTime(date).Date()
price = transaction.getSourceTotalAssetPrice()
if price is None or price <= 0:
msg = Message(domain="ui", message="Amount is not valid.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Check the bank account.
bank_account = transaction.getDestinationPaymentValue()
if bank_account is None:
msg = Message(domain='ui', message='Bank account is not defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Check the check.
check_number = transaction.getAggregateFreeText()
......@@ -59,10 +59,10 @@ transaction.edit(aggregate_resource=check_resource)
if not check_number:
msg = Message(domain='ui', message="Check not defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if check_resource is None:
msg = Message(domain='ui', message="Check type not defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
check = transaction.Base_checkCheck(reference=check_number, bank_account=bank_account,
resource=check_resource)
......@@ -79,10 +79,10 @@ if no_balance_check == 1:
error = transaction.BankAccount_checkAvailableBalance(bank_account.getRelativeUrl(), price)
if error['error_code'] == 1:
msg = Message(domain='ui', message="Bank account is not sufficient.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] == 2:
msg = Message(domain='ui', message="Bank account is not valid.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] != 0:
msg = Message(domain='ui', message="Unknown error code.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validatePositionAccounting.py
View file @ 1c60256f
......@@ -6,7 +6,7 @@ date = transaction.getStartDate()
source = transaction.getSource(None)
if source is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check we are in an opened accounting day
transaction.Baobab_checkCounterDateOpen(site=source, date=date)
......@@ -28,7 +28,7 @@ bank_account.serialize()
# Make sure there are no other operations pending for this account
if transaction.BankAccount_isMessagePending(bank_account):
msg = Message(domain='ui', message="There are operations pending for this account that prevent form calculating its position. Please try again later.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Index the banking operation line so it impacts account position
transaction.BankingOperationLine_index(line)
......@@ -36,17 +36,17 @@ transaction.BankingOperationLine_index(line)
# Check if the banking operation is correct. Do not depend on catalog because line might not be indexed immediatelly.
if - price != (line.getPrice() * line.getQuantity()):
msg = Message(domain='ui', message='Banking operation and check payment price do not match.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Test if the account balance is sufficient.
if state_change['transition'].getId() != "agree_action":
error = transaction.BankAccount_checkAvailableBalance(bank_account.getRelativeUrl(), price)
if error['error_code'] == 1:
msg = Message(domain='ui', message="Bank account is not sufficient.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] == 2:
msg = Message(domain='ui', message="Bank account is not valid.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] != 0:
msg = Message(domain='ui', message="Unknown error code.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateVaultBalance.py
View file @ 1c60256f
......@@ -18,7 +18,7 @@ for site in site_list:
if baobab_source is None:
msg = Message(domain="ui", message="Unable to determine counter from user assignement.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
source = baobab_source
source_object = context.portal_categories.getCategoryValue(source)
......@@ -40,16 +40,16 @@ cash_detail = transaction.getTotalPrice(portal_type = ('Cash Delivery Line','Cas
#transaction.log("price vs cash detail", str((price, cash_detail)))
if resource == 3:
msg = Message(domain="ui", message="No banknote or coin defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource == 2:
msg = Message(domain="ui", message="No resource defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif price != cash_detail:
msg = Message(domain="ui", message="Amount differs from input.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif resource == 1:
msg = Message(domain="ui", message="Insufficient Balance in counter.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
transaction.Base_checkCheck(None, None, None, check=transaction.getAggregateValue())
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/scripts/checkConsistency.py
View file @ 1c60256f
......@@ -11,16 +11,16 @@ date = transaction.getStartDate()
source = transaction.getBaobabSource(None)
if source is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
destination_payment = transaction.getDestinationPayment()
if destination_payment is None:
msg = Message(domain='ui', message='No account defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if sum([len(x.getAggregateList()) for x in transaction.objectValues(portal_type=['Checkbook Delivery Line'])]) == 0:
msg = Message(domain='ui', message='No checkbook selected for delivery.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
at_date = transaction.getStartDate()
transaction.CheckbookDelivery_checkAggregateStockList(at_date=at_date, node_url = source)
......@@ -44,13 +44,13 @@ for line in line_list:
if aggregate.getPortalType()=='Check':
if aggregate.getSimulationState() != 'draft':
message = Message(domain='ui', message='Sorry, the check is not new')
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
if aggregate.getPortalType()=='Checkbook':
if aggregate.getValidationState() != 'draft':
message = Message(domain='ui', message='Sorry, the checkbook is not new')
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
for check in aggregate.objectValues(portal_type='Check'):
if check.getSimulationState() != 'draft':
message = Message(domain='ui',
message='Sorry, there is a check wich is not in the new state inside the checkbook')
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_validateData.py
View file @ 1c60256f
......@@ -7,15 +7,15 @@ object = state_change['object']
destination = object.getDestination()
if destination is None:
message = Message(domain="ui",message="Please select a destination")
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
# Check that the destination is not empty
description = object.getDescription()
if description in (None, ''):
message = Message(domain="ui",message="Please set a description")
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
# Check that there is a least one line
if len(object.objectValues())==0:
message = Message(domain="ui",message="Please enter some check or checkbooks")
raise ValidationFailed, (message,)
raise ValidationFailed(message,)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.py
View file @ 1c60256f
......@@ -19,4 +19,4 @@ at_date = transaction.getStartDate()
transaction.CheckbookDelivery_checkAggregateStockList(at_date=at_date, node_url = source)
if msg is not None:
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.py
View file @ 1c60256f
......@@ -17,4 +17,4 @@ at_date = transaction.getStartDate()
transaction.CheckbookDelivery_checkAggregateStockList(at_date=at_date, node_url = source)
if msg is not None:
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/liftPositionAccounting.py
View file @ 1c60256f
......@@ -7,7 +7,7 @@ date = transaction.getStartDate()
source = transaction.getSource(None)
if source is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# No need to check the counter date for stop payment
#if not transaction.Baobab_checkCounterDateOpen(site=source, date=date):
......@@ -24,17 +24,17 @@ for movement in movement_list:
for item in aggregate_value_list:
if item.getPortalType()!='Check':
msg = Message(domain = "ui", message="Sorry, You should select a check")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if item.getSimulationState()!='stopped':
msg = Message(domain = "ui", message="Sorry, this check is not stopped")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
debit_required = transaction.isDebitRequired()
if debit_required:
if transaction.getSimulationState() == 'started':
stop_date = state_change.kwargs.get('stop_date')
if stop_date is None:
msg = Message(domain = "ui", message="No stop date provided")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
transaction.setStopDate(stop_date)
# Source and destination will be updated automaticaly based on the category of bank account
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/updateCheck.py
View file @ 1c60256f
......@@ -14,7 +14,7 @@ ref_max = transaction.getReferenceRangeMin()
if ref_min is not None or ref_max is not None:
if len(aggregate_list)==0:
msg = Message(domain='ui', message='Sorry, no check was found, but there is a reference.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
for aggregate in aggregate_list:
if aggregate.getPortalType()=='Check':
aggregate.setStopDate(transaction.getStartDate())
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/scripts/validatePositionAccounting.py
View file @ 1c60256f
......@@ -10,7 +10,7 @@ now = DateTime()
source = transaction.getSource(None)
if source is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# No need for stop payment to check the counter date
#if not transaction.Baobab_checkCounterDateOpen(site=source, date=date):
......@@ -64,10 +64,10 @@ for movement in movement_list:
for item in aggregate_value_list:
if item.getPortalType()!='Check':
msg = Message(domain = "ui", message="Sorry, You should select a check")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if item.getSimulationState()!='confirmed':
msg = Message(domain = "ui", message="Sorry, this check is not issued")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Test check is valid based on date
transaction.Check_checkIntervalBetweenDate(resource=item.getResourceValue(),
start_date=date,
......@@ -78,7 +78,7 @@ for movement in movement_list:
debit_required = transaction.isDebitRequired()
if total_debit in (None,0.0) and debit_required:
msg = Message(domain = "ui", message="Sorry, you forgot to give the amount")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if debit_required:
# Source and destination will be updated automaticaly based on the category of bank account
# The default account chosen should act as some kind of *temp* account or *parent* account
......@@ -101,7 +101,7 @@ if debit_required:
# Make sure there are no other operations pending for this account
if transaction.BankAccount_isMessagePending(bank_account):
msg = Message(domain='ui', message="There are operations pending for this account that prevent form calculating its position. Please try again later.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Index the banking operation line so it impacts account position
transaction.BankingOperationLine_index(line)
......@@ -110,10 +110,10 @@ if debit_required:
error = transaction.BankAccount_checkBalance(bank_account.getRelativeUrl(), total_debit)
if error['error_code'] == 1:
msg = Message(domain='ui', message="Bank account is not sufficient.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] == 2:
msg = Message(domain='ui', message="Bank account is not valid.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] != 0:
msg = Message(domain='ui', message="Unknown error code.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/scripts/validatePositionAccounting.py
View file @ 1c60256f
......@@ -7,7 +7,7 @@ date = transaction.getStartDate()
source = transaction.getSource(None)
if source is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check we don't change of user
transaction.Baobab_checkSameUserVault(source)
......@@ -28,7 +28,7 @@ for movement in movement_list:
if item.getPortalType()=='Check':
if item.getSimulationState()!='confirmed':
msg = Message(domain = "ui", message="Sorry, one traveler check was not sale yet")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if item.getPrice() is not None:
# then we must calculate the exchange value at the
# time where the item was first delivered
......@@ -40,11 +40,11 @@ for movement in movement_list:
start_date=item.getStartDate())[0]
if base_price is None:
msg = Message(domain = "ui", message="Sorry, no valid price was found for this currency")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
total_credit += base_price*item.getPrice()
else:
msg = Message(domain = "ui", message="Sorry, the price was not defined on some traveler checks")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if total_credit>0:
total_credit = round(total_credit,0)
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/scripts/validatePositionAccounting.py
View file @ 1c60256f
......@@ -6,7 +6,7 @@ transaction = state_change['object']
# check we have defined an account
if transaction.getDestinationPayment() is None:
msg = Message(domain = "ui", message="Sorry, no account selected")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# First we have to look if we have some checks with some prices,
# if so, this means that we are saling such kinds of check, thus
......@@ -18,7 +18,7 @@ for movement in movement_list:
for item in aggregate_value_list:
if item.getSimulationState()!='draft':
msg = Message(domain = "ui", message="Sorry, one traveler check was already saled")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if item.getPortalType()=='Check':
if item.getPrice() is not None:
# then we must calculate the exchange value
......@@ -29,11 +29,11 @@ for movement in movement_list:
currency_exchange_type='transfer')[0]
if base_price is None:
msg = Message(domain = "ui", message="Sorry, no valid price was found for this currency")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
total_debit += base_price*item.getPrice()
else:
msg = Message(domain = "ui", message="Sorry, the price was not defined on some traveler checks")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if total_debit>0:
total_debit = round(total_debit)
# Source and destination will be updated automaticaly based on the category of bank account
......@@ -53,7 +53,7 @@ if total_debit>0:
if bank_account is None:
msg = Message(domain='ui', message="Sorry, no account defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
price = total_debit
......@@ -63,7 +63,7 @@ if total_debit>0:
# Make sure there are no other operations pending for this account
if context.BankAccount_isMessagePending(bank_account):
msg = Message(domain='ui', message="There are operations pending for this account that prevent form calculating its position. Please try again later.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Index the banking operation line so it impacts account position
context.BankingOperationLine_index(line)
......@@ -72,23 +72,23 @@ if total_debit>0:
error = transaction.BankAccount_checkBalance(bank_account.getRelativeUrl(), price)
if error['error_code'] == 1:
msg = Message(domain='ui', message="Bank account is not sufficient.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] == 2:
msg = Message(domain='ui', message="Bank account is not valid.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif error['error_code'] != 0:
msg = Message(domain='ui', message="Unknown error code.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if total_debit==0:
msg = Message(domain='ui', message='Please select at least one traveler check.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
date = transaction.getStartDate()
source = transaction.getSource(None)
if source is None:
msg = Message(domain='ui', message='No counter defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check we are in an opened accounting day
transaction.Baobab_checkCounterDateOpen(site=source, date=date)
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/AccountingDate_init.py
View file @ 1c60256f
......@@ -2,7 +2,7 @@ from DateTime import DateTime
user_site_list = context.Baobab_getUserAssignedSiteList()
if len(user_site_list) == 0:
raise ValueError, "You cannot create an AccountingDate if you don't have an assignment."
raise ValueError("You cannot create an AccountingDate if you don't have an assignment.")
site = context.Baobab_getVaultSite(user_site_list[0])
context.setSiteValue(site)
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getMessageTag.py
View file @ 1c60256f
reference = bank_account.getReference()
if not same_type(reference, ''):
raise TypeError, 'Reference is not a string: %s.getReference() == %s' % (repr(bank_account), repr(reference))
raise TypeError('Reference is not a string: %s.getReference() == %s' % (repr(bank_account), repr(reference)))
return 'bank_account_%s' % (reference, )
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getPosition.py
View file @ 1c60256f
bank_account = context
resource = bank_account.getPriceCurrencyValue()
if resource is None:
raise AttributeError, 'No currency defined on %s' % payment
raise AttributeError('No currency defined on %s' % payment)
account_balance = getattr(resource, get_inventory_id)(
payment_uid=bank_account.getUid(),
optimisation__=False, # XXX: optimisation disabled as it has bugs
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportInformationList.py
View file @ 1c60256f
......@@ -6,7 +6,7 @@ portal_type = "Bank Account"
if reference is None:
message = Message(domain="ui", message="Please give a reference")
raise ValueError, message
raise ValueError(message)
#context.log('reference',reference)
account_list = catalog(string_index=reference, portal_type=portal_type, validation_state=('valid', 'closed'))
......@@ -17,10 +17,10 @@ if len(account_list) == 0:
#context.log('len 2',len(account_list))
if len(account_list) == 0:
message = Message(domain="ui", message="No bank account have this reference")
raise ValueError, message
raise ValueError(message)
if force_one_account and len(account_list) != 1:
message = Message(domain="ui", message="More than one account match this research")
raise ValueError, message
raise ValueError(message)
account_list = [x.getObject() for x in account_list]
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkAccountingDateOpen.py
View file @ 1c60256f
......@@ -35,6 +35,6 @@ else:
if DateTime(date) < opened_accounting_date:
msg = Message(domain = "ui", message="Transaction date incompatible with opened accounting date ${accounting_date}.", mapping={'accounting_date': opened_accounting_date})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
return "ok"
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterDateOpen.py
View file @ 1c60256f
......@@ -27,4 +27,4 @@ site = context.Baobab_getVaultSite(site)
if context.portal_catalog.countResults(portal_type='Counter Date', start_date=date, site_id=site.getId(), simulation_state="open")[0][0] == 0:
msg = Message(domain = "ui", message="Transaction not in the good counter date")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkCounterOpened.py
View file @ 1c60256f
......@@ -18,4 +18,4 @@ for counter_ob in counter_list:
found = 1
if found == 0:
msg = Message(domain = "ui", message="Counter is not opened")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkRemainingOperation.py
View file @ 1c60256f
......@@ -14,4 +14,4 @@ for document in document_list:
message = Message(domain="ui",
message="Sorry, the $portal_type (reference:$reference) is not finished",
mapping={'portal_type':portal_type,'reference':reference})
raise ValidationFailed,message
raise ValidationFailed(message)
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkSameUserVault.py
View file @ 1c60256f
......@@ -8,4 +8,4 @@ for site in site_list:
return
msg = Message(domain = "ui", message="Vault differ between initialisation and transition")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkStockBeforeClosingDate.py
View file @ 1c60256f
......@@ -35,13 +35,13 @@ for counter_vault in counter_vault_list:
message = Message(domain='ui',
message='Sorry, some resources are still remaining here : $counter_title',
mapping={'counter_title':counter_title})
raise ValidationFailed,message
raise ValidationFailed(message)
max_price = context.portal_preferences.getPreferredUsualCashMaxRenderingPrice()
if max_price is None:
message = Message(domain='ui',
message='Sorry, you must defined the max price for the usual cash in your preference')
raise ValidationFailed,message
raise ValidationFailed(message)
usual_cash = site.getRelativeUrl() + '/surface/caisse_courante/encaisse_des_billets_et_monnaies'
inventory_list = context.portal_simulation.getCurrentInventoryList(
......@@ -53,4 +53,4 @@ context.log('current_price',total_price)
if total_price > max_price:
message = Message(domain='ui',
message='Sorry, the amount in the usual cash is too high')
raise ValidationFailed,message
raise ValidationFailed(message)
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCountryForSite.py
View file @ 1c60256f
......@@ -10,7 +10,7 @@ def getCountry(site):
organisation = context.organisation_module[orga_id]
country = organisation.getDefaultRegionTitle()
if country is None:
raise ValueError, "No Region found for site %s / %s defined by organisation %s" %(site.getPath(), site.getCodification(), organisation.getPath())
raise ValueError("No Region found for site %s / %s defined by organisation %s" %(site.getPath(), site.getCodification(), organisation.getPath()))
return country
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultCurrency.py
View file @ 1c60256f
......@@ -16,4 +16,4 @@ if 'encaisse_des_devises' in vault_list:
else:
return context.currency_module[context.Baobab_getPortalReferenceCurrencyID()].getRelativeUrl()
raise ValueError, 'No currency found for vault %s' %vault
raise ValueError('No currency found for vault %s' %vault)
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultSite.py
View file @ 1c60256f
......@@ -10,7 +10,7 @@ while True:
if not hasattr(site, 'getVaultTypeList'):
context.log('no getVaultTypeList on :', site.getRelativeUrl())
msg = Message(domain = 'ui', message = 'The site value is misconfigured; report this to system administrators.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if 'site' in site.getVaultTypeList():
break
site = site.getParentValue()
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_checkBaobabSourceAndDestination.py
View file @ 1c60256f
......@@ -16,4 +16,4 @@ for object in object_to_check_list:
except KeyError:
context.log('Error on ', (context.getRelativeUrl(),node_url))
msg = Message(domain='ui',message='Sorry, wrong source or destination')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Base_getCheckModelByReference.py
View file @ 1c60256f
......@@ -2,7 +2,7 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed
from Products.ERP5Type.Message import Message
if reference is None:
msg = Message(domain='ui', message="Check not defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
model_list = [x
for x in context.checkbook_model_module.objectValues()
if x.getReference() == reference
......@@ -11,8 +11,8 @@ model_list = [x
model_list_len = len(model_list)
if model_list_len == 0:
msg = Message(domain='ui', message="Check not defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if model_list_len > 1:
msg = Message(domain='ui', message="Two many check models with this reference.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
return model_list[0]
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDelivery_checkCounterInventory.py
View file @ 1c60256f
......@@ -51,7 +51,7 @@ activity_tool = context.portal_activities
def checkActivities(source_counter):
if activity_tool.countMessageWithTag(source_counter):
msg = Message(domain='ui', message="There are operations pending for this vault that prevent form calculating its position. Please try again later.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
inventory_list = context.portal_simulation.getCurrentInventoryList(
#at_date=start_date,
......@@ -85,7 +85,7 @@ for line in line_list :
serialize_dict[source_counter] = 1
if source_counter is None:
msg = Message(domain="ui", message="No source counter define to check inventory.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
#context.log("CashDelivery_checkCounterInventory", "source_counter = %s" %source_counter)
source_object = context.portal_categories.getCategoryValue(source_counter)
source_object.serialize()
......@@ -108,9 +108,9 @@ for line in line_list :
'letter': cell.getEmissionLetterTitle(),
'status': cell.getCashStatusTranslatedTitle(),
'variation':cell.getVariationTitle()})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
else :
raise ValueError, 'This script must not be used on movements without cells. It is deprecated and dangerous, therefor it raises.'
raise ValueError('This script must not be used on movements without cells. It is deprecated and dangerous, therefor it raises.')
# inventory_value = context.portal_simulation.getCurrentInventory(section=source_counter, resource=line_resource)
# if inventory_value - line.getQuantity() < 0 :
# msg = Message(domain='ui', message='Insufficient balance for $resource, letter $letter, status $status and variation $variation', mapping={'resource':line.getResourceTranslatedTitle(),
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Check_checkIntervalBetweenDate.py
View file @ 1c60256f
......@@ -16,11 +16,11 @@ if 'compte' in resource_title:
if interval['month'] > 0 or interval["day"] > 0:
msg = Message(domain='ui', message="Check $check is more than 3 years old.",
mapping={"check" : check_nb})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif interval['year'] > 3:
msg = Message(domain='ui', message="Check $check is more than 3 years old.",
mapping={"check" : check_nb})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif 'virement' in resource_title:
interval = getIntervalBetweenDates(start_date, stop_date)
......@@ -29,8 +29,8 @@ elif 'virement' in resource_title:
if interval["day"] > 0:
msg = Message(domain='ui', message="Check $check is more than 3 month old.",
mapping={"check" : check_nb})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
elif interval['month'] > 3 or interval['year'] > 0:
msg = Message(domain='ui', message="Check $check is more than 3 month old.",
mapping={"check" : check_nb})
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_init.py
View file @ 1c60256f
......@@ -2,7 +2,7 @@ from DateTime import DateTime
user_site_list = context.Baobab_getUserAssignedSiteList()
if len(user_site_list) == 0:
raise ValueError, "You cannot create a CounterDate if you don't have an assignment."
raise ValueError("You cannot create a CounterDate if you don't have an assignment.")
site = context.Baobab_getVaultSite(user_site_list[0])
context.setSiteValue(site)
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.py
View file @ 1c60256f
......@@ -40,7 +40,7 @@ if same_type(vault, 'a'):
vault_url_list = [vault,]
#context.log("vault_url_list", vault_url_list)
if vault_url_list is None:
raise ValueError, "The vault must be defined"
raise ValueError("The vault must be defined")
for vault_url in vault_url_list:
vault_dict[vault_url] = 1
vault_inventory_dict[vault_url] = {}
......@@ -67,7 +67,7 @@ total_inventory_list = []
inventory_kw = {}
#context.log('CounterModule_getVaultTransactionList, vault_report_type',vault_report_type)
if vault_report_type == 'inventory' and from_date is not None:
raise ValueError, "The from date must be None in the case of inventory"
raise ValueError("The from date must be None in the case of inventory")
if vault_report_type is None or vault_report_type=='inventory':
inventory_kw['group_by_variation'] = 1
inventory_kw['group_by_resource'] = 1
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/scripts/validateConsistency.py
View file @ 1c60256f
......@@ -16,13 +16,13 @@ transaction.Baobab_checkAccountingDateOpen(site=site, date=date)
price = transaction.getSourceTotalAssetPrice()
if price is None or price <= 0:
msg = Message(domain='ui', message='Amount is not valid.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if transaction.getSiteValue() is None:
msg = Message(domain='ui', message='Sorry, no site defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if transaction.getResource() is None:
msg = Message(domain='ui', message='No resource defined.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Check the source bank account.
source_bank_account = transaction.getSourcePaymentValue()
......@@ -31,7 +31,7 @@ source_bank_account = transaction.getSourcePaymentValue()
nb_transfer_line = len(transaction.objectValues(portal_type='Accounting Cancellation Line'))
if nb_transfer_line == 0:
msg = Message(domain='ui', message='You must add line before validating the operation')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# only one line can be defined with SICA/STAR, on order as it can be cancel or reject later
#if transaction.getExternalSoftware() in ('sica', 'star') and nb_transfer_line != 1:
......@@ -46,21 +46,21 @@ for line in transaction.objectValues(portal_type='Accounting Cancellation Line')
if line.getSourcePaymentReference(None) is None and \
line.getSourceSection() is None:
msg = Message(domain='ui', message="No account defined on line.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check we don't have both account and accounting code defined
if line.getDestinationPayment(None) is not None \
and line.getDestinationSection() is not None:
msg = Message(domain='ui', message="You can't defined account and accounting code on line.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# check that at least destination_payment or destination_section is defined
if line.getDestinationPayment() is None and \
line.getDestinationSection() is None:
msg = Message(domain='ui', message="Destination account is not defined.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Index the banking operation line so it impacts account position
if line.getSourcePaymentReference() not in (None, ''):
context.BankingOperationLine_index(line, source=1)
if total_line_price != transaction.getSourceTotalAssetPrice():
msg = Message(domain='ui', message="Total price doesn't match between line and document.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/bank_account_workflow/scripts/checkBankAccount.py
View file @ 1c60256f
......@@ -7,14 +7,14 @@ bank_account = state_change['object']
if bank_account.getParentValue().getPortalType()!= 'Person':
vliste = bank_account.checkConsistency()
if len(vliste) != 0:
raise ValidationFailed, (vliste[0].getTranslatedMessage(),)
raise ValidationFailed(vliste[0].getTranslatedMessage(),)
if bank_account.getParentValue().getPortalType()== 'Person':
# Can't have two bank account
for obj in bank_account.getParentValue().objectValues():
if obj.getPortalType() == "Bank Account" and obj.getValidationState() not in ('draft', 'closed') \
and obj.getSource() == bank_account.getSource() and obj.getPath()!= bank_account.getPath():
raise ValidationFailed, "You cannot open two bank accounts for the same person on the same site"
raise ValidationFailed("You cannot open two bank accounts for the same person on the same site")
valid_state = ["valid", "being_closed", "validating_closing",
"being_modified", "validating_modification", "closed"]
......@@ -26,7 +26,7 @@ same_ref_list = context.portal_catalog(validation_state=valid_state,
for doc in same_ref_list:
if doc.getPath() != bank_account.getPath():
context.log("doc path %s" %(doc.getPath(),))
raise ValidationFailed, "Bank account with same reference already exists"
raise ValidationFailed("Bank account with same reference already exists")
# Same for internal reference if exists
......@@ -38,4 +38,4 @@ if bank_account.getInternalBankAccountNumber() not in ("", None):
for doc in same_ref_list:
if doc.getPath() != bank_account.getPath():
context.log("doc path %s" %(doc.getPath(),))
raise ValidationFailed, "Bank account with same internal reference already exists"
raise ValidationFailed("Bank account with same internal reference already exists")
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/scripts/Checkbook_deleteAllCheckList.py
View file @ 1c60256f
......@@ -5,4 +5,4 @@ for check in checkbook.objectValues():
if check.getSimulationState() != 'deleted':
msg = Message(domain="ui", message="Sorry, no way to delete this check $id",
mapping = {'id' : check.getId()})
raise ValueError, (msg,)
raise ValueError(msg,)
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/scripts/checkConsistency.py
View file @ 1c60256f
......@@ -8,4 +8,4 @@ if len(check_result) > 0:
check_type = N_(check_result[0][-1])
# TODO: use nice url encoding method there instead of replace()
check_details = check_result[0][-2].replace('<', '&lt;').replace('>', '&gt;')
raise ValidationFailed, "%s : %s" % (check_type, check_details)
raise ValidationFailed("%s : %s" % (check_type, check_details))
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/closeAllCounter.py
View file @ 1c60256f
......@@ -8,7 +8,7 @@ site = transaction.getSiteValue()
while True:
if not hasattr(site, 'getVaultTypeList'):
msg = Message(domain = 'ui', message = 'The site value is misconfigured; report this to system administrators.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if 'site' in site.getVaultTypeList():
break
site = site.getParentValue()
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.py
View file @ 1c60256f
......@@ -13,7 +13,7 @@ date_list = [x.getObject() for x in context.portal_catalog(**kwd)]
current_date = None
if len(date_list) == 0:
msg = Message(domain = 'ui', message = 'No Counter Date found for this counter')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
else:
current_date = date_list[0].getStartDate()
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/checkDateOpened.py
View file @ 1c60256f
......@@ -8,7 +8,7 @@ site = transaction.getSiteValue()
while True:
if not hasattr(site, 'getVaultTypeList'):
msg = Message(domain = 'ui', message = 'The site value is misconfigured; report this to system administrators.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
if 'site' in site.getVaultTypeList():
break
site = site.getParentValue()
......@@ -18,4 +18,4 @@ date_list = [x.getObject() for x in context.portal_catalog(**kwd)]
if len(date_list) == 0:
msg = Message(domain='ui', message="Counter date is not opened.")
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/scripts/checkSingleExchangeLine.py
View file @ 1c60256f
......@@ -10,7 +10,7 @@ exchange_line = state_change['object']
if exchange_line.getBasePrice() in (None, 0, 0.0):
msg = Message(domain = 'ui', message = 'Sorry, you must define a fixing price.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# We have to looking for other currency exchanges lines
......@@ -34,7 +34,7 @@ line_list = [x for x in exchange_line.portal_domains.searchPredicateList(temp_ob
start_date = exchange_line.getStartDate()
if start_date is None:
msg = Message(domain = 'ui', message = 'Sorry, you must define a start date.')
raise ValidationFailed, (msg,)
raise ValidationFailed(msg,)
# Make sure there is not two exchange lines wich defines the same dates
# for this particular ressource and price_currency
......
erp5/util/benchmark/report.py
View file @ 1c60256f
This diff is collapsed.
erp5/util/timinglogparser/__init__.py
View file @ 1c60256f
This diff is collapsed.
product/CMFActivity/ActivityTool.py
View file @ 1c60256f
This diff is collapsed.
product/CMFActivity/sbalance.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Capacity/GLPK.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/Agent.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/Amount.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/BalanceTransaction.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/BigFile.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/BusinessTemplate.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/Coordinate.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/Document.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/IdGenerator.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/ImmobilisableItem.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/PeriodicityLine.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Document/Url.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/ERP5Site.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/MovementGroup.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/NotUsed.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Tool/ContributionTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Tool/DomainTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Tool/IdTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Tool/IntrospectionTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Tool/NotificationTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Tool/SimulationTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/Tool/TemplateTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/mixin/builder.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/mixin/cached_convertable.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/mixin/discoverable.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/tests/erp5_url_checker.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/tests/testAlarm.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/tests/testCrmReports.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/tests/testInventoryAPI.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/tests/testProductionOrder.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5/tests/testXHTML.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Catalog/CatalogTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Catalog/Tool/ArchiveTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/Form.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/FormBox.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/ListBox.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/OOoChart.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/PDFForm.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/PDFParser.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/PDFTemplate.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/PlanningBox.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/ProxyField.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/Report.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/ScribusParser.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/ScribusUtils.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Form/Tool/SelectionTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5OOo/FormPrintout.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5OOo/OOoTemplate.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Security/ERP5KeyAuthPlugin.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5SyncML/Utils.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5SyncML/XMLSyncUtils.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/Base.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/Cache.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/CachePlugins/RamCache.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/CopySupport.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/Core/Folder.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/DateUtils.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/ExtensibleTraversable.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/ObjectMessage.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/SSHConnection.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/Tool/MemcachedTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/Tool/SessionTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/Utils.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/WebDAVSupport.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/mixin/component.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/mixin/matrix.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/patches/CMFBTreeFolder.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/patches/DA.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/patches/DCWorkflow.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/patches/DateTimePatch.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/patches/OFSImage.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/patches/PropertyManager.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/patches/WebDAV.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/patches/WorkflowTool.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/patches/sqltest.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/tests/ERP5TypeTestCase.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5Type/tests/utils.py
View file @ 1c60256f
This diff is collapsed.
product/ERP5VCS/SubversionClient.py
View file @ 1c60256f
This diff is collapsed.
product/Formulator/Form.py
View file @ 1c60256f
This diff is collapsed.
product/Formulator/Validator.py
View file @ 1c60256f
This diff is collapsed.
product/HBTreeFolder2/HBTreeFolder2.py
View file @ 1c60256f
This diff is collapsed.
product/Localizer/GettextTag.py
View file @ 1c60256f
This diff is collapsed.
product/Localizer/MessageCatalog.py
View file @ 1c60256f
This diff is collapsed.
product/Localizer/__init__.py
View file @ 1c60256f
This diff is collapsed.
product/MailTemplates/MailTemplate.py
View file @ 1c60256f
This diff is collapsed.
product/ZLDAPConnection/Entry.py
View file @ 1c60256f
This diff is collapsed.
product/ZLDAPConnection/ZLDAP.py
View file @ 1c60256f
This diff is collapsed.
product/ZLDAPMethods/LM.py
View file @ 1c60256f
This diff is collapsed.
product/ZLDAPMethods/ldifvar.py
View file @ 1c60256f
This diff is collapsed.
product/ZMySQLDA/DABase.py
View file @ 1c60256f
This diff is collapsed.
product/ZMySQLDA/db.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/ColumnMap.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/Extensions/zsqlbrain.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/Query/AutoQuery.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/Query/ComplexQuery.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/Query/Query.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/Query/SQLQuery.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/Query/SimpleQuery.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/SQLExpression.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/SearchKey/SearchKey.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/SearchText/lexer.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/ZSQLCatalog.py
View file @ 1c60256f
This diff is collapsed.
product/ZSQLCatalog/tests/testSQLCatalog.py
View file @ 1c60256f
This diff is collapsed.
product/Zelenium/tests/test_zuite.py
View file @ 1c60256f
This diff is collapsed.
product/Zelenium/zuite.py
View file @ 1c60256f
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7