From e4c985a4b74898a0eccc211e16187e4104ff787d Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Wed, 21 Dec 2005 18:19:11 +0000 Subject: [PATCH] * "Section Category" in AccountingPreferences_view is no longer required. * Display None category in Section Category list of Preference_view form. * Add default_site_preference from erp5_accounting. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4840 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../default_site_preference.xml | 647 ++++++++++++++++++ ...y_preferred_accounting_transaction_gap.xml | 2 +- ...ccounting_transaction_section_category.xml | 2 +- .../my_preferred_section_category.xml | 2 +- .../ERP5/bootstrap/erp5_core/bt/change_log | 7 +- .../bootstrap/erp5_core/bt/template_path_list | 1 + 6 files changed, 657 insertions(+), 4 deletions(-) create mode 100755 product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_preferences/default_site_preference.xml diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_preferences/default_site_preference.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_preferences/default_site_preference.xml new file mode 100755 index 0000000000..7c53a7b429 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_preferences/default_site_preference.xml @@ -0,0 +1,647 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ERP5Type.Document.Preference</string> + <string>Preference</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_Access_contents_information_Permission</string> </key> + <value> + <tuple> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + <item> + <key> <string>_Modify_portal_content_Permission</string> </key> + <value> + <tuple> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + <item> + <key> <string>_View_Permission</string> </key> + <value> + <tuple> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> + <item> + <key> <string>__ac_local_group_roles__</string> </key> + <value> + <dictionary> + <item> + <key> <string>role:Authenticated</string> </key> + <value> + <list> + <string>Auditor</string> + </list> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_count</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>_local_properties</string> </key> + <value> + <tuple> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>preferred_accounting_transaction_gap_root</string> </value> + </item> + <item> + <key> <string>type</string> </key> + <value> <string>string</string> </value> + </item> + </dictionary> + </tuple> + </value> + </item> + <item> + <key> <string>_mt_index</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_tree</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>contributors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>The default parameters for the site are set on this preference.\n +It\'s the lowest priority one; ie. managers can create higher priority preference for a group of users and users can create individals (per user) preferences that will be top level priority.</string> </value> + </item> + <item> + <key> <string>effective_date</string> </key> + <value> + <object> + <klass> + <global id="1.1" name="DateTime" module="DateTime.DateTime"/> + </klass> + <tuple> + <none/> + </tuple> + <state> + <dictionary> + <item> + <key> <string>_aday</string> </key> + <value> <string>Mon</string> </value> + </item> + <item> + <key> <string>_amon</string> </key> + <value> <string>Jan</string> </value> + </item> + <item> + <key> <string>_d</string> </key> + <value> <float>36525.2083333</float> </value> + </item> + <item> + <key> <string>_day</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>_dayoffset</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>_fday</string> </key> + <value> <string>Monday</string> </value> + </item> + <item> + <key> <string>_fmon</string> </key> + <value> <string>January</string> </value> + </item> + <item> + <key> <string>_hour</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_millis</string> </key> + <value> <long>978325200000</long> </value> + </item> + <item> + <key> <string>_minute</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_month</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>_nearsec</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_pday</string> </key> + <value> <string>Mon.</string> </value> + </item> + <item> + <key> <string>_pm</string> </key> + <value> <string>am</string> </value> + </item> + <item> + <key> <string>_pmhour</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_pmon</string> </key> + <value> <string>Jan.</string> </value> + </item> + <item> + <key> <string>_second</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_t</string> </key> + <value> <float>978325200.0</float> </value> + </item> + <item> + <key> <string>_tz</string> </key> + <value> <string>US/Eastern</string> </value> + </item> + <item> + <key> <string>_year</string> </key> + <value> <int>2001</int> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> <float>0.208333333336</float> </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>expiration_date</string> </key> + <value> + <object> + <klass> <reference id="1.1"/> </klass> + <tuple> + <none/> + </tuple> + <state> + <dictionary> + <item> + <key> <string>_aday</string> </key> + <value> <string>Thu</string> </value> + </item> + <item> + <key> <string>_amon</string> </key> + <value> <string>Dec</string> </value> + </item> + <item> + <key> <string>_d</string> </key> + <value> <float>2958097.20833</float> </value> + </item> + <item> + <key> <string>_day</string> </key> + <value> <int>30</int> </value> + </item> + <item> + <key> <string>_dayoffset</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>_fday</string> </key> + <value> <string>Thursday</string> </value> + </item> + <item> + <key> <string>_fmon</string> </key> + <value> <string>December</string> </value> + </item> + <item> + <key> <string>_hour</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_millis</string> </key> + <value> <long>253402146000000</long> </value> + </item> + <item> + <key> <string>_minute</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>_month</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_nearsec</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_pday</string> </key> + <value> <string>Thu.</string> </value> + </item> + <item> + <key> <string>_pm</string> </key> + <value> <string>am</string> </value> + </item> + <item> + <key> <string>_pmhour</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_pmon</string> </key> + <value> <string>Dec.</string> </value> + </item> + <item> + <key> <string>_second</string> </key> + <value> <float>0.0</float> </value> + </item> + <item> + <key> <string>_t</string> </key> + <value> <float>253402146000.0</float> </value> + </item> + <item> + <key> <string>_tz</string> </key> + <value> <string>US/Eastern</string> </value> + </item> + <item> + <key> <string>_year</string> </key> + <value> <int>9999</int> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> <float>0.208333333489</float> </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>format</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>default_site_preference</string> </value> + </item> + <item> + <key> <string>id_group</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>language</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>last_id</string> </key> + <value> <string>1</string> </value> + </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>Preference</string> </value> + </item> + <item> + <key> <string>preferred_accounting_transaction_at_date</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>preferred_accounting_transaction_currency</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>preferred_accounting_transaction_from_date</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>preferred_accounting_transaction_gap</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>preferred_accounting_transaction_gap_root</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>preferred_accounting_transaction_section_category</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>preferred_accounting_transaction_simulation_state</string> </key> + <value> + <tuple> + <string>stopped</string> + <string>delivered</string> + </tuple> + </value> + </item> + <item> + <key> <string>preferred_accounting_transaction_source_section</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>preferred_section_category</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>preferred_subversion_user_name</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>preferred_visible_module</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>priority</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>rights</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>subject</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Default Site Preference</string> </value> + </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>workflow_history</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>BTrees.Length</string> + <string>Length</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> <int>0</int> </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <tuple> + <string>BTrees.OOBTree</string> + <string>OOBTree</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <none/> + </pickle> + </record> + <record id="5" aka="AAAAAAAAAAU="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary> + <item> + <key> <string>preference_workflow</string> </key> + <value> + <tuple> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actor</string> </key> + <value> <string>kevin</string> </value> + </item> + <item> + <key> <string>comment</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>error_message</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>preference_state</string> </key> + <value> <string>disabled</string> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> + <object> + <klass> + <global name="DateTime" module="DateTime.DateTime"/> + </klass> + <tuple> + <none/> + </tuple> + <state> + <dictionary> + <item> + <key> <string>_aday</string> </key> + <value> <string>Wed</string> </value> + </item> + <item> + <key> <string>_amon</string> </key> + <value> <string>Dec</string> </value> + </item> + <item> + <key> <string>_d</string> </key> + <value> <float>38340.7144507</float> </value> + </item> + <item> + <key> <string>_day</string> </key> + <value> <int>21</int> </value> + </item> + <item> + <key> <string>_dayoffset</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>_fday</string> </key> + <value> <string>Wednesday</string> </value> + </item> + <item> + <key> <string>_fmon</string> </key> + <value> <string>December</string> </value> + </item> + <item> + <key> <string>_hour</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_millis</string> </key> + <value> <long>1135184928541</long> </value> + </item> + <item> + <key> <string>_minute</string> </key> + <value> <int>8</int> </value> + </item> + <item> + <key> <string>_month</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_nearsec</string> </key> + <value> <float>48.0</float> </value> + </item> + <item> + <key> <string>_pday</string> </key> + <value> <string>Wed.</string> </value> + </item> + <item> + <key> <string>_pm</string> </key> + <value> <string>pm</string> </value> + </item> + <item> + <key> <string>_pmhour</string> </key> + <value> <int>12</int> </value> + </item> + <item> + <key> <string>_pmon</string> </key> + <value> <string>Dec.</string> </value> + </item> + <item> + <key> <string>_second</string> </key> + <value> <float>48.541</float> </value> + </item> + <item> + <key> <string>_t</string> </key> + <value> <float>1135184928.54</float> </value> + </item> + <item> + <key> <string>_tz</string> </key> + <value> <string>US/Eastern</string> </value> + </item> + <item> + <key> <string>_year</string> </key> + <value> <int>2005</int> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> <float>0.714450706015</float> </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + </dictionary> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AccountingPreferences_view/my_preferred_accounting_transaction_gap.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AccountingPreferences_view/my_preferred_accounting_transaction_gap.xml index ba9a205557..c403be14b2 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AccountingPreferences_view/my_preferred_accounting_transaction_gap.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AccountingPreferences_view/my_preferred_accounting_transaction_gap.xml @@ -287,7 +287,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:here.AccountModule_getAvailableGapList(include_gap_in_path = 1)</string> </value> + <value> <string>python:here.AccountModule_getAvailableGapList(include_gap_in_path=1, include_empty_item=1)</string> </value> </item> </dictionary> </pickle> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AccountingPreferences_view/my_preferred_accounting_transaction_section_category.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AccountingPreferences_view/my_preferred_accounting_transaction_section_category.xml index a65cbbd0e6..e732312bb6 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AccountingPreferences_view/my_preferred_accounting_transaction_section_category.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AccountingPreferences_view/my_preferred_accounting_transaction_section_category.xml @@ -243,7 +243,7 @@ </item> <item> <key> <string>required</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>size</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_section_category.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_section_category.xml index 838f90e815..7fb94a2f4d 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_section_category.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_view/my_preferred_section_category.xml @@ -287,7 +287,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:here.portal_categories.group.getCategoryChildTitleItemList(base=1,display_none_category=0)</string> </value> + <value> <string>python:here.portal_categories.group.getCategoryChildTitleItemList(base=1)</string> </value> </item> </dictionary> </pickle> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index 015e875d24..b50b1b3144 100755 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,3 +1,8 @@ +2005-12-21 Kevin +* "Section Category" in AccountingPreferences_view is no longer required. +* Display None category in Section Category list of Preference_view form. +* Add default_site_preference from erp5_accounting. + 2005-12-20 jerome * replace id by reference for Currency Code in the UI. @@ -387,4 +392,4 @@ variation * Add base categorie from erp5_apparel_depend: origin. 2005-04-06 -* Add base categories from erp5_trade, erp5_accounting: destination_administration, destination_decision, destination_payment, source_administration, source_decision, source_payment. +* Add base categories from erp5_trade, erp5_accounting: destination_administration, destination_decision, destination_payment, source_administration, source_decision, source_payment. \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_path_list b/product/ERP5/bootstrap/erp5_core/bt/template_path_list index f647f7eec6..2a0909e7fd 100755 --- a/product/ERP5/bootstrap/erp5_core/bt/template_path_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_path_list @@ -1,3 +1,4 @@ portal_categories/gender/male portal_categories/gender/female +portal_preferences/default_site_preference portal_categories/role/internal \ No newline at end of file -- 2.30.9