Skip to content

erp5
erp5
Commit 3a34f946 authored by Aurel's avatar Aurel
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 303 additions and 2 deletions
bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
View file @ 3a34f946
...@@ -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>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Internal%20Money%20Payment.xml
View file @ 3a34f946
...@@ -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>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyPayment_view.xml
View file @ 3a34f946
...@@ -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>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/InternalMoneyPayment_view/my_payment_type.xml 0 → 100644
View file @ 3a34f946
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ListField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_payment_type</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>unknown_selection</string> </key>
<value> <string>You selected an item that was not in the list.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payment Type</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.portal_categories.payment_type.getCategoryChildTitleItemList()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_payment_workflow/scripts/validateCounter.xml
View file @ 3a34f946
...@@ -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>
......
bt5/erp5_banking_cash/bt/revision
View file @ 3a34f946
609 612
\ No newline at end of file \ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_base_category_list
View file @ 3a34f946
...@@ -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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7