[Erp5-report] r18337 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Dec 14 18:42:01 CET 2007
Author: fabien
Date: Fri Dec 14 18:42:00 2007
New Revision: 18337
URL: http://svn.erp5.org?rev=18337&view=rev
Log:
use getSubObjectValueList method to search sub object in all modell depencies tree
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxPreviewColumnList.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml?rev=18337&r1=18336&r2=18337&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml Fri Dec 14 18:42:00 2007
@@ -70,12 +70,12 @@
portal_type_list) in the paysheet\n
\'\'\'\n
\n
-model = context.getSpecialiseValue()\n
-subobject_list = model.contentValues(portal_type=portal_type_list)\n
-subobject_id_list = [x.getId() for x in subobject_list]\n
+sub_object_list = context.getSubObjectValueList(portal_type_list)\n
+sub_object_uid_list = [x.getUid() for x in sub_object_list]\n
\n
# copy model object\n
-copy_data = model.manage_copyObjects(ids=subobject_id_list)\n
+model = context.getSpecialiseValue()\n
+copy_data = model.manage_copyObjects(uids=sub_object_uid_list)\n
\n
# paste into context (paysheet) folder\n
context.manage_pasteObjects(copy_data)\n
@@ -124,13 +124,13 @@
<string>portal_type_list</string>
<string>_getattr_</string>
<string>context</string>
- <string>model</string>
- <string>subobject_list</string>
+ <string>sub_object_list</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>x</string>
- <string>subobject_id_list</string>
+ <string>sub_object_uid_list</string>
+ <string>model</string>
<string>copy_data</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml?rev=18337&r1=18336&r2=18337&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml Fri Dec 14 18:42:00 2007
@@ -78,8 +78,15 @@
from Products.ERP5Type.Message import Message\n
N_ = lambda msg, **kw: Message(\'erp5_ui\', msg, **kw)\n
\n
+def sortByIntIndex(a, b):\n
+ return cmp(a.getIntIndex(), b.getIntIndex())\n
+\n
model = context.getSpecialiseValue(0)\n
-model_line_list = model.contentValues(portal_type=\'Pay Sheet Model Line\')\n
+portal_type_list = [\'Pay Sheet Model Line\']\n
+sub_object_list = context.getSubObjectValueList(portal_type_list)\n
+sub_object_list.sort(sortByIntIndex)\n
+model_line_list = sub_object_list\n
+\n
# remove editable model line\n
model_line_list = [x.getObject() for x in model_line_list \\\n
if x.getObject().isEditable()]\n
@@ -268,9 +275,12 @@
<string>Products.ERP5Type.Message</string>
<string>Message</string>
<string>N_</string>
+ <string>sortByIntIndex</string>
<string>_getattr_</string>
<string>context</string>
<string>model</string>
+ <string>portal_type_list</string>
+ <string>sub_object_list</string>
<string>model_line_list</string>
<string>append</string>
<string>$append0</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxPreviewColumnList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxPreviewColumnList.xml?rev=18337&r1=18336&r2=18337&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxPreviewColumnList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxPreviewColumnList.xml Fri Dec 14 18:42:00 2007
@@ -81,8 +81,15 @@
if not editable:\n
column_list.extend(not_editable_columns)\n
\n
-model = context.getSpecialiseValue()\n
-model_line_list = model.contentValues(portal_type=\'Pay Sheet Model Line\')\n
+def sortByIntIndex(a, b):\n
+ return cmp(a.getIntIndex(), b.getIntIndex())\n
+\n
+model = context.getSpecialiseValue(0)\n
+portal_type_list = [\'Pay Sheet Model Line\']\n
+sub_object_list = context.getSubObjectValueList(portal_type_list)\n
+sub_object_list.sort(sortByIntIndex)\n
+model_line_list = sub_object_list\n
+\n
model_line_list = [line for line in model_line_list if line.isEditable()]\n
\n
for model_line in model_line_list:\n
@@ -147,8 +154,11 @@
<string>column_list</string>
<string>not_editable_columns</string>
<string>_getattr_</string>
+ <string>sortByIntIndex</string>
<string>context</string>
<string>model</string>
+ <string>portal_type_list</string>
+ <string>sub_object_list</string>
<string>model_line_list</string>
<string>append</string>
<string>$append0</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml?rev=18337&r1=18336&r2=18337&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml Fri Dec 14 18:42:00 2007
@@ -83,7 +83,13 @@
\n
yearly_work_time = 0\n
for paysheet in paysheet_list:\n
- yearly_work_time += paysheet.getOvertimeAnnotationLineQuantity(0)\n
+ annotation_line = context.getAnnotationLineFromReference(\\\n
+ reference=\'overtime_small_rate\')\n
+ nb_heures_supp = annotation_line.getQuantity()\n
+ annotation_line = context.getAnnotationLineFromReference(\\\n
+ reference=\'overtime_big_rate\')\n
+ nb_heures_supp += annotation_line.getQuantity()\n
+ yearly_work_time += nb_heures_supp \n
\n
return yearly_work_time\n
</string> </value>
@@ -141,6 +147,8 @@
<string>yearly_work_time</string>
<string>_getiter_</string>
<string>paysheet</string>
+ <string>annotation_line</string>
+ <string>nb_heures_supp</string>
<string>_inplacevar_</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml?rev=18337&r1=18336&r2=18337&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml Fri Dec 14 18:42:00 2007
@@ -83,7 +83,10 @@
\n
yearly_work_time = 0\n
for paysheet in paysheet_list:\n
- yearly_work_time += paysheet.getWorkTimeAnnotationLineQuantity(0)\n
+ annotation_line = context.getAnnotationLineFromReference(\\\n
+ reference=\'work_time_annotation_line\')\n
+ nb_heures = annotation_line.getQuantity()\n
+ yearly_work_time += nb_heures\n
\n
return yearly_work_time\n
</string> </value>
@@ -141,6 +144,8 @@
<string>yearly_work_time</string>
<string>_getiter_</string>
<string>paysheet</string>
+ <string>annotation_line</string>
+ <string>nb_heures</string>
<string>_inplacevar_</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview.xml?rev=18337&r1=18336&r2=18337&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview.xml Fri Dec 14 18:42:00 2007
@@ -115,15 +115,14 @@
<string>listbox_employer_share_price</string>
<string>listbox_employee_share_quantity</string>
<string>listbox_employer_share_quantity</string>
+ <string>listbox_salary_range</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
- <list>
- <string>listbox_salary_range</string>
- </list>
+ <list/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=18337&r1=18336&r2=18337&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Fri Dec 14 18:42:00 2007
@@ -1,1 +1,1 @@
-189
+193
More information about the Erp5-report
mailing list