Commit 3a34f946 authored by Aurel's avatar Aurel

user must defined payment type on internal money payment operation

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19996 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 736e3447
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
<portal_type id="Foreign Cash Reception"> <portal_type id="Foreign Cash Reception">
<item>currency_exchange_type</item> <item>currency_exchange_type</item>
</portal_type> </portal_type>
<portal_type id="Internal Money Payment">
<item>payment_type</item>
</portal_type>
<portal_type id="Monetary Destruction Cell"> <portal_type id="Monetary Destruction Cell">
<item>variation</item> <item>variation</item>
</portal_type> </portal_type>
......
...@@ -106,6 +106,10 @@ ...@@ -106,6 +106,10 @@
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string>InternalMoneyPayment_init</string> </value> <value> <string>InternalMoneyPayment_init</string> </value>
</item> </item>
<item>
<key> <string>permission</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>property_sheet_list</string> </key> <key> <string>property_sheet_list</string> </key>
<value> <value>
......
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
<string>my_source_reference</string> <string>my_source_reference</string>
<string>my_source_total_asset_price</string> <string>my_source_total_asset_price</string>
<string>my_grouping_reference</string> <string>my_grouping_reference</string>
<string>my_payment_type</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -81,6 +81,9 @@ transaction.Baobab_checkCounterDateOpen(site=source, date=transaction.getStartDa ...@@ -81,6 +81,9 @@ transaction.Baobab_checkCounterDateOpen(site=source, date=transaction.getStartDa
\n \n
context.Baobab_checkCounterOpened(source)\n context.Baobab_checkCounterOpened(source)\n
\n \n
if transaction.getPaymentType() in (None, ""):\n
msg = Message(domain="ui", message="No payment type defined.")\n
raise ValidationFailed, (msg,)\n
\n \n
\n \n
#test if the source or the destination is correct\n #test if the source or the destination is correct\n
...@@ -180,9 +183,9 @@ if resource == 2:\n ...@@ -180,9 +183,9 @@ if resource == 2:\n
<string>None</string> <string>None</string>
<string>source</string> <string>source</string>
<string>context</string> <string>context</string>
<string>msg</string>
<string>amount</string> <string>amount</string>
<string>total_price</string> <string>total_price</string>
<string>msg</string>
<string>site</string> <string>site</string>
<string>vault</string> <string>vault</string>
<string>resource</string> <string>resource</string>
......
609 612
\ No newline at end of file \ No newline at end of file
...@@ -9,6 +9,7 @@ Container Line | cash_status ...@@ -9,6 +9,7 @@ Container Line | cash_status
Container Line | emission_letter Container Line | emission_letter
Container Line | variation Container Line | variation
Foreign Cash Reception | currency_exchange_type Foreign Cash Reception | currency_exchange_type
Internal Money Payment | payment_type
Monetary Destruction Cell | variation Monetary Destruction Cell | variation
Monetary Recall Cell | variation Monetary Recall Cell | variation
Money Deposit | source_trade Money Deposit | source_trade
......
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