Skip to content

erp5
erp5
Commit 9a18b158 authored by Kevin Deldycke's avatar Kevin Deldycke
Browse files
Options

Do not define base category twice. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10931 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 741685aa
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 918 deletions
bt5/erp5_payroll/PathTemplateItem/portal_categories/salary_range.xml deleted 100644 → 0
View file @ 741685aa
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5.Tool.Category</string>
<string>BaseCategory</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<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>_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>_properties</string> </key>
<value>
<list>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>Local ID of the object in its enclosing container</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>id</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>uid</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>int</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>catalog_index</string> </key>
<value>
<tuple>
<string>COUNT</string>
</tuple>
</value>
</item>
<item>
<key> <string>catalog_metadata</string> </key>
<value> <int>1</int> </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>id</string> </key>
<value> <string>title</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<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>id</string> </key>
<value> <string>description</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>text</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Determines if acquired value should be copied</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_copy_value</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>boolean</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Determines if the local value have priority</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_mask_value</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>boolean</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Determines if the acquired value should be appended</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_append_value</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>boolean</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Determines if the acquired value should be synced</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_sync_value</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>boolean</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>base_id</string> </key>
<value> <string>acquisition_object_id</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The default contained object id to look up</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_object_id_list</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>lines</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>base_id</string> </key>
<value> <string>acquisition_base_category</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The base categories to browse</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_base_category_list</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>tokens</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>base_id</string> </key>
<value> <string>acquisition_portal_type</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The portal types to browse</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_portal_type_list</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>multivalued</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>tales</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>base_id</string> </key>
<value> <string>fallback_base_category</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>another base category to get if everything else fails</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>fallback_base_category_list</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>tokens</string> </value>
</item>
</dictionary>
</list>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_copy_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_mask_value</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: []</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>salary_range</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</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>
</ZopeData>
bt5/erp5_payroll/PathTemplateItem/portal_categories/tax_category.xml deleted 100644 → 0
View file @ 741685aa
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5.Tool.Category</string>
<string>BaseCategory</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<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>_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>_properties</string> </key>
<value>
<list>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>Local ID of the object in its enclosing container</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>id</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>uid</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>int</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>catalog_index</string> </key>
<value>
<tuple>
<string>COUNT</string>
</tuple>
</value>
</item>
<item>
<key> <string>catalog_metadata</string> </key>
<value> <int>1</int> </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>id</string> </key>
<value> <string>title</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<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>id</string> </key>
<value> <string>description</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>text</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Determines if acquired value should be copied</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_copy_value</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>boolean</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Determines if the local value have priority</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_mask_value</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>boolean</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Determines if the acquired value should be appended</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_append_value</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>boolean</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Determines if the acquired value should be synced</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_sync_value</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>boolean</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>base_id</string> </key>
<value> <string>acquisition_object_id</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The default contained object id to look up</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_object_id_list</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>lines</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>base_id</string> </key>
<value> <string>acquisition_base_category</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The base categories to browse</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_base_category_list</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>tokens</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>base_id</string> </key>
<value> <string>acquisition_portal_type</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The portal types to browse</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>acquisition_portal_type_list</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>multivalued</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>tales</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>base_id</string> </key>
<value> <string>fallback_base_category</string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>another base category to get if everything else fails</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>fallback_base_category_list</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>tokens</string> </value>
</item>
</dictionary>
</list>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>acquisition_append_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
<string>order</string>
<string>parent</string>
</tuple>
</value>
</item>
<item>
<key> <string>acquisition_copy_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>acquisition_mask_value</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList())</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>tax_category</string> </value>
</item>
<item>
<key> <string>id_group</string> </key>
<value> <string>None</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</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>
</ZopeData>
bt5/erp5_payroll/bt/change_log
View file @ 9a18b158
2006-10-25 Kevin
* Do not define base category twice.
2006-10-24 Kevin 2006-10-24 Kevin
* So much things changed since the 0.1 version. Bump version to 0.2. * So much things changed since the 0.1 version. Bump version to 0.2.
* Support dynamic update of gross salary calculation on pay sheet preview. * Support dynamic update of gross salary calculation on pay sheet preview.
......
bt5/erp5_payroll/bt/revision
View file @ 9a18b158
79 83
\ No newline at end of file \ No newline at end of file
bt5/erp5_payroll/bt/template_path_list
View file @ 9a18b158
...@@ -13,9 +13,7 @@ portal_categories/product_line/social_service/** ...@@ -13,9 +13,7 @@ portal_categories/product_line/social_service/**
portal_categories/product_line/tax portal_categories/product_line/tax
portal_categories/quantity_unit/time portal_categories/quantity_unit/time
portal_categories/quantity_unit/time/month portal_categories/quantity_unit/time/month
portal_categories/salary_range
portal_categories/salary_range/** portal_categories/salary_range/**
portal_categories/tax_category
portal_categories/tax_category/** portal_categories/tax_category/**
portal_deliveries/pay_sheet_transaction_builder portal_deliveries/pay_sheet_transaction_builder
portal_rules/default_pay_sheet_transaction_rule portal_rules/default_pay_sheet_transaction_rule
......
bt5/erp5_payroll/bt/version
View file @ 9a18b158
0.2.0 0.2.1
\ No newline at end of file \ 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