* make cancel work when looking a diff at installation

* fix naming convention


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

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_cancel.xml

@@ -79,18 +79,19 @@ request[ \'RESPONSE\' ].redirect( cancel_url )\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAgAAAAkAAAAFAAAAQwAA
-AHNCAAAAZAEAawAAbAEAfQMAbAIAfQQAAXQDAHQEAGQCAIMCAH0HAHQDAHQGAHwHAGQDAIMCAGQE
-AIMCAHwBAIMBAAFkAABTKAUAAABOKAIAAABzDwAAAFZhbGlkYXRpb25FcnJvcnMTAAAARm9ybVZh
-bGlkYXRpb25FcnJvcnMHAAAAUkVRVUVTVHMIAAAAUkVTUE9OU0VzCAAAAHJlZGlyZWN0KAgAAABz
-GgAAAFByb2R1Y3RzLkZvcm11bGF0b3IuRXJyb3Jzcw8AAABWYWxpZGF0aW9uRXJyb3JzEwAAAEZv
-cm1WYWxpZGF0aW9uRXJyb3JzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMHAAAAcmVxdWVzdHMJ
-AAAAX2dldGl0ZW1fcwoAAABjYW5jZWxfdXJsKAkAAABzBwAAAGZvcm1faWRzCgAAAGNhbmNlbF91
-cmxzGgAAAFByb2R1Y3RzLkZvcm11bGF0b3IuRXJyb3Jzcw8AAABWYWxpZGF0aW9uRXJyb3JzEwAA
-AEZvcm1WYWxpZGF0aW9uRXJyb3JzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMHAAAAcmVxdWVz
-dHMJAAAAX2dldGl0ZW1fKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwsAAABCYXNlX2Nh
-bmNlbAEAAABzBgAAAAAEEwIVAigBAAAAcwsAAABCYXNlX2NhbmNlbCgBAAAAcwsAAABCYXNlX2Nh
-bmNlbCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+            <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5zAAAAAGMCAAAACQAA
+AAUAAABDAAAAc0IAAABkAQBrAABsAQB9AwBsAgB9BAABdAMAdAQAZAIAgwIAfQcAdAMAdAYAfAcA
+ZAMAgwIAZAQAgwIAfAAAgwEAAWQAAFMoBQAAAE4oAgAAAHMPAAAAVmFsaWRhdGlvbkVycm9ycxMA
+AABGb3JtVmFsaWRhdGlvbkVycm9ycwcAAABSRVFVRVNUcwgAAABSRVNQT05TRXMIAAAAcmVkaXJl
+Y3QoCAAAAHMaAAAAUHJvZHVjdHMuRm9ybXVsYXRvci5FcnJvcnNzDwAAAFZhbGlkYXRpb25FcnJv
+cnMTAAAARm9ybVZhbGlkYXRpb25FcnJvcnMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwcAAABy
+ZXF1ZXN0cwkAAABfZ2V0aXRlbV9zCgAAAGNhbmNlbF91cmwoCQAAAHMKAAAAY2FuY2VsX3VybHMH
+AAAAZm9ybV9pZHMaAAAAUHJvZHVjdHMuRm9ybXVsYXRvci5FcnJvcnNzDwAAAFZhbGlkYXRpb25F
+cnJvcnMTAAAARm9ybVZhbGlkYXRpb25FcnJvcnMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwcA
+AAByZXF1ZXN0cwkAAABfZ2V0aXRlbV8oAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAA
+AEJhc2VfY2FuY2VsAQAAAHMGAAAAAAQTAhUCKAEAAABzCwAAAEJhc2VfY2FuY2VsKAEAAABzCwAA
+AEJhc2VfY2FuY2VsKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEA
+AABzAAAAAA==</string> </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
@@ -98,7 +99,7 @@ bmNlbCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</st
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>form_id,cancel_url</string> </value>
+            <value> <string>cancel_url, form_id=\'\'</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -124,13 +125,13 @@ bmNlbCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</st
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
-                            <string>form_id</string>
                             <string>cancel_url</string>
+                            <string>form_id</string>
                             <string>Products.Formulator.Errors</string>
                             <string>ValidationError</string>
                             <string>FormValidationError</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>request</string>
                             <string>_getitem_</string>
                           </tuple>
@@ -144,7 +145,9 @@ bmNlbCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</st
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <string></string>
+              </tuple>
             </value>
         </item>
         <item>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_installationChoice.xml

@@ -143,7 +143,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Validate installation</string> </value>
+            <value> <string>Validate Installation</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml

@@ -231,6 +231,7 @@ SELECT\n
   resource.title AS resource_title,\n
   resource.relative_url AS resource_relative_url,\n
   stock.variation_text AS variation_text,\n
+  stock.aggregate_text AS aggregate_text,\n
   stock.resource_uid AS resource_uid,\n
   stock.uid AS stock_uid,\n
   stock.date as date,\n
@@ -370,6 +371,7 @@ SELECT\n
   resource.title AS resource_title,\n
   resource.relative_url AS resource_relative_url,\n
   stock.variation_text AS variation_text,\n
+  stock.aggregate_text AS aggregate_text,\n
   stock.resource_uid AS resource_uid,\n
   stock.uid AS stock_uid,\n
   stock.date as date,\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject/listbox.xml

@@ -339,7 +339,7 @@
                       <list>
                         <tuple>
                           <string>url</string>
-                          <string>Url</string>
+                          <string>URL</string>
                         </tuple>
                       </list>
                     </value>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject/my_causality_business_template_id.xml

@@ -245,7 +245,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Business Template Id</string> </value>
+                    <value> <string>Business Template ID</string> </value>
                 </item>
                 <item>
                     <key> <string>truncate</string> </key>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject/my_id.xml

@@ -243,7 +243,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Id</string> </value>
+                    <value> <string>ID</string> </value>
                 </item>
                 <item>
                     <key> <string>truncate</string> </key>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashTool_viewTrashBinList/listbox.xml

@@ -351,7 +351,7 @@
                         </tuple>
                         <tuple>
                           <string>causality_id</string>
-                          <string>Business Template Id</string>
+                          <string>Business Template ID</string>
                         </tuple>
                       </list>
                     </value>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml

@@ -104,23 +104,23 @@ cwYAAABvYmplY3RzCQAAAGdldFBvcnRhbGMBAAAAAwAAAAMAAAADAAAAcxoAAAB0AACIAABkAQCD
 AgBkAgCIAAAWfAAAgwIAUygDAAAATnMDAAAAbG9nczAAAABQcmVmZXJlbmNlV29ya2Zsb3cuZGlz
 YWJsZU90aGVyUHJlZmVyZW5jZXMgb24gJXMoAwAAAHMJAAAAX2dldGF0dHJfcwQAAABwcmVmcwMA
 AABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBAAAAHByZWYoAQAAAHMEAAAAcHJlZigA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCgAAADxsYW1iZGEuNT4FAAAAcwAAAABzEgAAAHBvcnRh
-bF9wcmVmZXJlbmNlc3MMAAAAc2VhcmNoRm9sZGVycwQAAABzcGVjcw8AAABFUlA1IFByZWZlcmVu
-Y2VzCQAAAGdldE9iamVjdHMRAAAAcG9ydGFsX21lbWJlcnNoaXBzFgAAAGdldEF1dGhlbnRpY2F0
-ZWRNZW1iZXJzBwAAAGFsbG93ZWRzBQAAAE93bmVycwgAAABBc3NpZ25vcnMSAAAAZ2V0UHJlZmVy
-ZW5jZVN0YXRlcwcAAABlbmFibGVkcwsAAABnZXRQcmlvcml0eXMPAAAAcG9ydGFsX3dvcmtmbG93
-cwsAAABkb0FjdGlvbkZvcnMOAAAAZGlzYWJsZV9hY3Rpb25zBQAAAHdmX2lkcxMAAABwcmVmZXJl
-bmNlX3dvcmtmbG93cw4AAABEZWFjdGl2YXRlZCAlc3MMAAAAVW5hdXRob3JpemVkcx8AAABub3Qg
-YXV0aG9yaXplZCB0byBkZWFjdGl2YXRlICVzKAoAAABzHgAAAFByb2R1Y3RzLkRDV29ya2Zsb3cu
-RENXb3JrZmxvd3MQAAAAVmFsaWRhdGlvbkZhaWxlZHMJAAAAX2dldGF0dHJfcwMAAABzY2lzBAAA
-AHByZWZzBgAAAHBvcnRhbHMDAAAATE9HcwkAAABfZ2V0aXRlcl9zAQAAAHBzAQAAAGEoCgAAAHMD
-AAAAc2Npcx4AAABQcm9kdWN0cy5EQ1dvcmtmbG93LkRDV29ya2Zsb3dzEAAAAFZhbGlkYXRpb25G
-YWlsZWRzCQAAAF9nZXRhdHRyX3MEAAAAcHJlZnMGAAAAcG9ydGFscwMAAABMT0dzCQAAAF9nZXRp
-dGVyX3MBAAAAcHMBAAAAYSgAAAAAKAEAAABzBAAAAHByZWZzDwAAAFNjcmlwdCAoUHl0aG9uKXMX
-AAAAZGlzYWJsZU90aGVyUHJlZmVyZW5jZXMBAAAAcx4AAAANAg8BEgEMAysABgESAQwBKwEQARkB
-KAEfAxoBEAEoAQAAAHMXAAAAZGlzYWJsZU90aGVyUHJlZmVyZW5jZXMoAQAAAHMXAAAAZGlzYWJs
-ZU90aGVyUHJlZmVyZW5jZXMoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1
-bGU+AQAAAHMAAAAA</string> </value>
+AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAAADxsYW1iZGEuNDU+BQAAAHMAAAAAcxIAAABwb3J0
+YWxfcHJlZmVyZW5jZXNzDAAAAHNlYXJjaEZvbGRlcnMEAAAAc3BlY3MPAAAARVJQNSBQcmVmZXJl
+bmNlcwkAAABnZXRPYmplY3RzEQAAAHBvcnRhbF9tZW1iZXJzaGlwcxYAAABnZXRBdXRoZW50aWNh
+dGVkTWVtYmVycwcAAABhbGxvd2VkcwUAAABPd25lcnMIAAAAQXNzaWdub3JzEgAAAGdldFByZWZl
+cmVuY2VTdGF0ZXMHAAAAZW5hYmxlZHMLAAAAZ2V0UHJpb3JpdHlzDwAAAHBvcnRhbF93b3JrZmxv
+d3MLAAAAZG9BY3Rpb25Gb3JzDgAAAGRpc2FibGVfYWN0aW9ucwUAAAB3Zl9pZHMTAAAAcHJlZmVy
+ZW5jZV93b3JrZmxvd3MOAAAARGVhY3RpdmF0ZWQgJXNzDAAAAFVuYXV0aG9yaXplZHMfAAAAbm90
+IGF1dGhvcml6ZWQgdG8gZGVhY3RpdmF0ZSAlcygKAAAAcx4AAABQcm9kdWN0cy5EQ1dvcmtmbG93
+LkRDV29ya2Zsb3dzEAAAAFZhbGlkYXRpb25GYWlsZWRzCQAAAF9nZXRhdHRyX3MDAAAAc2NpcwQA
+AABwcmVmcwYAAABwb3J0YWxzAwAAAExPR3MJAAAAX2dldGl0ZXJfcwEAAABwcwEAAABhKAoAAABz
+AwAAAHNjaXMeAAAAUHJvZHVjdHMuRENXb3JrZmxvdy5EQ1dvcmtmbG93cxAAAABWYWxpZGF0aW9u
+RmFpbGVkcwkAAABfZ2V0YXR0cl9zBAAAAHByZWZzBgAAAHBvcnRhbHMDAAAATE9HcwkAAABfZ2V0
+aXRlcl9zAQAAAHBzAQAAAGEoAAAAACgBAAAAcwQAAABwcmVmcw8AAABTY3JpcHQgKFB5dGhvbilz
+FwAAAGRpc2FibGVPdGhlclByZWZlcmVuY2VzAQAAAHMeAAAADQIPARIBDAMrAAYBEgEMASsBEAEZ
+ASgBHwMaARABKAEAAABzFwAAAGRpc2FibGVPdGhlclByZWZlcmVuY2VzKAEAAABzFwAAAGRpc2Fi
+bGVPdGhlclByZWZlcmVuY2VzKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9k
+dWxlPgEAAABzAAAAAA==</string> </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>

product/ERP5/bootstrap/erp5_core/bt/change_log

+2005-12-14 aurel
+* fix naming convention
+* set default value of form_id in Base_cancel
+
 2005-12-13 aurel
 * Update way of install Business Template
 - add Trash type