Commit ee84ceaa authored by Sebastien Robin's avatar Sebastien Robin

we must use confimed check in check payment.

Make sure that a check is available when we want to transfer it in usual cash transfer

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12823 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a998eeae
...@@ -128,7 +128,7 @@ if not check_number:\n ...@@ -128,7 +128,7 @@ if not check_number:\n
msg = Message(domain=\'ui\', message="Check not defined.")\n msg = Message(domain=\'ui\', message="Check not defined.")\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
\n \n
result = context.portal_catalog(portal_type = \'Check\', reference = check_number)\n result = context.portal_catalog(portal_type = \'Check\', title = check_number,simulation_state=\'confirmed\')\n
if len(result) == 0:\n if len(result) == 0:\n
# Until a certain date, ERP5 allows the user to generate a check automatically.\n # Until a certain date, ERP5 allows the user to generate a check automatically.\n
from DateTime import DateTime\n from DateTime import DateTime\n
......
...@@ -73,8 +73,10 @@ from Products.ERP5Type.Message import Message\n ...@@ -73,8 +73,10 @@ from Products.ERP5Type.Message import Message\n
\n \n
transaction = state_change.object\n transaction = state_change.object\n
\n \n
\n
source = transaction.getSource()\n source = transaction.getSource()\n
destination = transaction.getDestination()\n destination = transaction.getDestination()\n
\n
msg = None\n msg = None\n
if source == destination:\n if source == destination:\n
msg = Message(domain="ui", message="Sorry, the source and the destination must be different")\n msg = Message(domain="ui", message="Sorry, the source and the destination must be different")\n
...@@ -83,6 +85,17 @@ line_list = transaction.objectValues()\n ...@@ -83,6 +85,17 @@ line_list = transaction.objectValues()\n
if len(line_list)==0:\n if len(line_list)==0:\n
msg = Message(domain="ui", message="Sorry, you must select at least one check or checkbook")\n msg = Message(domain="ui", message="Sorry, you must select at least one check or checkbook")\n
\n \n
baobab_source = transaction.getBaobabSource()\n
reference_date = transaction.getStartDate()\n
current_tracking_list = [x.getObject() for x in getCurrentTrackingList(\n
at_date=reference_date, node=baobab_source,\n
where_expression="item_catalog.portal_type=\'Check\' or item_catalog.portal_type=\'Checkbook\'")]\n
aggregate_uid_list = [x.uid for x in current_tracking_list]\n
for line in transaction.getMovementList(portal_type=\'Checkbook Delivery Line\'):\n
for aggregate_uid in line.getAggregateUidList():\n
if aggregate_uid not in aggregate_uid_list:\n
msg = Message(domain="ui", message="Sorry, an item is not available any more")\n
\n
if msg is not None:\n if msg is not None:\n
raise ValidationFailed, (msg,)\n raise ValidationFailed, (msg,)\n
</string> </value> </string> </value>
...@@ -140,6 +153,17 @@ if msg is not None:\n ...@@ -140,6 +153,17 @@ if msg is not None:\n
<string>msg</string> <string>msg</string>
<string>line_list</string> <string>line_list</string>
<string>len</string> <string>len</string>
<string>baobab_source</string>
<string>reference_date</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>getCurrentTrackingList</string>
<string>x</string>
<string>current_tracking_list</string>
<string>aggregate_uid_list</string>
<string>line</string>
<string>aggregate_uid</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
66 68
\ No newline at end of file \ No newline at end of file
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