Skip to content

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

2006-07-07 aurel 

* fix getBaobabDestination to take the owner of the document inot account instead of the person who is reindexing
* remove container portal type as they are in erp5_trade

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8349 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9c528e2c
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 628 deletions
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/history_view.xml deleted 100644 → 0
View file @ 9c528e2c
<?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_view</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>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/Container/metadata.xml deleted 100644 → 0
View file @ 9c528e2c
<?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>metadata</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>Manage properties</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>Metadata</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_viewMetadata</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/print.xml deleted 100644 → 0
View file @ 9c528e2c
<?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>4.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}/Base_printPdf</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/view.xml deleted 100644 → 0
View file @ 9c528e2c
<?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>view</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>1.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>View</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}/Container_view</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ b8a738d5
......@@ -29,10 +29,6 @@
<portal_type id="Classification Survey Module">
<item>Classification Survey</item>
</portal_type>
<portal_type id="Container">
<item>Container Line</item>
<item>Container</item>
</portal_type>
<portal_type id="Container Line">
<item>Container Cell</item>
</portal_type>
......
bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
View file @ b8a738d5
......@@ -2,16 +2,6 @@
<portal_type id="Cash Container Item">
<item>aggregate</item>
</portal_type>
<portal_type id="Container Cell">
<item>cash_status</item>
<item>emission_letter</item>
<item>variation</item>
</portal_type>
<portal_type id="Container Line">
<item>emission_letter</item>
<item>cash_status</item>
<item>variation</item>
</portal_type>
<portal_type id="Outgoing Cash Sorting Cell">
<item>variation</item>
</portal_type>
......
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Container%20Cell.xml deleted 100644 → 0
View file @ 9c528e2c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.ERP5Type</string>
<string>ERP5TypeInformation</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_actions</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_roles</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>allowed_content_types</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>base_category_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>document.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Container Cell</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string> A DeliveryCell allows to define specific quantities\n
for each variation of a resource in a delivery line.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addContainerCell</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple>
<string>delivery_movement</string>
</tuple>
</value>
</item>
<item>
<key> <string>hidden_content_type_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Container Cell</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>property_sheet_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Container%20Line.xml deleted 100644 → 0
View file @ 9c528e2c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Type.ERP5Type</string>
<string>ERP5TypeInformation</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_actions</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>_aliases</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_roles</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>allowed_content_types</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>base_category_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>document.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Container Line</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string> A DeliveryLine object allows to implement lines in\n
Deliveries (packing list, order, invoice, etc.)\n
\n
It may include a price (for insurance, for customs, for invoices,\n
for orders)\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addContainerLine</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple>
<string>container_line</string>
<string>delivery_movement</string>
</tuple>
</value>
</item>
<item>
<key> <string>hidden_content_type_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Container Line</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>property_sheet_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml
View file @ b8a738d5
......@@ -71,9 +71,15 @@
<value> <string>if context.getSource() is None:\n
return None\n
\n
# must use owner to know site letter\n
old_group_list = context.get_local_roles()\n
for group, role_list in old_group_list:\n
if \'Owner\' in role_list:\n
user = group\n
\n
site = context.Baobab_getVaultSite(context.getSource()).getRelativeUrl()\n
\n
if context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancelled\' and context.getEmissionLetter() in context.Baobab_getUserEmissionLetterList():\n
if context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancelled\' and context.getEmissionLetter() in context.Baobab_getOwnerEmissionLetterList(user):\n
# remaining banknote which are not sorted yet, or cancelled one\n
if not \'ventilation\' in context.getSource():\n
return \'%s/caveau/auxiliaire/encaisse_des_billets_et_monnaies\' %(site,)\n
......@@ -81,7 +87,7 @@ if context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancel
# take classification into account here\n
source_list = context.getSource().split(\'/\')\n
return \'%s/caveau/auxiliaire/%s\' %(site,\'/\'.join(source_list[-2:]))\n
elif context.getEmissionLetter() in context.Baobab_getUserEmissionLetterList():\n
elif context.getEmissionLetter() in context.Baobab_getOwnerEmissionLetterList(user):\n
return \'%s/caveau/reserve/encaisse_des_billets_et_monnaies\' %(site,)\n
else:\n
return \'%s/caveau/externes/encaisse_des_externes\' %(site,)\n
......@@ -142,6 +148,11 @@ else:\n
<string>_getattr_</string>
<string>context</string>
<string>None</string>
<string>old_group_list</string>
<string>_getiter_</string>
<string>group</string>
<string>role_list</string>
<string>user</string>
<string>site</string>
<string>source_list</string>
<string>_getitem_</string>
......
bt5/erp5_banking_cash/bt/change_log
View file @ b8a738d5
2006-07-07 aurel
* fix getBaobabDestination to take the owner of the document inot account instead of the person who is reindexing
2006-07-05 aurel
* fix getBaobabDestination for cash sorting cell
......
bt5/erp5_banking_cash/bt/template_action_path_list
View file @ b8a738d5
......@@ -37,18 +37,6 @@ Classification Survey | print
Classification Survey | result
Classification Survey | supply
Classification Survey | view
Container Cell | metadata
Container Cell | print
Container Cell | view
Container Line | metadata
Container Line | print
Container Line | view
Container Line | view_history
Container Line | view_quantity
Container | history_view
Container | metadata
Container | print
Container | view
Counter Rendering Module | list_ui
Counter Rendering Module | print_pdf
Counter Rendering Module | sort_on
......
bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list
View file @ b8a738d5
......@@ -11,8 +11,6 @@ Classification Survey Module | Classification Survey
Classification Survey | Incoming Classification Survey Line
Classification Survey | Outgoing Classification Survey Line
Container Line | Container Cell
Container | Container
Container | Container Line
Counter Rendering Module | Counter Rendering
Counter Rendering | Cash Delivery Line
Foreign Cash Reception Module | Foreign Cash Reception
......
bt5/erp5_banking_cash/bt/template_portal_type_base_category_list
View file @ b8a738d5
Cash Container Item | aggregate
Container Cell | cash_status
Container Cell | emission_letter
Container Cell | variation
Container Line | cash_status
Container Line | emission_letter
Container Line | variation
Outgoing Cash Sorting Cell | variation
Outgoing Classification Survey Cell | variation
\ No newline at end of file
bt5/erp5_banking_cash/bt/template_portal_type_id_list
View file @ b8a738d5
......@@ -6,8 +6,6 @@ Cash Sorting
Cash Sorting Module
Classification Survey
Classification Survey Module
Container Cell
Container Line
Counter Rendering
Counter Rendering Module
Foreign Cash Reception
......
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