From a03914c8c6ce5fbeb7ab41abecfe674dac764afa Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Fri, 19 Feb 2010 07:07:52 +0000
Subject: [PATCH] 2010-02-19 yusei * Revise base_amount/payroll category
structure.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32839 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../base_amount/payroll/l10n/jp.xml | 99 +++++++++++++++++++
.../base_amount/payroll/l10n/jp/salary.xml | 82 +++++++++++++++
.../jp}/salary/normalised_salary.xml | 26 +++++
bt5/erp5_payroll_l10n_jp/bt/change_log | 3 +
bt5/erp5_payroll_l10n_jp/bt/revision | 2 +-
.../bt/template_path_list | 3 +-
6 files changed, 213 insertions(+), 2 deletions(-)
create mode 100644 bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp.xml
create mode 100644 bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp/salary.xml
rename bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/{earning => l10n/jp}/salary/normalised_salary.xml (76%)
diff --git a/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp.xml b/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp.xml
new file mode 100644
index 0000000000..e6b692f7f3
--- /dev/null
+++ b/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="Category" module="Products.ERP5Type.Document.Category"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <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>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>base_amount/payroll/l10n/jp</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>codification</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>jp</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category</string> </value>
+ </item>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Japanese Specific Payroll Amounts</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Length" module="BTrees.Length"/>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp/salary.xml b/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp/salary.xml
new file mode 100644
index 0000000000..2b1c8e8ccd
--- /dev/null
+++ b/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp/salary.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="Category" module="Products.ERP5Type.Document.Category"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <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>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>base_amount/payroll/l10n/jp/salary</string>
+ <string>base_amount/payroll/l10n/jp/salary</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>salary</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Salary</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Length" module="BTrees.Length"/>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/earning/salary/normalised_salary.xml b/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp/salary/normalised_salary.xml
similarity index 76%
rename from bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/earning/salary/normalised_salary.xml
rename to bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp/salary/normalised_salary.xml
index 28a0e1b07d..96504ca900 100644
--- a/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/earning/salary/normalised_salary.xml
+++ b/bt5/erp5_payroll_l10n_jp/PathTemplateItem/portal_categories/base_amount/payroll/l10n/jp/salary/normalised_salary.xml
@@ -55,6 +55,20 @@
</tuple>
</value>
</item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>base_amount/payroll/l10n/jp/salary/normalised_salary</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>codification</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>description</string> </key>
<value>
@@ -65,10 +79,22 @@
<key> <string>id</string> </key>
<value> <string>normalised_salary</string> </value>
</item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category</string> </value>
</item>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
<item>
<key> <string>title</string> </key>
<value> <string>Normalised Salary</string> </value>
diff --git a/bt5/erp5_payroll_l10n_jp/bt/change_log b/bt5/erp5_payroll_l10n_jp/bt/change_log
index df3b9fc131..4a068e7385 100644
--- a/bt5/erp5_payroll_l10n_jp/bt/change_log
+++ b/bt5/erp5_payroll_l10n_jp/bt/change_log
@@ -1,3 +1,6 @@
+2010-02-19 yusei
+* Revise base_amount/payroll category structure.
+
2010-02-06 yusuke
* add a kind of salary category for normalised salary
diff --git a/bt5/erp5_payroll_l10n_jp/bt/revision b/bt5/erp5_payroll_l10n_jp/bt/revision
index 1bda760653..176fdebf1b 100644
--- a/bt5/erp5_payroll_l10n_jp/bt/revision
+++ b/bt5/erp5_payroll_l10n_jp/bt/revision
@@ -1 +1 @@
-117
\ No newline at end of file
+119
\ No newline at end of file
diff --git a/bt5/erp5_payroll_l10n_jp/bt/template_path_list b/bt5/erp5_payroll_l10n_jp/bt/template_path_list
index 0dac5505fa..0e2815292c 100644
--- a/bt5/erp5_payroll_l10n_jp/bt/template_path_list
+++ b/bt5/erp5_payroll_l10n_jp/bt/template_path_list
@@ -1,3 +1,4 @@
-portal_categories/base_amount/payroll/earning/salary/normalised_salary
+portal_categories/base_amount/payroll/l10n/jp
+portal_categories/base_amount/payroll/l10n/jp/**
portal_categories/salary_range/japan
portal_categories/salary_range/japan/**
\ No newline at end of file
--
2.30.9