[Erp5-report] r22948 - in /erp5/trunk/bt5/erp5_registry_ohada: PropertySheetTemplateItem/ S...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Aug 8 12:05:14 CEST 2008
Author: thibaut
Date: Fri Aug 8 12:05:12 2008
New Revision: 22948
URL: http://svn.erp5.org?rev=22948&view=rev
Log:
thibaut
update description on PropertySheet M2 (thxs Fabien)
Modify script PersonModule_getBestCandidateList. I use birth_place instead of start_date to make Complex query.
Modified:
erp5/trunk/bt5/erp5_registry_ohada/PropertySheetTemplateItem/M2.py
erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_getBestCandidateList.xml
erp5/trunk/bt5/erp5_registry_ohada/bt/revision
Modified: erp5/trunk/bt5/erp5_registry_ohada/PropertySheetTemplateItem/M2.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_registry_ohada/PropertySheetTemplateItem/M2.py?rev=22948&r1=22947&r2=22948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_registry_ohada/PropertySheetTemplateItem/M2.py (original)
+++ erp5/trunk/bt5/erp5_registry_ohada/PropertySheetTemplateItem/M2.py Fri Aug 8 12:05:12 2008
@@ -222,7 +222,7 @@
, 'mode' : 'w'
},
{ 'id' : 'eight_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -232,7 +232,7 @@
, 'mode' : 'w'
},
{ 'id' : 'fifth_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -257,7 +257,7 @@
, 'mode' : 'w'
},
{ 'id' : 'fifth_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -282,7 +282,7 @@
, 'mode' : 'w'
},
{ 'id' : 'fifth_auditor_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -312,7 +312,7 @@
, 'mode' : 'w'
},
{ 'id' : 'first_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -342,7 +342,7 @@
, 'mode' : 'w'
},
{ 'id' : 'first_associate_going_check'
- , 'description': 'going'
+ , 'description': 'Going'
, 'type' : 'boolean'
, 'mode' : 'w'
},
@@ -377,7 +377,7 @@
, 'mode' : 'w'
},
{ 'id' : 'first_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -407,7 +407,7 @@
, 'mode' : 'w'
},
{ 'id' : 'first_administrator_going_check'
- , 'description': 'going'
+ , 'description': 'Going'
, 'type' : 'boolean'
, 'mode' : 'w'
},
@@ -441,7 +441,7 @@
, 'mode' : 'w'
},
{ 'id' : 'fourth_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -486,12 +486,12 @@
, 'mode' : 'w'
},
{ 'id' : 'fourth_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
{ 'id' : 'fourth_auditor_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -617,7 +617,7 @@
, 'mode' : 'w'
},
{ 'id' : 'second_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -647,7 +647,7 @@
, 'mode' : 'w'
},
{ 'id' : 'second_associate_going_check'
- , 'description': 'going'
+ , 'description': 'Going'
, 'type' : 'boolean'
, 'mode' : 'w'
},
@@ -682,7 +682,7 @@
, 'mode' : 'w'
},
{ 'id' : 'second_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -712,7 +712,7 @@
, 'mode' : 'w'
},
{ 'id' : 'second_administrator_going_check'
- , 'description': 'going'
+ , 'description': 'Going'
, 'type' : 'boolean'
, 'mode' : 'w'
},
@@ -770,7 +770,7 @@
, 'mode' : 'w'
},
{ 'id' : 'seventh_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -796,7 +796,7 @@
, 'mode' : 'w'
},
{ 'id' : 'seventh_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -822,7 +822,7 @@
, 'mode' : 'w'
},
{ 'id' : 'seventh_auditor_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -848,7 +848,7 @@
, 'mode' : 'w'
},
{ 'id' : 'eighth_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -874,7 +874,7 @@
, 'mode' : 'w'
},
{ 'id' : 'eighth_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -900,7 +900,7 @@
, 'mode' : 'w'
},
{ 'id' : 'ninth_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -926,7 +926,7 @@
, 'mode' : 'w'
},
{ 'id' : 'ninth_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -952,7 +952,7 @@
, 'mode' : 'w'
},
{ 'id' : 'tenth_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -978,7 +978,7 @@
, 'mode' : 'w'
},
{ 'id' : 'tenth_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -1014,7 +1014,7 @@
, 'mode' : 'w'
},
{ 'id' : 'sixth_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -1039,7 +1039,7 @@
, 'mode' : 'w'
},
{ 'id' : 'sixth_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -1064,7 +1064,7 @@
, 'mode' : 'w'
},
{ 'id' : 'sixth_auditor_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -1109,14 +1109,14 @@
, 'mode' : 'w'
},
{ 'id' : 'third_associate_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
{ 'id' : 'third_administrator_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -1141,7 +1141,7 @@
, 'mode' : 'w'
},
{ 'id' : 'third_auditor_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -1166,7 +1166,7 @@
, 'mode' : 'w'
},
{ 'id' : 'first_auditor_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
@@ -1191,7 +1191,7 @@
, 'mode' : 'w'
},
{ 'id' : 'second_auditor_another_info'
- , 'description': 'Other Info'
+ , 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
Modified: erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_getBestCandidateList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_getBestCandidateList.xml?rev=22948&r1=22947&r2=22948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_getBestCandidateList.xml (original)
+++ erp5/trunk/bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_getBestCandidateList.xml Fri Aug 8 12:05:12 2008
@@ -133,7 +133,7 @@
Query(birthplace_city = person_birthplace),\n
operator = "AND"),\n
ComplexQuery(\n
- Query(start_date = person_start_date),\n
+ Query(birth_date = person_start_date),\n
Query(birthplace_city = person_birthplace),\n
operator = "AND"),\n
ComplexQuery(\n
@@ -185,7 +185,6 @@
candidate_birthplace_address_city)),candidate.getRelativeUrl()))\n
\n
# Append extra actions\n
-result.append((\'-\', \'_no_action\'))\n
result.append((\'New Person\', \'_action_create\'))\n
return result\n
</string> </value>
@@ -283,6 +282,12 @@
<value> <int>0</int> </value>
</item>
<item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
Modified: erp5/trunk/bt5/erp5_registry_ohada/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_registry_ohada/bt/revision?rev=22948&r1=22947&r2=22948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_registry_ohada/bt/revision (original)
+++ erp5/trunk/bt5/erp5_registry_ohada/bt/revision Fri Aug 8 12:05:12 2008
@@ -1,1 +1,1 @@
-861
+866
More information about the Erp5-report
mailing list