From 5cbea03aae90979a4434d891bdeab42684712901 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Mon, 1 Jul 2013 14:49:20 +0000 Subject: [PATCH] Ignore draft accounting periods (and fix a typo) --- .../scripts/validateTransaction.xml | 10 +++++----- bt5/erp5_accounting/bt/revision | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml index 5a3e6c2dd3..216496c4fa 100644 --- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml +++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml @@ -96,18 +96,18 @@ transaction_line_list = transaction.getMovementList(\n portal_type=transaction.getPortalAccountingMovementTypeList())\n \n \n -def checkAccountingPeriodRecusivly(accounting_period, transaction_date):\n +def checkAccountingPeriodRecursivly(accounting_period, transaction_date):\n valid = accounting_period.getSimulationState() in (\'planned\', \'started\')\n if not valid:\n return False\n for sub_accounting_period in accounting_period.contentValues():\n if sub_accounting_period.getSimulationState() in (\n - \'deleted\', \'cancelled\'):\n + \'deleted\', \'cancelled\', \'draft\'):\n continue\n if sub_accounting_period.getStartDate().earliestTime() <= \\\n transaction_date <= \\\n sub_accounting_period.getStopDate().latestTime():\n - if not checkAccountingPeriodRecusivly(sub_accounting_period,\n + if not checkAccountingPeriodRecursivly(sub_accounting_period,\n transaction_date):\n return False\n return True\n @@ -136,7 +136,7 @@ if not skip_period_validation :\n transaction_date = transaction.getStartDate().earliestTime()\n valid_date = False\n if accounting_period is not None:\n - valid_date = checkAccountingPeriodRecusivly(accounting_period,\n + valid_date = checkAccountingPeriodRecursivly(accounting_period,\n transaction_date)\n \n if not valid_date:\n @@ -166,7 +166,7 @@ if not skip_period_validation :\n transaction_date = transaction.getStopDate().earliestTime()\n valid_date = False\n if accounting_period is not None:\n - valid_date = checkAccountingPeriodRecusivly(accounting_period,\n + valid_date = checkAccountingPeriodRecursivly(accounting_period,\n transaction_date)\n \n if not valid_date:\n diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index ec2aa7c822..8799d84b2b 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1535 \ No newline at end of file +1537 \ No newline at end of file -- 2.30.9