diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/history_view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/history_view.xml deleted file mode 100644 index 369ed718a6a96b5f8866f554056e3e4df89bd7f1..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/history_view.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?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> diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/metadata.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/metadata.xml deleted file mode 100644 index 273fb9cb9cfe80ecf7107ed76c0998b77603519e..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/metadata.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?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> diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/print.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/print.xml deleted file mode 100644 index 6ce6cc1220440a607a18ae3e3431892029cf2f5d..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/print.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?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> diff --git a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/view.xml b/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/view.xml deleted file mode 100644 index 211f4191ca60564a90edffdfca6899f16d281b55..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_cash/ActionTemplateItem/portal_types/Container/view.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?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> diff --git a/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index d93bb406cd22ec7b81b0159c078bfcc932683028..1aa4c23fe3375cc6047be404b0f3fecd4f799564 100644 --- a/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_banking_cash/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -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> diff --git a/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml index 5c078e7052f561ac1640c6d8b8916c0074da6ac9..775da9120bb045a41152c7a62b018c0106662172 100644 --- a/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml +++ b/bt5/erp5_banking_cash/PortalTypeBaseCategoryTemplateItem/base_category_list.xml @@ -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> diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Container%20Cell.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Container%20Cell.xml deleted file mode 100644 index 5f4067a79cbdcb21d7b6e412958456b03a93d885..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Container%20Cell.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?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> diff --git a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Container%20Line.xml b/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Container%20Line.xml deleted file mode 100644 index 700f9783e606b69d3e6a83ce0234cbf1c86c7657..0000000000000000000000000000000000000000 --- a/bt5/erp5_banking_cash/PortalTypeTemplateItem/portal_types/Container%20Line.xml +++ /dev/null @@ -1,122 +0,0 @@ -<?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> diff --git a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml index 9a5bfc15cb251013de4588b3dd299da0f4eeb054..de8e606c81afc163615d375275f3704683601938 100644 --- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml +++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/OutgoingCashSortingCell_getBaobabDestination.xml @@ -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> diff --git a/bt5/erp5_banking_cash/bt/change_log b/bt5/erp5_banking_cash/bt/change_log index 0688daf31f2943c46da94ad5dddb84409a2884f1..646763c31839c230e67ec5dc1eee2acef710b169 100644 --- a/bt5/erp5_banking_cash/bt/change_log +++ b/bt5/erp5_banking_cash/bt/change_log @@ -1,3 +1,6 @@ +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 diff --git a/bt5/erp5_banking_cash/bt/template_action_path_list b/bt5/erp5_banking_cash/bt/template_action_path_list index d5b50cd3f53e2a047dc13ae8b196783924ca5424..4e0456f95bde294be96561236fc657f3a6f744c4 100644 --- a/bt5/erp5_banking_cash/bt/template_action_path_list +++ b/bt5/erp5_banking_cash/bt/template_action_path_list @@ -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 diff --git a/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list index 4ce54952b25d80c64c3cdcd44a6ca1ded1419748..dd0ecf49f9c351031157079688af4c567072adef 100644 --- a/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_banking_cash/bt/template_portal_type_allowed_content_type_list @@ -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 diff --git a/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list b/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list index 203a9ea4fec17c57fb12ee06ff8f0828641d28ed..bf1e872307b46a3715679c42a919f4abb7eab321 100644 --- a/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list +++ b/bt5/erp5_banking_cash/bt/template_portal_type_base_category_list @@ -1,9 +1,3 @@ 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 diff --git a/bt5/erp5_banking_cash/bt/template_portal_type_id_list b/bt5/erp5_banking_cash/bt/template_portal_type_id_list index fbaef3202b8fd5c07defe818c3975dd11f6d01b7..4a710cc37d6cc7a5ee31ac41122bd22d676f35e4 100644 --- a/bt5/erp5_banking_cash/bt/template_portal_type_id_list +++ b/bt5/erp5_banking_cash/bt/template_portal_type_id_list @@ -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