[Erp5-report] r21376 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/ Skin...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jun 6 10:41:41 CEST 2008
Author: jerome
Date: Fri Jun 6 10:41:31 2008
New Revision: 21376
URL: http://svn.erp5.org?rev=21376&view=rev
Log:
2008-06-06 jerome
* Merge skin folders to have only erp5_payroll
Added:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Base_hashVariationRangeCategoryItemList.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/Base_hashVariationRangeCategoryItemList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_asCellRange.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asPredicate.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_asPredicate.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/
- copied from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelModule_viewPaySheetModelList/
- copied from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelModule_viewPaySheetModelList/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelModule_viewPaySheetModelList.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelModule_viewPaySheetModelList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelSlice_view/
- copied from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelSlice_view/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelSlice_view.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelSlice_view.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_asCellRange.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_asCellRange.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/
- copied from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewFieldLibrary/
- copied from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewFieldLibrary/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewFieldLibrary.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewFieldLibrary.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewRatioSettingsList/
- copied from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewRatioSettingsList/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewRatioSettingsList.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewRatioSettingsList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/
- copied from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewSliceSettings/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewSliceSettings.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/
- copied from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/RatioSettings_view/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/RatioSettings_view.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary/
- copied from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/RatioSettings_viewFieldLibrary/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary.xml
- copied unchanged from r21375, erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/RatioSettings_viewFieldLibrary.xml
Removed:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model.xml
Modified:
erp5/trunk/bt5/erp5_payroll/bt/change_log
erp5/trunk/bt5/erp5_payroll/bt/revision
erp5/trunk/bt5/erp5_payroll/bt/template_skin_id_list
Removed: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model.xml?rev=21375&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model.xml (removed)
@@ -1,35 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="Folder" module="OFS.Folder"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_objects</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>erp5_paysheet_model</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></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=21376&r1=21375&r2=21376&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Fri Jun 6 10:41:31 2008
@@ -1,3 +1,6 @@
+2008-06-06 jerome
+* Merge skin folders to have only erp5_payroll
+
2008-03-06 jerome
* API change: PaySheetTransaction_getMovementList was returning the total price as "xxx_quantity" on brains. It now returns quantity, price and total_price respectivly.
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=21376&r1=21375&r2=21376&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Fri Jun 6 10:41:31 2008
@@ -1,1 +1,1 @@
-245
+246
Modified: erp5/trunk/bt5/erp5_payroll/bt/template_skin_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/template_skin_id_list?rev=21376&r1=21375&r2=21376&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/template_skin_id_list (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/template_skin_id_list Fri Jun 6 10:41:31 2008
@@ -1,2 +1,1 @@
-erp5_payroll
-erp5_paysheet_model
+erp5_payroll
More information about the Erp5-report
mailing list