Skip to content

erp5
erp5
Commit a0d7e8bf authored by Aurel's avatar Aurel
Browse files
Options

2006-09-20 

* fix lettering in workflow, use grouping reference instead of lettering
* some change in cash balance regulation actions

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10194 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6489c33c
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 229 deletions
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Balance%20Regulation/final.xml
View file @ a0d7e8bf
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>final cash detail</string> </value> <value> <string>Final Cash Detail</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
......
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Balance%20Regulation/incoming_fastinput.xml
View file @ a0d7e8bf
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Initial cash detail</string> </value> <value> <string>Initial Cash Detail</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
......
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Balance%20Regulation/initial.xml
View file @ a0d7e8bf
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Cash detail to regularize</string> </value> <value> <string>Initial Cash Detail</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
......
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Cash%20Balance%20Regulation/outgoing_fastinput.xml
View file @ a0d7e8bf
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>final cash detail</string> </value> <value> <string>Final Cash Detail</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
......
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Balance%20Regulation%20Line/history.xml deleted 100644 → 0
View file @ 6489c33c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.ActionInformation</string>
<string>ActionInformation</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_view</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>history</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>History</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.Expression</string>
<string>Expression</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Base_viewHistory</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Balance%20Regulation%20Line/print.xml deleted 100644 → 0
View file @ 6489c33c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.ActionInformation</string>
<string>ActionInformation</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_print</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>print</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>2.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Print</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.CMFCore.Expression</string>
<string>Expression</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/DeliveryLine_print</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Incoming%20Cash%20Balance%20Regulation%20Line/view.xml
View file @ a0d7e8bf
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/CashBalanceRegulationLine_viewListIn</string> </value> <value> <string>string:${object_url}/CashDeliveryLine_view</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_cash/PropertySheetTemplateItem/InternalMoney.py deleted 100644 → 0
View file @ 6489c33c
##############################################################################
#
# Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.
# Aurélien Calonne <aurel@nexedi.com>
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# garantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
class InternalMoney:
"""
Properties for Internal Money (Deposit/Payment) Objects
"""
_properties = (
{'id' : 'lettering',
'description' : 'Lettering',
'type' : 'string',
'mode' : 'w'
},
)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/scripts/updateBankingOperation.xml
View file @ a0d7e8bf
...@@ -95,7 +95,9 @@ if line is not None and line.getPortalType() == \'Banking Operation Line\':\n ...@@ -95,7 +95,9 @@ if line is not None and line.getPortalType() == \'Banking Operation Line\':\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/baobab/portal_workflow/internal_money_payment_workflow/scripts/updateBankingOperation</string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/scripts/validateCounter.xml
View file @ a0d7e8bf
...@@ -79,7 +79,7 @@ transaction = state_change[\'object\']\n ...@@ -79,7 +79,7 @@ transaction = state_change[\'object\']\n
date = transaction.getStartDate()\n date = transaction.getStartDate()\n
destination= transaction.getDestination(None)\n destination= transaction.getDestination(None)\n
\n \n
lettering =transaction.getLettering()\n lettering = transaction.getGroupingReference()\n
\n \n
if lettering is None:\n if lettering is None:\n
msg = Message(domain=\'ui\', message=\'No lettering defined.\')\n msg = Message(domain=\'ui\', message=\'No lettering defined.\')\n
...@@ -146,7 +146,9 @@ elif price != cash_detail:\n ...@@ -146,7 +146,9 @@ elif price != cash_detail:\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/baobab/portal_workflow/internal_money_payment_workflow/scripts/validateCounter</string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
......
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/scripts/validateSourceAndDestination.xml
View file @ a0d7e8bf
...@@ -88,7 +88,9 @@ transaction.Base_checkBaobabSourceAndDestination()\n ...@@ -88,7 +88,9 @@ transaction.Base_checkBaobabSourceAndDestination()\n
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
<value> <string>Script (Python):/baobab/portal_workflow/internal_money_deposit_workflow/scripts/validateSourceAndDestination</string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>_owner</string> </key> <key> <string>_owner</string> </key>
......
bt5/erp5_banking_cash/bt/change_log
View file @ a0d7e8bf
2006-09-20
* fix lettering in workflow
2006-09-11 Seb 2006-09-11 Seb
* Added internal money deposit * Added internal money deposit
* Added money deposit * Added money deposit
......
bt5/erp5_banking_cash/bt/template_action_path_list
View file @ a0d7e8bf
...@@ -109,9 +109,7 @@ Foreign Cash Reception | print_pdf ...@@ -109,9 +109,7 @@ Foreign Cash Reception | print_pdf
Foreign Cash Reception | view Foreign Cash Reception | view
Incoming Account Incident Line | metadata Incoming Account Incident Line | metadata
Incoming Account Incident Line | view Incoming Account Incident Line | view
Incoming Cash Balance Regulation Line | history
Incoming Cash Balance Regulation Line | metadata Incoming Cash Balance Regulation Line | metadata
Incoming Cash Balance Regulation Line | print
Incoming Cash Balance Regulation Line | view Incoming Cash Balance Regulation Line | view
Incoming Cash Exchange Line | history Incoming Cash Exchange Line | history
Incoming Cash Exchange Line | metadata Incoming Cash Exchange Line | metadata
......
bt5/erp5_banking_cash/bt/template_portal_type_property_sheet_list
View file @ a0d7e8bf
...@@ -27,6 +27,7 @@ Incoming Cash Sorting Line | CashDeliveryLine ...@@ -27,6 +27,7 @@ Incoming Cash Sorting Line | CashDeliveryLine
Incoming Classification Survey Line | CashDeliveryLine Incoming Classification Survey Line | CashDeliveryLine
Incoming Usual Cash Incident Line | CashDeliveryLine Incoming Usual Cash Incident Line | CashDeliveryLine
Internal Money Deposit | Arrow Internal Money Deposit | Arrow
Internal Money Deposit | InternalMoney
Internal Money Deposit | Price Internal Money Deposit | Price
Internal Money Deposit | Task Internal Money Deposit | Task
Monetary Destruction | Account Monetary Destruction | Account
......
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