Skip to content

erp5
erp5
Commit e1830667 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

modified checkbook reception so that if we do an import we will confirm checks and checkbooks 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16308 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 96fc60e5
Show whitespace changes
Inline Side-by-side
Showing with 292 additions and 212 deletions
bt5/erp5_banking_check/ActionTemplateItem/portal_types/Checkbook%20Reception/fastInput.xml
View file @ e1830667
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>python:object.getSimulationState() in (\'empty\', \'rejected\')</string> </value> <value> <string>python:object.getSimulationState() in (\'empty\', \'rejected\') and not object.isImport()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py
View file @ e1830667
...@@ -18,6 +18,7 @@ def CheckbookReception_importItemFile(self, import_file=None, REQUEST=None, **kw ...@@ -18,6 +18,7 @@ def CheckbookReception_importItemFile(self, import_file=None, REQUEST=None, **kw
check_quantity = str(item.xpath("string(./check_quantity)")) check_quantity = str(item.xpath("string(./check_quantity)"))
reference_min = str(item.xpath("string(./reference_min)")) reference_min = str(item.xpath("string(./reference_min)"))
reference_max = str(item.xpath("string(./reference_max)")) reference_max = str(item.xpath("string(./reference_max)"))
quantity = str(item.xpath("string(./quantity)"))
internal_account_number = item.xpath("string(./numero_interne)") internal_account_number = item.xpath("string(./numero_interne)")
checkbook_type = item.xpath("string(./checkbook_type)") checkbook_type = item.xpath("string(./checkbook_type)")
type = str(item.xpath("string(./checkbook_type)")) type = str(item.xpath("string(./checkbook_type)"))
...@@ -28,6 +29,7 @@ def CheckbookReception_importItemFile(self, import_file=None, REQUEST=None, **kw ...@@ -28,6 +29,7 @@ def CheckbookReception_importItemFile(self, import_file=None, REQUEST=None, **kw
item_dict['reference_min'] = reference_min item_dict['reference_min'] = reference_min
item_dict['reference_max'] = reference_max item_dict['reference_max'] = reference_max
item_dict['check_quantity'] = check_quantity item_dict['check_quantity'] = check_quantity
item_dict['quantity'] = quantity
item_dict['internal_account_number'] = internal_account_number item_dict['internal_account_number'] = internal_account_number
listbox_dict = {} listbox_dict = {}
...@@ -57,7 +59,8 @@ def CheckbookReception_importItemFile(self, import_file=None, REQUEST=None, **kw ...@@ -57,7 +59,8 @@ def CheckbookReception_importItemFile(self, import_file=None, REQUEST=None, **kw
listbox_line['reference_range_min'] = item_dict['reference_min'] listbox_line['reference_range_min'] = item_dict['reference_min']
listbox_line['reference_range_max'] = item_dict['reference_max'] listbox_line['reference_range_max'] = item_dict['reference_max']
listbox_line['destination_payment_reference'] = item_dict['internal_account_number'] listbox_line['destination_payment_reference'] = item_dict['internal_account_number']
listbox_line['quantity'] = 1 #listbox_line['quantity'] = 1
listbox_line['quantity'] = item_dict['quantity']
if is_checkbook: if is_checkbook:
listbox_line['check_amount'] = resource_amount_dict[item_dict['check_quantity']] listbox_line['check_amount'] = resource_amount_dict[item_dict['check_quantity']]
listbox.append(listbox_line) listbox.append(listbox_line)
...@@ -88,6 +91,7 @@ def CheckbookReception_importItemFile(self, import_file=None, REQUEST=None, **kw ...@@ -88,6 +91,7 @@ def CheckbookReception_importItemFile(self, import_file=None, REQUEST=None, **kw
REQUEST=REQUEST) REQUEST=REQUEST)
message = Message(domain='ui', message='File Imported successfully') message = Message(domain='ui', message='File Imported successfully')
self.setImported(1)
return message return message
......
bt5/erp5_banking_check/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @ e1830667
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
<item>Amount</item> <item>Amount</item>
<item>Price</item> <item>Price</item>
</portal_type> </portal_type>
<portal_type id="Checkbook Reception">
<item>CheckbookReception</item>
</portal_type>
<portal_type id="Checkbook Usual Cash Transfer"> <portal_type id="Checkbook Usual Cash Transfer">
<item>Price</item> <item>Price</item>
<item>Amount</item> <item>Amount</item>
......
bt5/erp5_banking_check/PortalTypeTemplateItem/portal_types/Checkbook%20Reception.xml
View file @ e1830667
...@@ -99,6 +99,10 @@ checks</string> </value> ...@@ -99,6 +99,10 @@ checks</string> </value>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string>CheckbookReception_init</string> </value> <value> <string>CheckbookReception_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_check/PropertySheetTemplateItem/CheckbookReception.py 0 → 100644
View file @ e1830667
##############################################################################
#
# Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.
#
# 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 CheckbookReception:
"""
Properties for Baobab Bank Account Objects
"""
_properties = (
{'id' : 'imported',
'description' : 'Indicate if this document is used for an import',
'type' : 'boolean',
'mode' : 'w'
},
)
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_previous_resource.xml
View file @ e1830667
...@@ -173,9 +173,7 @@ ...@@ -173,9 +173,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -273,11 +271,8 @@ ...@@ -273,11 +271,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -289,23 +284,4 @@ ...@@ -289,23 +284,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: None</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm/my_resource.xml
View file @ e1830667
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: ((request.get(\'resource\', False)) and (None, ) or (\'Type\', ))[0]</string> </value> <value> <string>python: ((request.get(\'resource\', \'\')) and (\'\', ) or (\'Type\', ))[0]</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/my_source.xml
View file @ e1830667
...@@ -273,18 +273,15 @@ ...@@ -273,18 +273,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:here.Delivery_getVaultItemList(vault_type=(\'site/surface/caisse_courante\',\'site/surface/banque_interne/guichet\',\'site/surface/operations_diverses/guichet\'),leaf_node=0,first_level=1)</string> </value> <value> <string>python:here.Delivery_getVaultItemList(vault_type=(\'site/surface/caisse_courante\',\'site/surface/banque_interne/guichet\',\'site/surface/operations_diverses/guichet\'),leaf_node=0,first_level=1,current_url=here.getSource())</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_checkOrCreateItemList.xml
View file @ e1830667
...@@ -233,6 +233,8 @@ for i in xrange(quantity):\n ...@@ -233,6 +233,8 @@ for i in xrange(quantity):\n
item.setTitle(\'%s - %s\' % (reference_range_min, reference_range_max))\n item.setTitle(\'%s - %s\' % (reference_range_min, reference_range_max))\n
item.setCheckAmount(check_amount)\n item.setCheckAmount(check_amount)\n
destination_section = item.getDestinationSection()\n destination_section = item.getDestinationSection()\n
if confirm_check:\n
item.confirm()\n
for j in reference_list:\n for j in reference_list:\n
#tag = \'check_%s_%s_%s\' % (model, destination_payment_uid, j)\n #tag = \'check_%s_%s_%s\' % (model, destination_payment_uid, j)\n
#encountered_check_identifiers_dict[tag] = None\n #encountered_check_identifiers_dict[tag] = None\n
...@@ -241,6 +243,8 @@ for i in xrange(quantity):\n ...@@ -241,6 +243,8 @@ for i in xrange(quantity):\n
check.setStartDate(start_date)\n check.setStartDate(start_date)\n
check.setReference(j)\n check.setReference(j)\n
check.setResource(model)\n check.setResource(model)\n
if confirm_check:\n
check.confirm()\n
else:\n else:\n
last_reference_value = reference_to_int(reference_range_min)\n last_reference_value = reference_to_int(reference_range_min)\n
if check == 1:\n if check == 1:\n
...@@ -253,6 +257,9 @@ for i in xrange(quantity):\n ...@@ -253,6 +257,9 @@ for i in xrange(quantity):\n
item_type = line.getCheckTypeValue()\n item_type = line.getCheckTypeValue()\n
item.setPrice(item_type.getPrice())\n item.setPrice(item_type.getPrice())\n
item.setPriceCurrency(line.getPriceCurrency())\n item.setPriceCurrency(line.getPriceCurrency())\n
if confirm_check:\n
item.setStartDate(start_date)\n
item.confirm()\n
#tag = \'check_%s_%s_%s\' % (model, destination_payment_uid, reference_range_min)\n #tag = \'check_%s_%s_%s\' % (model, destination_payment_uid, reference_range_min)\n
#encountered_check_identifiers_dict[tag] = None\n #encountered_check_identifiers_dict[tag] = None\n
# update reference_range_min for the next pass\n # update reference_range_min for the next pass\n
...@@ -293,7 +300,7 @@ return encountered_check_identifiers_dict\n ...@@ -293,7 +300,7 @@ return encountered_check_identifiers_dict\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>check=0, create=0, tag=None, encountered_check_identifiers_dict=None</string> </value> <value> <string>check=0, create=0, tag=None, confirm_check=0, encountered_check_identifiers_dict=None</string> </value>
</item> </item>
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
...@@ -321,7 +328,7 @@ return encountered_check_identifiers_dict\n ...@@ -321,7 +328,7 @@ return encountered_check_identifiers_dict\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>4</int> </value> <value> <int>5</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -330,6 +337,7 @@ return encountered_check_identifiers_dict\n ...@@ -330,6 +337,7 @@ return encountered_check_identifiers_dict\n
<string>check</string> <string>check</string>
<string>create</string> <string>create</string>
<string>tag</string> <string>tag</string>
<string>confirm_check</string>
<string>encountered_check_identifiers_dict</string> <string>encountered_check_identifiers_dict</string>
<string>Products.DCWorkflow.DCWorkflow</string> <string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string> <string>ValidationFailed</string>
...@@ -401,6 +409,7 @@ return encountered_check_identifiers_dict\n ...@@ -401,6 +409,7 @@ return encountered_check_identifiers_dict\n
<int>0</int> <int>0</int>
<int>0</int> <int>0</int>
<none/> <none/>
<int>0</int>
<none/> <none/>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_checkOrCreateItemList.xml
View file @ e1830667
...@@ -97,7 +97,7 @@ if check == 1:\n ...@@ -97,7 +97,7 @@ if check == 1:\n
if create==1:\n if create==1:\n
for line in line_list:\n for line in line_list:\n
line.activate(tag=checkbook_reception_tag).\\\n line.activate(tag=checkbook_reception_tag).\\\n
CheckbookReceptionLine_checkOrCreateItemList(create=1, tag=checkbook_reception_tag)\n CheckbookReceptionLine_checkOrCreateItemList(create=1, tag=checkbook_reception_tag, confirm_check=confirm_check)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -120,7 +120,7 @@ if create==1:\n ...@@ -120,7 +120,7 @@ if create==1:\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>check=0, create=0</string> </value> <value> <string>check=0, create=0, confirm_check=0</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -140,7 +140,7 @@ if create==1:\n ...@@ -140,7 +140,7 @@ if create==1:\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>2</int> </value> <value> <int>3</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -148,6 +148,7 @@ if create==1:\n ...@@ -148,6 +148,7 @@ if create==1:\n
<tuple> <tuple>
<string>check</string> <string>check</string>
<string>create</string> <string>create</string>
<string>confirm_check</string>
<string>Products.DCWorkflow.DCWorkflow</string> <string>Products.DCWorkflow.DCWorkflow</string>
<string>ValidationFailed</string> <string>ValidationFailed</string>
<string>Products.ERP5Type.Message</string> <string>Products.ERP5Type.Message</string>
...@@ -176,6 +177,7 @@ if create==1:\n ...@@ -176,6 +177,7 @@ if create==1:\n
<tuple> <tuple>
<int>0</int> <int>0</int>
<int>0</int> <int>0</int>
<int>0</int>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_getBaobabDestination.xml
View file @ e1830667
...@@ -65,8 +65,11 @@ ...@@ -65,8 +65,11 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>destination = context.getDestination()\n <value> <string>destination = None\n
if destination is not None:\n # if import, then set destination to None\n
if not context.isImport():\n
destination = context.getDestination()\n
if destination is not None:\n
destination += \'/caveau/auxiliaire/encaisse_des_billets_et_monnaies\'\n destination += \'/caveau/auxiliaire/encaisse_des_billets_et_monnaies\'\n
\n \n
return destination\n return destination\n
...@@ -120,10 +123,11 @@ return destination\n ...@@ -120,10 +123,11 @@ return destination\n
<tuple> <tuple>
<string>args</string> <string>args</string>
<string>kw</string> <string>kw</string>
<string>None</string>
<string>destination</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>destination</string> <string>_inplacevar_</string>
<string>None</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view.xml
View file @ e1830667
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
<list> <list>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>my_destination</string> <string>my_destination</string>
<string>my_imported</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_destination.xml
View file @ e1830667
...@@ -273,18 +273,15 @@ ...@@ -273,18 +273,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:here.Delivery_getVaultItemList(vault_type = \'site\', current_url = None, user_site = 1, leaf_node = 0, strict_membership = 1)</string> </value> <value> <string>python:here.Delivery_getVaultItemList(vault_type = \'site\', current_url = here.getDestination(), user_site = 1, leaf_node = 0, strict_membership = 1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_imported.xml 0 → 100644
View file @ e1830667
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="LabelField" 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_imported</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<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>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</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>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<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>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Imported File</string> </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.isImported() and 1 or 0</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookVaultTransfer_view/my_destination.xml
View file @ e1830667
...@@ -273,18 +273,15 @@ ...@@ -273,18 +273,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:here.Delivery_getVaultItemList(current_url=here.getSource(), vault_type=(\'site/caveau\',\'site/surface\',),strict_membership=1,leaf_node=0)</string> </value> <value> <string>python:here.Delivery_getVaultItemList(current_url=here.getDestination(), vault_type=(\'site/caveau\',\'site/surface\',),strict_membership=1,leaf_node=0)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/cancel.xml
View file @ e1830667
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <none/>
</value> </value>
</item> </item>
<item> <item>
...@@ -64,29 +64,4 @@ ...@@ -64,29 +64,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignee</string>
<string>DestinationAssignee</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm.xml
View file @ e1830667
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <none/>
</value> </value>
</item> </item>
<item> <item>
...@@ -64,29 +64,4 @@ ...@@ -64,29 +64,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignor</string>
<string>Assignee</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/confirm_action.xml
View file @ e1830667
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -81,7 +78,6 @@ ...@@ -81,7 +78,6 @@
<value> <value>
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignor</string>
<string>Assignee</string> <string>Assignee</string>
</tuple> </tuple>
</value> </value>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/deliver.xml
View file @ e1830667
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <none/>
</value> </value>
</item> </item>
<item> <item>
...@@ -64,28 +64,4 @@ ...@@ -64,28 +64,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>DestinationAssignee</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order.xml
View file @ e1830667
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -82,7 +79,6 @@ ...@@ -82,7 +79,6 @@
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/order_action.xml
View file @ e1830667
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -82,7 +79,6 @@ ...@@ -82,7 +79,6 @@
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan.xml
View file @ e1830667
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <none/>
</value> </value>
</item> </item>
<item> <item>
...@@ -64,29 +64,4 @@ ...@@ -64,29 +64,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Guard</string>
<string>Guard</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>roles</string> </key>
<value>
<tuple>
<string>Manager</string>
<string>Assignor</string>
<string>Assignee</string>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/transitions/plan_action.xml
View file @ e1830667
...@@ -67,11 +67,8 @@ ...@@ -67,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -82,7 +79,6 @@ ...@@ -82,7 +79,6 @@
<tuple> <tuple>
<string>Manager</string> <string>Manager</string>
<string>Assignor</string> <string>Assignor</string>
<string>Assignee</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/scripts/updateCheckAndCheckbook.xml
View file @ e1830667
...@@ -81,6 +81,7 @@ for line in line_list:\n ...@@ -81,6 +81,7 @@ for line in line_list:\n
for aggregate in aggregate_list:\n for aggregate in aggregate_list:\n
if aggregate.getPortalType()==\'Checkbook\':\n if aggregate.getPortalType()==\'Checkbook\':\n
aggregate.setStartDate(transaction.getStartDate())\n aggregate.setStartDate(transaction.getStartDate())\n
aggregate.confirm()\n
for check in aggregate.objectValues(portal_type=\'Check\'):\n for check in aggregate.objectValues(portal_type=\'Check\'):\n
check.confirm()\n check.confirm()\n
check.setStartDate(transaction.getStartDate())\n check.setStartDate(transaction.getStartDate())\n
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml
View file @ e1830667
...@@ -79,8 +79,9 @@ transaction.Base_checkBaobabSourceAndDestination()\n ...@@ -79,8 +79,9 @@ transaction.Base_checkBaobabSourceAndDestination()\n
transaction.CheckbookReception_checkOrCreateItemList(check=1)\n transaction.CheckbookReception_checkOrCreateItemList(check=1)\n
\n \n
# Start activities for each line\n # Start activities for each line\n
transaction.CheckbookReception_checkOrCreateItemList(create=1)\n confirm_check = transaction.isImported()\n
\n transaction.CheckbookReception_checkOrCreateItemList(create=1,\n
confirm_check=confirm_check)\n
\n \n
\n \n
#from Products.DCWorkflow.DCWorkflow import ValidationFailed\n #from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
...@@ -320,6 +321,7 @@ transaction.CheckbookReception_checkOrCreateItemList(create=1)\n ...@@ -320,6 +321,7 @@ transaction.CheckbookReception_checkOrCreateItemList(create=1)\n
<string>_getitem_</string> <string>_getitem_</string>
<string>transaction</string> <string>transaction</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>confirm_check</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/cancelled.xml
View file @ e1830667
...@@ -36,7 +36,10 @@ ...@@ -36,7 +36,10 @@
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
<value> <value>
<tuple/> <tuple>
<string>delete</string>
<string>delete_action</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/confirmed.xml
View file @ e1830667
...@@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=confirmed&portal_type=Stop Payment ...@@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=confirmed&portal_type=Stop Payment
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -81,17 +78,14 @@ Base_viewWorklist?simulation_state=confirmed&portal_type=Stop Payment ...@@ -81,17 +78,14 @@ Base_viewWorklist?simulation_state=confirmed&portal_type=Stop Payment
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PersistentMapping" module="Persistence.mapping"/>
<string>Persistence</string> <tuple/>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_container</string> </key> <key> <string>data</string> </key>
<value> <value>
<dictionary> <dictionary>
<item> <item>
......
bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/worklists/stop.xml
View file @ e1830667
...@@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=stopped&portal_type=Stop Payment ...@@ -57,11 +57,8 @@ Base_viewWorklist?simulation_state=stopped&portal_type=Stop Payment
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Guard" module="Products.DCWorkflow.Guard"/>
<string>Products.DCWorkflow.Guard</string> <tuple/>
<string>Guard</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -81,17 +78,14 @@ Base_viewWorklist?simulation_state=stopped&portal_type=Stop Payment ...@@ -81,17 +78,14 @@ Base_viewWorklist?simulation_state=stopped&portal_type=Stop Payment
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PersistentMapping" module="Persistence.mapping"/>
<string>Persistence</string> <tuple/>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_container</string> </key> <key> <string>data</string> </key>
<value> <value>
<dictionary> <dictionary>
<item> <item>
......
bt5/erp5_banking_check/bt/revision
View file @ e1830667
318 320
\ No newline at end of file \ No newline at end of file
bt5/erp5_banking_check/bt/template_portal_type_property_sheet_list
View file @ e1830667
...@@ -6,6 +6,7 @@ Checkbook Delivery | Amount ...@@ -6,6 +6,7 @@ Checkbook Delivery | Amount
Checkbook Delivery | Price Checkbook Delivery | Price
Checkbook Movement | Amount Checkbook Movement | Amount
Checkbook Movement | Price Checkbook Movement | Price
Checkbook Reception | CheckbookReception
Checkbook Usual Cash Transfer | Amount Checkbook Usual Cash Transfer | Amount
Checkbook Usual Cash Transfer | Price Checkbook Usual Cash Transfer | Price
Checkbook Vault Transfer | Amount Checkbook Vault Transfer | Amount
......
bt5/erp5_banking_check/bt/template_property_sheet_id_list
View file @ e1830667
StopPayment StopPayment
CheckbookReception
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7