Skip to content

erp5
erp5
Commit cc1522e4 authored by Thibaut Deheunynck's avatar Thibaut Deheunynck
Browse files
Options

thibaut 

update description on PropertySheet M2 (thxs Fabien)
Modify script PersonModule_getBestCandidateList. I use birth_place instead of start_date to make Complex query.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22948 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2854b1c1
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 35 deletions
bt5/erp5_registry_ohada/PropertySheetTemplateItem/M2.py
View file @ cc1522e4
......@@ -222,7 +222,7 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, 'mode' : 'w'
},
{ 'id' : 'first_associate_going_check'
, 'description': 'going'
, 'description': 'Going'
, 'type' : 'boolean'
, 'mode' : 'w'
},
......@@ -377,7 +377,7 @@ class M2:
, '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 @@ class M2:
, 'mode' : 'w'
},
{ 'id' : 'first_administrator_going_check'
, 'description': 'going'
, 'description': 'Going'
, 'type' : 'boolean'
, 'mode' : 'w'
},
......@@ -441,7 +441,7 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, 'mode' : 'w'
},
{ 'id' : 'second_associate_going_check'
, 'description': 'going'
, 'description': 'Going'
, 'type' : 'boolean'
, 'mode' : 'w'
},
......@@ -682,7 +682,7 @@ class M2:
, '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 @@ class M2:
, 'mode' : 'w'
},
{ 'id' : 'second_administrator_going_check'
, 'description': 'going'
, 'description': 'Going'
, 'type' : 'boolean'
, 'mode' : 'w'
},
......@@ -770,7 +770,7 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, '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 @@ class M2:
, 'mode' : 'w'
},
{ 'id' : 'second_auditor_another_info'
, 'description': 'Other Info'
, 'description': 'Other Info (date and place wedding, marital status ...)'
, 'type' : 'string'
, 'mode' : 'w'
},
......
bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/PersonModule_getBestCandidateList.xml
View file @ cc1522e4
......@@ -133,7 +133,7 @@ else:\n
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 @@ for candidate in candidate_list:\n
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>
......@@ -282,6 +281,12 @@ return result\n
<key> <string>isIndexable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>uid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
......
bt5/erp5_registry_ohada/bt/revision
View file @ cc1522e4
861
\ No newline at end of file
866
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7