thibaut

field my_personal_address is not required
improve P0Constraint and P4Constraint
edit  the property stop date when an organisation stops definitely this activities.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22980 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_registry_ohada/PropertySheetTemplateItem/P0Constraint.py

@@ -45,6 +45,11 @@ class P0Constraint:
       'message_no_such_property': 'The first name address must be defined',
       'message_property_not_set': 'The first name address must be defined',
     },
+    { 'id'            : 'date',
+      'description'   : 'Property date must be definied',
+      'type'    : 'PropertyExistence',
+      'date'          : None,
+    },
     { 'id'            : 'miss_check_existence',
       'description'   : 'Property miss check must be definied',
       'type'          : 'PropertyExistence',
@@ -66,11 +71,6 @@ class P0Constraint:
       'condition'     : 'python: object.getMrsCheck() == None \
                             and object.getMissCheck() == None',
     },
-    { 'id'            : 'citizenship_existence',
-      'description'   : 'Property citizenship must be definied',
-      'type'          : 'PropertyExistence',
-      'citizenship'   : None, 
-    },
     { 'id'            : 'divorced_check_existence',
       'description'   : 'Property divorced check must be definied',
       'type'          : 'PropertyExistence',
@@ -103,16 +103,6 @@ class P0Constraint:
                                  object.getSingleCheck() == None and \
                                  object.getDivorcedCheck() == None',
     },
-    { 'id'            : 'head_office_address_existence',
-      'description'   : 'Property address must be definied',
-      'type'          : 'PropertyExistence',
-      'head_office_address'       : None, 
-    },
-    { 'id'            : 'main_activity_free_text_existence',
-      'description'   : 'Property main activity free text must be definied',
-      'type'          : 'PropertyExistence',
-      'main_activity_free_text'  : None, 
-    },
     { 'id'            : 'creation_check_existence',
       'description'   : 'Property creation check must be definied',
       'type'          : 'PropertyExistence',

bt5/erp5_registry_ohada/PropertySheetTemplateItem/P4Constraint.py

@@ -45,30 +45,15 @@ class P4Constraint:
       'message_no_such_property': 'The owner first name address must be defined',
       'message_property_not_set': 'The owner first name address must be defined',
     },
-    { 'id'            : 'owner_birthday_existence',
-      'description'   : 'Property owner birthday must be definied',
+    { 'id'            : 'corporate_registration_code',
+      'description'   : 'Property corporate registration code must be definied',
       'type'          : 'PropertyExistence',
-      'owner_birthday'       : None, 
+      'corporate_registration_code'  : None,
     },
-    { 'id'            : 'owner_birthplace_existence',
-      'description'   : 'Property owner_birthplace must be definied',
+    { 'id'            : 'date',
+      'description'   : 'Property date must be definied',
       'type'          : 'PropertyExistence',
-      'owner_birthplace'       : None, 
-    },
-    { 'id'            : 'owner_citizenship_existence',
-      'description'   : 'Property owner citizenship must be definied',
-      'type'          : 'PropertyExistence',
-      'owner_citizenship'  : None, 
-    },
-    { 'id'            : 'personal_address_existence',
-      'description'   : 'Property personal address must be definied',
-      'type'          : 'PropertyExistence',
-      'personal_address'          : None,
-    },
-    { 'id'            : 'enterprise_address_existence',
-      'description'   : 'Property enterprise address must be definied',
-      'type'          : 'PropertyExistence',
-      'enterprise_address'          : None,
+      'date'  : None,
     },
     { 'id'            : 'ask_to_change_check_existence',
       'description'   : 'Property ask_to_change_check must be definied',

bt5/erp5_registry_ohada/SkinTemplateItem/portal_skins/erp5_registry_ohada/P4_view/my_personal_address.xml

@@ -236,7 +236,7 @@
                 </item>
                 <item>
                     <key> <string>required</string> </key>
-                    <value> <string>1</string> </value>
+                    <value> <int>0</int> </value>
                 </item>
                 <item>
                     <key> <string>title</string> </key>

bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_form_validation_interaction_workflow/scripts/ceaseActivitiesFromP4.xml

@@ -81,8 +81,10 @@ request_eform.setTitle(request_eform.getOwnerFirstName()+\' \'+request_eform.get
 \n
 organisation_list = [organisation.getObject() for organisation in \\\n
      portal.organisation_module.searchFolder(corporate_registration_code=rccm)]\n
+context.log(organisation_list)\n
 for organisation in organisation_list:\n
   if request_eform.getDefinitiveCheck():\n
+    organisation.edit(stop_date = request_eform.getSecondDate())\n
     organisation.mettreEntrepriseEnCessation()\n
     organisation.liquiderEntreprise()\n
     organisation.radierEntreprise()\n
@@ -190,9 +192,9 @@ for history in history_list:\n
                             <string>_getiter_</string>
                             <string>organisation</string>
                             <string>organisation_list</string>
+                            <string>context</string>
                             <string>attachLocationYearInfo</string>
                             <string>new_registry_number</string>
-                            <string>context</string>
                             <string>history_list</string>
                             <string>history</string>
                           </tuple>

bt5/erp5_registry_ohada/bt/revision

-885
+888
\ No newline at end of file