[Erp5-report] r7714 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jun 14 11:18:42 CEST 2006
Author: kevin
Date: Wed Jun 14 11:18:37 2006
New Revision: 7714
URL: http://svn.erp5.org?rev=7714&view=rev
Log:
Payroll report system is now fully translatable.
Update version number.
Added:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList.xml
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog/my_report_type.xml
erp5/trunk/bt5/erp5_payroll/bt/change_log
erp5/trunk/bt5/erp5_payroll/bt/version
Added: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList.xml?rev=7714&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList.xml (added)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList.xml Wed Jun 14 11:18:37 2006
@@ -1,0 +1,168 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.PythonScripts.PythonScript</string>
+ <string>PythonScript</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>portal = context.getPortalObject()\n
+N_ = portal.Base_translateString\n
+\n
+report_type = [ (\'Gross Salary (default)\', \'gross_salary\')\n
+ , (\'Net Salary\', \'net_salary\')\n
+ , (\'Taxable Net Salary\', \'taxable_net_salary\')\n
+ , (\'Employee Share\', \'total_employee_share\')\n
+ , (\'Taxable Employee Share\', \'total_taxable_employee_share\')\n
+ , (\'Employer Share\', \'total_employer_share\')\n
+ , (\'Ceiling Salary\', \'ceiling_salary\')\n
+ , (\'CSG Salary\', \'csg_salary\')\n
+ , (\'Slice A Salary\', \'slice_a_salary\')\n
+ , (\'Slice B Salary\', \'slice_b_salary\')\n
+ , (\'Slice C Salary\', \'slice_c_salary\')\n
+ ]\n
+\n
+translated_type_list = []\n
+for (type_name, type_id) in report_type:\n
+ translated_type_list.append((N_(type_name), type_id))\n
+\n
+return translated_type_list\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value> <string>Script (Python):/nexedi/portal_skins/erp5_payroll/AccountingTransactionModule_getTranslatedPayrollReportTypeList</string> </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>portal</string>
+ <string>N_</string>
+ <string>report_type</string>
+ <string>translated_type_list</string>
+ <string>_getiter_</string>
+ <string>type_name</string>
+ <string>type_id</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>AccountingTransactionModule_getTranslatedPayrollReportTypeList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml?rev=7714&r1=7713&r2=7714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml Wed Jun 14 11:18:37 2006
@@ -164,9 +164,9 @@
</style>\n
</head><body>""" % (N_(\'Payroll Report\'))\n
\n
-print "<h1>%s</h1>" % N_("Annual ${report_type} Report", mapping={\'report_type\': unicode(salary_type.replace(\'_\', \' \').title(), \'utf8\')})\n
-\n
-print "<h2>%s</h2>" % N_("Fiscal year ${year}", mapping={\'year\': unicode(str(year), \'utf8\')})\n
+print "<h1>%s</h1>" % N_("Annual ${report_type} Report", mapping={\'report_type\': N_(salary_type.replace(\'_\', \' \').title())})\n
+\n
+print "<h2>%s</h2>" % N_("Fiscal year ${year}", mapping={\'year\': str(year)})\n
\n
print "<table><tr><th></th>"\n
month_list = [\'January\', \'February\', \'March\', \'April\', \'May\', \'June\', \'July\', \'August\', \'September\', \'October\', \'November\', \'December\']\n
@@ -288,7 +288,6 @@
<string>append</string>
<string>$append0</string>
<string>item</string>
- <string>unicode</string>
<string>str</string>
<string>month_list</string>
<string>month</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog/my_report_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog/my_report_type.xml?rev=7714&r1=7713&r2=7714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog/my_report_type.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPayrollReportDialog/my_report_type.xml Wed Jun 14 11:18:37 2006
@@ -152,7 +152,9 @@
</item>
<item>
<key> <string>items</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>orientation</string> </key>
@@ -224,52 +226,7 @@
<item>
<key> <string>items</string> </key>
<value>
- <list>
- <tuple>
- <string>Gross Salary (default)</string>
- <string>gross_salary</string>
- </tuple>
- <tuple>
- <string>Net Salary</string>
- <string>net_salary</string>
- </tuple>
- <tuple>
- <string>Taxable Net Salary</string>
- <string>taxable_net_salary</string>
- </tuple>
- <tuple>
- <string>Employee Share</string>
- <string>total_employee_share</string>
- </tuple>
- <tuple>
- <string>Taxable Employee Share</string>
- <string>total_taxable_employee_share</string>
- </tuple>
- <tuple>
- <string>Employer Share</string>
- <string>total_employer_share</string>
- </tuple>
- <tuple>
- <string>Ceiling Salary</string>
- <string>ceiling_salary</string>
- </tuple>
- <tuple>
- <string>CSG Salary</string>
- <string>csg_salary</string>
- </tuple>
- <tuple>
- <string>Slice A Salary</string>
- <string>slice_a_salary</string>
- </tuple>
- <tuple>
- <string>Slice B Salary</string>
- <string>slice_b_salary</string>
- </tuple>
- <tuple>
- <string>Slice C Salary</string>
- <string>slice_c_salary</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -298,4 +255,23 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.TALESField</string>
+ <string>TALESMethod</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.AccountingTransactionModule_getTranslatedPayrollReportTypeList()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=7714&r1=7713&r2=7714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Wed Jun 14 11:18:37 2006
@@ -1,3 +1,7 @@
+2006-06-14 Kevin
+* Payroll report system is now fully translatable.
+* Update version number.
+
2006-06-13 Kevin
* Add a very alpha version of the Payroll report.
Modified: erp5/trunk/bt5/erp5_payroll/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/version?rev=7714&r1=7713&r2=7714&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/version (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/version Wed Jun 14 11:18:37 2006
@@ -1,1 +1,1 @@
-0.1.3
+0.1.4
More information about the Erp5-report
mailing list