Commit 144d8738 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Fix r38977.

Call the right Currency(Sale|Purchase)_getQuantity script.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39054 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e455db30
...@@ -82,9 +82,16 @@ context.Baobab_checkCounterOpened(counter_site)\n ...@@ -82,9 +82,16 @@ context.Baobab_checkCounterOpened(counter_site)\n
if is_currency_sale:\n if is_currency_sale:\n
foreign_currency_portal_type = outgoing_portal_type\n foreign_currency_portal_type = outgoing_portal_type\n
default_currency_portal_type = incoming_portal_type\n default_currency_portal_type = incoming_portal_type\n
total_quantity = context.CurrencySale_getQuantity()\n
else:\n else:\n
foreign_currency_portal_type = incoming_portal_type\n foreign_currency_portal_type = incoming_portal_type\n
default_currency_portal_type = outgoing_portal_type\n default_currency_portal_type = outgoing_portal_type\n
total_quantity = context.CurrencyPurchase_getQuantity()\n
\n
# check if an exchange rate is defined\n
if total_quantity is None:\n
raise ValidationFailed, (Message(domain=\'ui\',\n
message="No exchange rate defined for this currency at document date."))\n
\n \n
# check resource on currency fastinput\n # check resource on currency fastinput\n
doc_resource = context.getResource()\n doc_resource = context.getResource()\n
...@@ -93,11 +100,6 @@ for line in context.contentValues(portal_type=foreign_currency_portal_type):\n ...@@ -93,11 +100,6 @@ for line in context.contentValues(portal_type=foreign_currency_portal_type):\n
raise ValidationFailed, (Message(domain="ui",\n raise ValidationFailed, (Message(domain="ui",\n
message="Resource defined on document is different from currency cash."), )\n message="Resource defined on document is different from currency cash."), )\n
\n \n
# check if an exchange rate is defined\n
if context.CurrencyPurchase_getQuantity() is None:\n
raise ValidationFailed, (Message(domain=\'ui\',\n
message="No exchange rate defined for this currency at document date."))\n
\n
# check outgoing amount\n # check outgoing amount\n
if is_currency_sale:\n if is_currency_sale:\n
amount = context.getSourceTotalAssetPrice()\n amount = context.getSourceTotalAssetPrice()\n
...@@ -193,10 +195,11 @@ elif resource_one == 1:\n ...@@ -193,10 +195,11 @@ elif resource_one == 1:\n
<string>counter_site</string> <string>counter_site</string>
<string>foreign_currency_portal_type</string> <string>foreign_currency_portal_type</string>
<string>default_currency_portal_type</string> <string>default_currency_portal_type</string>
<string>total_quantity</string>
<string>None</string>
<string>doc_resource</string> <string>doc_resource</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>line</string> <string>line</string>
<string>None</string>
<string>amount</string> <string>amount</string>
<string>msg</string> <string>msg</string>
<string>default_msg</string> <string>default_msg</string>
......
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