diff --git a/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/currency_module.xml b/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/currency_module.xml index 195d08f13334c11957705260a25f8d685a5b1e10..0373f974b7c8de18d2e9c78f2ecbd46493a8cd97 100755 --- a/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/currency_module.xml +++ b/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/currency_module.xml @@ -85,6 +85,9 @@ <permission> <name>Add ERP5 Forms</name> </permission> + <permission> + <name>Add ERP5 OOo Templates</name> + </permission> <permission> <name>Add ERP5 PDF Forms</name> </permission> diff --git a/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/organisation_module.xml b/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/organisation_module.xml index 9d4e4e96a67c5061bffcf070c8f18ff7c425bc2b..fba5c0de194cda55c0659a16d093e89e340d90a7 100755 --- a/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/organisation_module.xml +++ b/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/organisation_module.xml @@ -131,6 +131,9 @@ <name>Add ERP5 Forms</name> <role>Manager</role> </permission> + <permission> + <name>Add ERP5 OOo Templates</name> + </permission> <permission> <name>Add ERP5 PDF Forms</name> </permission> diff --git a/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/person_module.xml b/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/person_module.xml index 8054cf8753d8ac4f5e9ca92815c55487ae38013a..b423dae9e952bf6e2240586d009375f82827a18f 100755 --- a/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/person_module.xml +++ b/product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/person_module.xml @@ -131,6 +131,9 @@ <name>Add ERP5 Forms</name> <role>Manager</role> </permission> + <permission> + <name>Add ERP5 OOo Templates</name> + </permission> <permission> <name>Add ERP5 PDF Forms</name> </permission> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseCategory_view/my_category_type_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseCategory_view/my_category_type_list.xml index 8de4569d9be8e5137e44db29831c26ce548fa69a..40b985934b0a6e7af90e5e9b5dae8e95b8eee3ca 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseCategory_view/my_category_type_list.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseCategory_view/my_category_type_list.xml @@ -257,6 +257,10 @@ <string>variation</string> <string>variation</string> </tuple> + <tuple> + <string>sub_variation</string> + <string>sub_variation</string> + </tuple> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_view.xml index ac4884e9c0041f86bd9850017bbdec8162e6ab9d..d7f7f0b2f4a3adf7276b3014c63d7c0badf54b9f 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_view.xml @@ -108,9 +108,10 @@ <string>my_building_state</string> <string>my_installation_state</string> <string>my_description</string> - <string>my_change_log</string> <string>my_dependency_list</string> + <string>my_change_log</string> <string>my_license</string> + <string>my_copyright_list</string> </list> </value> </item> @@ -123,7 +124,6 @@ <string>my_template_module_id_list</string> <string>my_template_base_category_list</string> <string>my_template_workflow_id_list</string> - <string>my_copyright_list</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml index 722d893a4a4a09bb92ceadc69549f769b9afb3f0..a8c4e3f68fa0e4b6b09260582b85a0e481a20ec1 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml @@ -67,56 +67,56 @@ <item> <key> <string>_body</string> </key> <value> <string>print "#### Indexing translations ####"\n -context.ERP5Site_updateTranslationTable()\n +context.ERP5Site_updateTranslationTable(sql_catalog_id=sql_catalog_id)\n \n print "#### Indexing categories ####"\n -context.portal_categories.reindexObject(tag=\'module\')\n +context.portal_categories.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n for o in list(context.portal_categories.objectValues()):\n - o.recursiveReindexObject(after_tag=\'module\',tag=\'category\')\n + o.recursiveReindexObject(after_tag=\'module\',tag=\'category\', sql_catalog_id=sql_catalog_id)\n \n print "#### Indexing preferences ####"\n -context.portal_preferences.reindexObject(tag=\'module\')\n +context.portal_preferences.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n for o in list(context.portal_preferences.objectValues(tag=\'module\')):\n - o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2)\n + o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n \n # We index simulation first to make sure we can calculate tests (ie. related quantity)\n print "#### Indexing simulation ####"\n -context.portal_simulation.reindexObject(tag=\'module\')\n +context.portal_simulation.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n for o in list(context.portal_simulation.objectValues()):\n - o.recursiveReindexObject(after_tag=(\'module\',\'category\',\'document\'),tag=\'simulation\',priority=3)\n + o.recursiveReindexObject(after_tag=(\'module\',\'category\',\'document\'),tag=\'simulation\',priority=3, sql_catalog_id=sql_catalog_id)\n \n # We index templates secondly\n print "#### Indexing templates ####"\n -context.portal_templates.reindexObject(tag=\'module\')\n +context.portal_templates.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n for o in list(context.portal_templates.objectValues()):\n - o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2)\n + o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n \n # Next we index applied rules\n print "#### Indexing applied rules ####"\n -context.portal_rules.reindexObject(tag=\'module\')\n +context.portal_rules.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n for o in list(context.portal_rules.objectValues()):\n - o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2)\n + o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n \n # Next we index delivery builders\n print "#### Indexing delivery builders ####"\n -context.portal_deliveries.reindexObject(tag=\'module\')\n +context.portal_deliveries.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n for o in list(context.portal_deliveries.objectValues()):\n - o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2)\n + o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n \n # Next we index order builders\n print "#### Indexing order builders ####"\n -context.portal_orders.reindexObject(tag=\'module\')\n +context.portal_orders.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n for o in list(context.portal_orders.objectValues()):\n - o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2)\n + o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n \n # Then we index everything except inventories\n for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",)):\n print "#### Indexing contents inside folder %s ####" % folder.id\n if folder.getId() not in (\'inventory_module\',):\n - folder.reindexObject(tag=\'module\')\n + folder.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n for o in list(folder.objectValues()):\n try:\n - o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2)\n + o.recursiveReindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id)\n except:\n #raise RuntimeError, o.getRelativeUrl()\n raise\n @@ -126,71 +126,74 @@ for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",) for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",)):\n if folder.getId() in (\'inventory_module\',):\n print "#### Indexing contents inside folder %s ####" % folder.id\n - folder.reindexObject(tag=\'module\')\n + folder.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id)\n for o in list(folder.objectValues()):\n - o.recursiveReindexObject(after_tag=(\'module\',\'document\',\'category\'),tag=\'inventory\',priority=2)\n + o.recursiveReindexObject(after_tag=(\'module\',\'document\',\'category\'),tag=\'inventory\',priority=2, sql_catalog_id=sql_catalog_id)\n \n # start activty from simulation because the erp5site is not an active object\n -context.portal_simulation.activate(after_tag=(\'inventory\',\'simulation\'),priority=3).InventoryModule_reindexMovementList()\n +context.portal_simulation.activate(after_tag=(\'inventory\',\'simulation\'),priority=3).InventoryModule_reindexMovementList(sql_catalog_id=sql_catalog_id)\n \n return printed\n </string> </value> </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAoAAABfAAAAQwAA -AHPuBQAAdAAAgwAAfQEAfAEABGQBAAJJSnQCAHQDAGQCAIMCAIMAAAF8AQAEZAMAAklKdAIAdAIA -dAMAZAQAgwIAZAUAgwIAZAYAZAcAgwABAXhLAHQEAHQFAHQCAHQCAHQDAGQEAIMCAGQIAIMCAIMA -AIMBAIMBAERdIgB9BgB0AgB8BgBkCQCDAgBkCgBkBwBkBgBkCwCDAAIBcXQAV3wBAARkDAACSUp0 -AgB0AgB0AwBkDQCDAgBkBQCDAgBkBgBkBwCDAAEBeF0AdAQAdAUAdAIAdAIAdAMAZA0AgwIAZAgA -gwIAZAYAZAcAgwABgwEAgwEARF0uAH0GAHQCAHwGAGQJAIMCAGQKAGQHAGQLAGYCAGQGAGQOAGQP -AGQQAIMAAwFx8QBXfAEABGQRAAJJSnQCAHQCAHQDAGQSAIMCAGQFAIMCAGQGAGQHAIMAAQF4WgB0 -BAB0BQB0AgB0AgB0AwBkEgCDAgBkCACDAgCDAACDAQCDAQBEXTEAfQYAdAIAfAYAZAkAgwIAZAoA -ZAcAZAsAZA4AZgMAZAYAZBMAZA8AZBQAgwADAXF0AVd8AQAEZBUAAklKdAIAdAIAdAMAZBYAgwIA -ZAUAgwIAZAYAZAcAgwABAXhXAHQEAHQFAHQCAHQCAHQDAGQWAIMCAGQIAIMCAIMAAIMBAIMBAERd -LgB9BgB0AgB8BgBkBQCDAgBkCgBkBwBkCwBmAgBkBgBkDgBkDwBkEACDAAMBcfoBV3wBAARkFwAC -SUp0AgB0AgB0AwBkGACDAgBkBQCDAgBkBgBkBwCDAAEBeFcAdAQAdAUAdAIAdAIAdAMAZBgAgwIA -ZAgAgwIAgwAAgwEAgwEARF0uAH0GAHQCAHwGAGQJAIMCAGQKAGQHAGQLAGYCAGQGAGQOAGQPAGQQ -AIMAAwFxfQJXfAEABGQZAAJJSnQCAHQCAHQDAGQaAIMCAGQFAIMCAGQGAGQHAIMAAQF4VwB0BAB0 -BQB0AgB0AgB0AwBkGgCDAgBkCACDAgCDAACDAQCDAQBEXS4AfQYAdAIAfAYAZAUAgwIAZAoAZAcA -ZAsAZgIAZAYAZA4AZA8AZBAAgwADAXEAA1d8AQAEZBsAAklKdAIAdAIAdAMAZBwAgwIAZAUAgwIA -ZAYAZAcAgwABAXhXAHQEAHQFAHQCAHQCAHQDAGQcAIMCAGQIAIMCAIMAAIMBAIMBAERdLgB9BgB0 -AgB8BgBkBQCDAgBkCgBkBwBkCwBmAgBkBgBkDgBkDwBkEACDAAMBcYMDV3gVAXQEAHQCAHQCAHQC -AHQDAGQdAIMCAGQeAIMCAIMAAGQIAIMCAGQfAGYBAIMBAIMBAERd4AB9BwB8AQAEZCAAdAIAfAcA -ZCEAgwIAFgJJSnQCAHwHAGQiAIMCAIMAAGQjAGYBAGoHAG+nAAF0AgB8BwBkBQCDAgBkBgBkBwCD -AAEBeI4AdAQAdAUAdAIAfAcAZAgAgwIAgwAAgwEAgwEARF1qAH0GAHksAHQCAHwGAGQJAIMCAGQK -AGQHAGQLAGYCAGQGAGQOAGQPAGQQAIMAAwFXcVcEAQEBggAAdAgAZCQAdAkAdAIAfAcAZCIAgwIA -gwAAgwEAdAkAfAYAgwEAZgIAFoICAHFXBFhxVwRXcekDAXHpA1d43AB0BAB0AgB0AgB0AgB0AwBk -HQCDAgBkHgCDAgCDAABkCACDAgBkHwBmAQCDAQCDAQBEXacAfQcAdAIAfAcAZCIAgwIAgwAAZCMA -ZgEAagYAb4UAAXwBAARkIAB0AgB8BwBkIQCDAgAWAklKdAIAfAcAZAUAgwIAZAYAZAcAgwABAXhV -AHQEAHQFAHQCAHwHAGQIAIMCAIMAAIMBAIMBAERdMQB9BgB0AgB8BgBkCQCDAgBkCgBkBwBkDgBk -CwBmAwBkBgBkJQBkDwBkEACDAAMBcW8FV3EBBQFxAQVXdAIAdAIAdAIAdAMAZBIAgwIAZCYAgwIA -ZAoAZCUAZBMAZgIAZA8AZBQAgwACZCcAgwIAgwAAAXwBAIMAAFNkAABTKCgAAABOcx8AAAAjIyMj -IEluZGV4aW5nIHRyYW5zbGF0aW9ucyAjIyMjcx8AAABFUlA1U2l0ZV91cGRhdGVUcmFuc2xhdGlv -blRhYmxlcx0AAAAjIyMjIEluZGV4aW5nIGNhdGVnb3JpZXMgIyMjI3MRAAAAcG9ydGFsX2NhdGVn -b3JpZXNzDQAAAHJlaW5kZXhPYmplY3RzAwAAAHRhZ3MGAAAAbW9kdWxlcwwAAABvYmplY3RWYWx1 -ZXNzFgAAAHJlY3Vyc2l2ZVJlaW5kZXhPYmplY3RzCQAAAGFmdGVyX3RhZ3MIAAAAY2F0ZWdvcnlz -HgAAACMjIyMgSW5kZXhpbmcgcHJlZmVyZW5jZXMgIyMjI3MSAAAAcG9ydGFsX3ByZWZlcmVuY2Vz -cwgAAABkb2N1bWVudHMIAAAAcHJpb3JpdHlpAgAAAHMdAAAAIyMjIyBJbmRleGluZyBzaW11bGF0 -aW9uICMjIyNzEQAAAHBvcnRhbF9zaW11bGF0aW9ucwoAAABzaW11bGF0aW9uaQMAAABzHAAAACMj -IyMgSW5kZXhpbmcgdGVtcGxhdGVzICMjIyNzEAAAAHBvcnRhbF90ZW1wbGF0ZXNzIAAAACMjIyMg -SW5kZXhpbmcgYXBwbGllZCBydWxlcyAjIyMjcwwAAABwb3J0YWxfcnVsZXNzJAAAACMjIyMgSW5k -ZXhpbmcgZGVsaXZlcnkgYnVpbGRlcnMgIyMjI3MRAAAAcG9ydGFsX2RlbGl2ZXJpZXNzIQAAACMj -IyMgSW5kZXhpbmcgb3JkZXIgYnVpbGRlcnMgIyMjI3MNAAAAcG9ydGFsX29yZGVyc3MKAAAAcG9y -dGFsX3VybHMPAAAAZ2V0UG9ydGFsT2JqZWN0cwsAAABFUlA1IEZvbGRlcnMsAAAAIyMjIyBJbmRl -eGluZyBjb250ZW50cyBpbnNpZGUgZm9sZGVyICVzICMjIyNzAgAAAGlkcwUAAABnZXRJZHMQAAAA -aW52ZW50b3J5X21vZHVsZXMWAAAAZXJyb3I6IGZvbGRlcj0lcywgbz0lc3MJAAAAaW52ZW50b3J5 -cwgAAABhY3RpdmF0ZXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3ZlbWVudExpc3QoCgAA -AHMHAAAAX3ByaW50X3MGAAAAX3ByaW50cwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzCQAAAF9n -ZXRpdGVyX3MEAAAAbGlzdHMBAAAAb3MGAAAAZm9sZGVycwwAAABSdW50aW1lRXJyb3JzBAAAAHJl -cHIoCgAAAHMHAAAAX3ByaW50X3MGAAAAX3ByaW50cwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRz -CQAAAF9nZXRpdGVyX3MEAAAAbGlzdHMBAAAAb3MGAAAAZm9sZGVycwwAAABSdW50aW1lRXJyb3Jz -BAAAAHJlcHIoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzEwAAAEVSUDVTaXRlX3JlaW5k -ZXhBbGwBAAAAc3IAAAAWAQ0CEAEZASgACQEdAhABGQEuAAkBKQMQARkBKAAJASwDEAEZASgACQEp -AxABGQEoAAkBKQMQARkBKAAJASkDEAEZASgACQEpAzQABgEXAR8BEwEfAAYBBgEsAwMBOwM0AAYB -HAEaARMBHwAJAT0DLgIoAQAAAHMTAAAARVJQNVNpdGVfcmVpbmRleEFsbCgBAAAAcxMAAABFUlA1 -U2l0ZV9yZWluZGV4QWxsKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxl -PgEAAABzAAAAAA==</string> </value> + <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGUAAGQBAIQBAFoBAGQAAFMoAgAAAE5jAQAAAAsAAABhAAAA +QwAAAHNmBgAAdAAAgwAAfQIAfAIABGQBAAJJSnQCAHQDAGQCAIMCAGQDAHwAAIMAAQF8AgAEZAQA +AklKdAIAdAIAdAMAZAUAgwIAZAYAgwIAZAcAZAgAZAMAfAAAgwACAXhRAHQFAHQGAHQCAHQCAHQD +AGQFAIMCAGQJAIMCAIMAAIMBAIMBAERdKAB9BwB0AgB8BwBkCgCDAgBkCwBkCABkBwBkDABkAwB8 +AACDAAMBcYAAV3wCAARkDQACSUp0AgB0AgB0AwBkDgCDAgBkBgCDAgBkBwBkCABkAwB8AACDAAIB +eGMAdAUAdAYAdAIAdAIAdAMAZA4AgwIAZAkAgwIAZAcAZAgAgwABgwEAgwEARF00AH0HAHQCAHwH +AGQKAIMCAGQLAGQIAGQMAGYCAGQHAGQPAGQQAGQRAGQDAHwAAIMABAFxCQFXfAIABGQSAAJJSnQC +AHQCAHQDAGQTAIMCAGQGAIMCAGQHAGQIAGQDAHwAAIMAAgF4YAB0BQB0BgB0AgB0AgB0AwBkEwCD +AgBkCQCDAgCDAACDAQCDAQBEXTcAfQcAdAIAfAcAZAoAgwIAZAsAZAgAZAwAZA8AZgMAZAcAZBQA +ZBAAZBUAZAMAfAAAgwAEAXGYAVd8AgAEZBYAAklKdAIAdAIAdAMAZBcAgwIAZAYAgwIAZAcAZAgA +ZAMAfAAAgwACAXhdAHQFAHQGAHQCAHQCAHQDAGQXAIMCAGQJAIMCAIMAAIMBAIMBAERdNAB9BwB0 +AgB8BwBkBgCDAgBkCwBkCABkDABmAgBkBwBkDwBkEABkEQBkAwB8AACDAAQBcSoCV3wCAARkGAAC +SUp0AgB0AgB0AwBkGQCDAgBkBgCDAgBkBwBkCABkAwB8AACDAAIBeF0AdAUAdAYAdAIAdAIAdAMA +ZBkAgwIAZAkAgwIAgwAAgwEAgwEARF00AH0HAHQCAHwHAGQKAIMCAGQLAGQIAGQMAGYCAGQHAGQP +AGQQAGQRAGQDAHwAAIMABAFxuQJXfAIABGQaAAJJSnQCAHQCAHQDAGQbAIMCAGQGAIMCAGQHAGQI +AGQDAHwAAIMAAgF4XQB0BQB0BgB0AgB0AgB0AwBkGwCDAgBkCQCDAgCDAACDAQCDAQBEXTQAfQcA +dAIAfAcAZAYAgwIAZAsAZAgAZAwAZgIAZAcAZA8AZBAAZBEAZAMAfAAAgwAEAXFIA1d8AgAEZBwA +AklKdAIAdAIAdAMAZB0AgwIAZAYAgwIAZAcAZAgAZAMAfAAAgwACAXhdAHQFAHQGAHQCAHQCAHQD +AGQdAIMCAGQJAIMCAIMAAIMBAIMBAERdNAB9BwB0AgB8BwBkBgCDAgBkCwBkCABkDABmAgBkBwBk +DwBkEABkEQBkAwB8AACDAAQBcdcDV3ghAXQFAHQCAHQCAHQCAHQDAGQeAIMCAGQfAIMCAIMAAGQJ +AIMCAGQgAGYBAIMBAIMBAERd7AB9CAB8AgAEZCEAdAIAfAgAZCIAgwIAFgJJSnQCAHwIAGQjAIMC +AIMAAGQkAGYBAGoHAG+zAAF0AgB8CABkBgCDAgBkBwBkCABkAwB8AACDAAIBeJQAdAUAdAYAdAIA +fAgAZAkAgwIAgwAAgwEAgwEARF1wAH0HAHkyAHQCAHwHAGQKAIMCAGQLAGQIAGQMAGYCAGQHAGQP +AGQQAGQRAGQDAHwAAIMABAFXcbcEAQEBggAAdAkAZCUAdAoAdAIAfAgAZCMAgwIAgwAAgwEAdAoA +fAcAgwEAZgIAFoICAHG3BFhxtwRXcUMEAXFDBFd46AB0BQB0AgB0AgB0AgB0AwBkHgCDAgBkHwCD +AgCDAABkCQCDAgBkIABmAQCDAQCDAQBEXbMAfQgAdAIAfAgAZCMAgwIAgwAAZCQAZgEAagYAb5EA +AXwCAARkIQB0AgB8CABkIgCDAgAWAklKdAIAfAgAZAYAgwIAZAcAZAgAZAMAfAAAgwACAXhbAHQF +AHQGAHQCAHwIAGQJAIMCAIMAAIMBAIMBAERdNwB9BwB0AgB8BwBkCgCDAgBkCwBkCABkDwBkDABm +AwBkBwBkJgBkEABkEQBkAwB8AACDAAQBcdsFV3FnBQFxZwVXdAIAdAIAdAIAdAMAZBMAgwIAZCcA +gwIAZAsAZCYAZBQAZgIAZBAAZBUAgwACZCgAgwIAZAMAfAAAgwABAXwCAIMAAFNkAABTKCkAAABO +cx8AAAAjIyMjIEluZGV4aW5nIHRyYW5zbGF0aW9ucyAjIyMjcx8AAABFUlA1U2l0ZV91cGRhdGVU +cmFuc2xhdGlvblRhYmxlcw4AAABzcWxfY2F0YWxvZ19pZHMdAAAAIyMjIyBJbmRleGluZyBjYXRl +Z29yaWVzICMjIyNzEQAAAHBvcnRhbF9jYXRlZ29yaWVzcw0AAAByZWluZGV4T2JqZWN0cwMAAAB0 +YWdzBgAAAG1vZHVsZXMMAAAAb2JqZWN0VmFsdWVzcxYAAAByZWN1cnNpdmVSZWluZGV4T2JqZWN0 +cwkAAABhZnRlcl90YWdzCAAAAGNhdGVnb3J5cx4AAAAjIyMjIEluZGV4aW5nIHByZWZlcmVuY2Vz +ICMjIyNzEgAAAHBvcnRhbF9wcmVmZXJlbmNlc3MIAAAAZG9jdW1lbnRzCAAAAHByaW9yaXR5aQIA +AABzHQAAACMjIyMgSW5kZXhpbmcgc2ltdWxhdGlvbiAjIyMjcxEAAABwb3J0YWxfc2ltdWxhdGlv +bnMKAAAAc2ltdWxhdGlvbmkDAAAAcxwAAAAjIyMjIEluZGV4aW5nIHRlbXBsYXRlcyAjIyMjcxAA +AABwb3J0YWxfdGVtcGxhdGVzcyAAAAAjIyMjIEluZGV4aW5nIGFwcGxpZWQgcnVsZXMgIyMjI3MM +AAAAcG9ydGFsX3J1bGVzcyQAAAAjIyMjIEluZGV4aW5nIGRlbGl2ZXJ5IGJ1aWxkZXJzICMjIyNz +EQAAAHBvcnRhbF9kZWxpdmVyaWVzcyEAAAAjIyMjIEluZGV4aW5nIG9yZGVyIGJ1aWxkZXJzICMj +IyNzDQAAAHBvcnRhbF9vcmRlcnNzCgAAAHBvcnRhbF91cmxzDwAAAGdldFBvcnRhbE9iamVjdHML +AAAARVJQNSBGb2xkZXJzLAAAACMjIyMgSW5kZXhpbmcgY29udGVudHMgaW5zaWRlIGZvbGRlciAl +cyAjIyMjcwIAAABpZHMFAAAAZ2V0SWRzEAAAAGludmVudG9yeV9tb2R1bGVzFgAAAGVycm9yOiBm +b2xkZXI9JXMsIG89JXNzCQAAAGludmVudG9yeXMIAAAAYWN0aXZhdGVzIwAAAEludmVudG9yeU1v +ZHVsZV9yZWluZGV4TW92ZW1lbnRMaXN0KAsAAABzBwAAAF9wcmludF9zBgAAAF9wcmludHMJAAAA +X2dldGF0dHJfcwcAAABjb250ZXh0cw4AAABzcWxfY2F0YWxvZ19pZHMJAAAAX2dldGl0ZXJfcwQA +AABsaXN0cwEAAABvcwYAAABmb2xkZXJzDAAAAFJ1bnRpbWVFcnJvcnMEAAAAcmVwcigLAAAAcw4A +AABzcWxfY2F0YWxvZ19pZHMHAAAAX3ByaW50X3MGAAAAX3ByaW50cwkAAABfZ2V0YXR0cl9zBwAA +AGNvbnRleHRzCQAAAF9nZXRpdGVyX3MEAAAAbGlzdHMBAAAAb3MGAAAAZm9sZGVycwwAAABSdW50 +aW1lRXJyb3JzBAAAAHJlcHIoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzEwAAAEVSUDVT +aXRlX3JlaW5kZXhBbGwBAAAAc3IAAAAWARMCEAEfASgACQEjAhABHwEuAAkBLwMQAR8BKAAJATID +EAEfASgACQEvAxABHwEoAAkBLwMQAR8BKAAJAS8DEAEfASgACQEvAzQABgEXAR8BGQEfAAYBBgEy +AwMBOwM0AAYBHAEaARkBHwAJAUMDNAIoAgAAAHMEAAAATm9uZXMTAAAARVJQNVNpdGVfcmVpbmRl +eEFsbCgCAAAAcwQAAABOb25lcxMAAABFUlA1U2l0ZV9yZWluZGV4QWxsKAAAAAAoAAAAAHMPAAAA +U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -198,7 +201,7 @@ PgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string></string> </value> + <value> <string>sql_catalog_id=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -218,12 +221,13 @@ PgEAAABzAAAAAA==</string> </value> <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>sql_catalog_id</string> <string>_print_</string> <string>_print</string> <string>_getattr_</string> @@ -245,7 +249,9 @@ PgEAAABzAAAAAA==</string> </value> <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <none/> + </tuple> </value> </item> <item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.xml index 34bf89798f8d14f6092ed44db46737e879750f44..eec329e228553f53b2b305dfe9fa1c285798651d 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_updateTranslationTable.xml @@ -66,13 +66,18 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>supported_languages = context.Localizer.get_supported_languages()\n + <value> <string>from Products.ERP5Type.Document import newTempBase\n +\n +supported_languages = context.Localizer.get_supported_languages()\n translated_keys = {} # This dict prevents entering the same key twice\n \n -context.Translation_delete()\n +context.portal_catalog.deleteTranslationList(sql_catalog_id=sql_catalog_id)\n +\n +i = 0\n \n # Translate every workflow state in the context of the state variable\n for wf in context.portal_workflow.objectValues():\n + object_list = []\n state_var = wf.variables.getStateVar()\n if wf.states:\n for state_id, state in wf.states.items():\n @@ -80,9 +85,12 @@ for wf in context.portal_workflow.objectValues():\n key = (lang, state_var, state_id)\n if not translated_keys.has_key(key):\n translated_keys[key] = None # mark as translated\n - context.Translation_addMessage(language=lang, message_context=state_var,\n - original_message = state_id,\n - translated_message = context.translation_service.translate(\'ui\', state_id, target_language=lang).encode(\'utf-8\'))\n + obj = newTempBase(context, \'temp_translation_%d\' % i, \n + language=lang, message_context=state_var, original_message=state_id,\n + translated_message = context.translation_service.translate(\'ui\', state_id, target_language=lang).encode(\'utf-8\'))\n + obj.setUid(\'temp_%d\' % i)\n + i += 1\n + object_list.append(obj)\n \n # translate state title as well\n if state.title != \'\' :\n @@ -90,21 +98,36 @@ for wf in context.portal_workflow.objectValues():\n translated_message = context.translation_service.translate(\'ui\', state.title, target_language=lang).encode(\'utf-8\')\n key = (lang, state_var_title, translated_message)\n if not translated_keys.has_key(key):\n - translated_keys[key] = None # mark as translated\n - context.Translation_addMessage(language=lang, message_context=state_var_title,\n - original_message = state_id, translated_message = translated_message )\n -\n + translated_keys[key] = None # mark as translated\n + obj = newTempBase(context, \'temp_translation_%d\' % i,\n + language=lang, message_context=state_var_title,\n + original_message = state_id, translated_message = translated_message )\n + obj.setUid(\'temp_%d\' % i)\n + i += 1\n + object_list.append(obj)\n + \n + if object_list:\n + context.portal_catalog.catalogTranslationList(object_list, sql_catalog_id=sql_catalog_id)\n + \n # Translate every portal type in the context of the portal type \n for ptype in context.portal_types.objectValues():\n title = ptype.title\n if not title: title = ptype.id\n + object_list = []\n for lang in supported_languages:\n key = (lang, \'portal_type\', title)\n if not translated_keys.has_key(key):\n translated_keys[key] = None # mark as translated\n - context.Translation_addMessage(language=lang, message_context="portal_type",\n - original_message = title,\n - translated_message = context.translation_service.translate(\'ui\', title, target_language=lang).encode(\'utf-8\'))\n + obj = newTempBase(context, \'temp_translation_%d\' % i,\n + language=lang, message_context="portal_type",\n + original_message = title,\n + translated_message = context.translation_service.translate(\'ui\', title, target_language=lang).encode(\'utf-8\'))\n + obj.setUid(\'temp_%d\' % i)\n + i += 1\n + object_list.append(obj)\n + \n + if object_list:\n + context.portal_catalog.catalogTranslationList(object_list, sql_catalog_id=sql_catalog_id)\n \n print \'Done\'\n return printed\n @@ -112,44 +135,56 @@ return printed\n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAABMAAAAiAAAAQwAA -AHNQAwAAdAAAgwAAfQEAdAIAdAIAdAMAZAEAgwIAZAIAgwIAgwAAfQQAaAAAfQUAdAIAdAMAZAMA -gwIAgwAAAXj/AXQGAHQCAHQCAHQDAGQEAIMCAGQFAIMCAIMAAIMBAERd3AF9BwB0AgB0AgB8BwBk -BgCDAgBkBwCDAgCDAAB9CAB0AgB8BwBkCACDAgBvqwEBeKgBdAYAdAIAdAIAfAcAZAgAgwIAZAkA -gwIAgwAAgwEARF2BAXQGAAKDAQBcAgB9CQB9CgB4awF0BgB8BACDAQBEXV0BfQsAfAsAfAgAfAkA -ZgMAfQwAdAIAfAUAZAoAgwIAfAwAgwEADG9sAAF0DQB0DgB8BQCDAQB8DAA8dAIAdAMAZAsAgwIA -ZAwAfAsAZA0AfAgAZA4AfAkAZA8AdAIAdAIAdAIAdAMAZBAAgwIAZBEAgwIAZBIAfAkAZBMAfAsA -gwIBZBQAgwIAZBUAgwEAgwAEAW4BAAF0AgB8CgBkFgCDAgBkFwBqAwBvrwABZBgAfAgAFn0PAHQC -AHQCAHQCAHQDAGQQAIMCAGQRAIMCAGQSAHQCAHwKAGQWAIMCAGQTAHwLAIMCAWQUAIMCAGQVAIMB -AH0QAHwLAHwPAHwQAGYDAH0MAHQCAHwFAGQKAIMCAHwMAIMBAAxvPAABdA0AdA4AfAUAgwEAfAwA -PHQCAHQDAGQLAIMCAGQMAHwLAGQNAHwPAGQOAHwJAGQPAHwQAIMABAFxLAIBcc8AAXHPAFdxrwBX -cVwAAXFcAFd4/AB0BgB0AgB0AgB0AwBkGQCDAgBkBQCDAgCDAACDAQBEXdkAfREAdAIAfBEAZBYA -gwIAfRIAfBIADG8TAAF0AgB8EQBkGgCDAgB9EgBuAQABeKYAdAYAfAQAgwEARF2YAH0LAHwLAGQb -AHwSAGYDAH0MAHQCAHwFAGQKAIMCAHwMAIMBAAxvbAABdA0AdA4AfAUAgwEAfAwAPHQCAHQDAGQL -AIMCAGQMAHwLAGQNAGQbAGQOAHwSAGQPAHQCAHQCAHQCAHQDAGQQAIMCAGQRAIMCAGQSAHwSAGQT -AHwLAIMCAWQUAIMCAGQVAIMBAIMABAFxmwIBcZsCV3FeAld8AQAEZBwAAklKfAEAgwAAU2QAAFMo -HQAAAE5zCQAAAExvY2FsaXplcnMXAAAAZ2V0X3N1cHBvcnRlZF9sYW5ndWFnZXNzEgAAAFRyYW5z -bGF0aW9uX2RlbGV0ZXMPAAAAcG9ydGFsX3dvcmtmbG93cwwAAABvYmplY3RWYWx1ZXNzCQAAAHZh -cmlhYmxlc3MLAAAAZ2V0U3RhdGVWYXJzBgAAAHN0YXRlc3MFAAAAaXRlbXNzBwAAAGhhc19rZXlz -FgAAAFRyYW5zbGF0aW9uX2FkZE1lc3NhZ2VzCAAAAGxhbmd1YWdlcw8AAABtZXNzYWdlX2NvbnRl -eHRzEAAAAG9yaWdpbmFsX21lc3NhZ2VzEgAAAHRyYW5zbGF0ZWRfbWVzc2FnZXMTAAAAdHJhbnNs -YXRpb25fc2VydmljZXMJAAAAdHJhbnNsYXRlcwIAAAB1aXMPAAAAdGFyZ2V0X2xhbmd1YWdlcwYA -AABlbmNvZGVzBQAAAHV0Zi04cwUAAAB0aXRsZXMAAAAAcwgAAAAlc190aXRsZXMMAAAAcG9ydGFs -X3R5cGVzcwIAAABpZHMLAAAAcG9ydGFsX3R5cGVzBAAAAERvbmUoEwAAAHMHAAAAX3ByaW50X3MG -AAAAX3ByaW50cwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzEwAAAHN1cHBvcnRlZF9sYW5ndWFn -ZXNzDwAAAHRyYW5zbGF0ZWRfa2V5c3MJAAAAX2dldGl0ZXJfcwIAAAB3ZnMJAAAAc3RhdGVfdmFy -cwgAAABzdGF0ZV9pZHMFAAAAc3RhdGVzBAAAAGxhbmdzAwAAAGtleXMEAAAATm9uZXMHAAAAX3dy -aXRlX3MPAAAAc3RhdGVfdmFyX3RpdGxlcxIAAAB0cmFuc2xhdGVkX21lc3NhZ2VzBQAAAHB0eXBl -cwUAAAB0aXRsZSgTAAAAcwcAAABfcHJpbnRfcwYAAABfcHJpbnRzCQAAAF9nZXRhdHRyX3MHAAAA -Y29udGV4dHMTAAAAc3VwcG9ydGVkX2xhbmd1YWdlc3MPAAAAdHJhbnNsYXRlZF9rZXlzcwkAAABf -Z2V0aXRlcl9zAgAAAHdmcwkAAABzdGF0ZV92YXJzCAAAAHN0YXRlX2lkcwUAAABzdGF0ZXMEAAAA -bGFuZ3MDAAAAa2V5cwQAAABOb25lcwcAAABfd3JpdGVfcw8AAABzdGF0ZV92YXJfdGl0bGVzEgAA -AHRyYW5zbGF0ZWRfbWVzc2FnZXMFAAAAcHR5cGVzBQAAAHRpdGxlKAAAAAAoAAAAAHMPAAAAU2Ny -aXB0IChQeXRob24pcx8AAABFUlA1U2l0ZV91cGRhdGVUcmFuc2xhdGlvblRhYmxlAQAAAHNMAAAA -JAEJAg0DIgAGAR4BDQEiABMBDQAGAQ8BFwETARgBDwEyAxYBCgE/AQ8BFwETARgBJQMiAAYBDwEb -AQ0ABgEPARcBEwEYAQ8BOgIKASgBAAAAcx8AAABFUlA1U2l0ZV91cGRhdGVUcmFuc2xhdGlvblRh -YmxlKAEAAABzHwAAAEVSUDVTaXRlX3VwZGF0ZVRyYW5zbGF0aW9uVGFibGUoAAAAACgAAAAAcw8A -AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> + <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGUAAGQBAIQBAFoBAGQAAFMoAgAAAE5jAQAAABkAAAAkAAAA +QwAAAHN9BAAAdAAAgwAAfQIAZAEAawIAbAMAfQQAAXQEAHQEAHQFAGQCAIMCAGQDAIMCAIMAAH0H +AGgAAH0IAHQEAHQEAHQFAGQEAIMCAGQFAIMCAGQGAHwAAIMAAQFkBwB9CQB4oAJ0CgB0BAB0BAB0 +BQBkCACDAgBkCQCDAgCDAACDAQBEXX0CfQsAZwAAfQwAdAQAdAQAfAsAZAoAgwIAZAsAgwIAgwAA +fQ0AdAQAfAsAZAwAgwIAbxkCAXgWAnQKAHQEAHQEAHwLAGQMAIMCAGQNAIMCAIMAAIMBAERd7wF0 +CgACgwEAXAIAfQ4AfQ8AeNkBdAoAfAcAgwEARF3LAX0QAHwQAHwNAHwOAGYDAH0RAHQEAHwIAGQO +AIMCAHwRAIMBAAxvowABdBIAdBMAfAgAgwEAfBEAPHwEAHQFAGQPAHwJABZkEAB8EABkEQB8DQBk +EgB8DgBkEwB0BAB0BAB0BAB0BQBkFACDAgBkFQCDAgBkFgB8DgBkFwB8EACDAgFkGACDAgBkGQCD +AQCDAgR9FAB0BAB8FABkGgCDAgBkGwB8CQAWgwEAAXwJAGQcADd9CQB0BAB8DABkHQCDAgB8FACD +AQABbgEAAXQEAHwPAGQeAIMCAGQfAGoDAG/mAAFkIAB8DQAWfRUAdAQAdAQAdAQAdAUAZBQAgwIA +ZBUAgwIAZBYAdAQAfA8AZB4AgwIAZBcAfBAAgwIBZBgAgwIAZBkAgwEAfRYAfBAAfBUAfBYAZgMA +fREAdAQAfAgAZA4AgwIAfBEAgwEADG9zAAF0EgB0EwB8CACDAQB8EQA8fAQAdAUAZA8AfAkAFmQQ +AHwQAGQRAHwVAGQSAHwOAGQTAHwWAIMCBH0UAHQEAHwUAGQaAIMCAGQbAHwJABaDAQABfAkAZBwA +N30JAHQEAHwMAGQdAIMCAHwUAIMBAAFxwgIBcfcAAXH3AFdx1wBXbgEAAXwMAG8mAAF0BAB0BAB0 +BQBkBACDAgBkIQCDAgB8DABkBgB8AACDAQEBcX4AAXF+AFd4ZgF0CgB0BAB0BAB0BQBkIgCDAgBk +CQCDAgCDAACDAQBEXUMBfRcAdAQAfBcAZB4AgwIAfRgAfBgADG8TAAF0BAB8FwBkIwCDAgB9GABu +AQABZwAAfQwAeN0AdAoAfAcAgwEARF3PAH0QAHwQAGQkAHwYAGYDAH0RAHQEAHwIAGQOAIMCAHwR +AIMBAAxvowABdBIAdBMAfAgAgwEAfBEAPHwEAHQFAGQPAHwJABZkEAB8EABkEQBkJABkEgB8GABk +EwB0BAB0BAB0BAB0BQBkFACDAgBkFQCDAgBkFgB8GABkFwB8EACDAgFkGACDAgBkGQCDAQCDAgR9 +FAB0BAB8FABkGgCDAgBkGwB8CQAWgwEAAXwJAGQcADd9CQB0BAB8DABkHQCDAgB8FACDAQABcWQD +AXFkA1d8DABvJgABdAQAdAQAdAUAZAQAgwIAZCEAgwIAfAwAZAYAfAAAgwEBAXEhAwFxIQNXfAIA +BGQlAAJJSnwCAIMAAFNkAABTKCYAAABOKAEAAABzCwAAAG5ld1RlbXBCYXNlcwkAAABMb2NhbGl6 +ZXJzFwAAAGdldF9zdXBwb3J0ZWRfbGFuZ3VhZ2Vzcw4AAABwb3J0YWxfY2F0YWxvZ3MVAAAAZGVs +ZXRlVHJhbnNsYXRpb25MaXN0cw4AAABzcWxfY2F0YWxvZ19pZGkAAAAAcw8AAABwb3J0YWxfd29y +a2Zsb3dzDAAAAG9iamVjdFZhbHVlc3MJAAAAdmFyaWFibGVzcwsAAABnZXRTdGF0ZVZhcnMGAAAA +c3RhdGVzcwUAAABpdGVtc3MHAAAAaGFzX2tleXMTAAAAdGVtcF90cmFuc2xhdGlvbl8lZHMIAAAA +bGFuZ3VhZ2VzDwAAAG1lc3NhZ2VfY29udGV4dHMQAAAAb3JpZ2luYWxfbWVzc2FnZXMSAAAAdHJh +bnNsYXRlZF9tZXNzYWdlcxMAAAB0cmFuc2xhdGlvbl9zZXJ2aWNlcwkAAAB0cmFuc2xhdGVzAgAA +AHVpcw8AAAB0YXJnZXRfbGFuZ3VhZ2VzBgAAAGVuY29kZXMFAAAAdXRmLThzBgAAAHNldFVpZHMH +AAAAdGVtcF8lZGkBAAAAcwYAAABhcHBlbmRzBQAAAHRpdGxlcwAAAABzCAAAACVzX3RpdGxlcxYA +AABjYXRhbG9nVHJhbnNsYXRpb25MaXN0cwwAAABwb3J0YWxfdHlwZXNzAgAAAGlkcwsAAABwb3J0 +YWxfdHlwZXMEAAAARG9uZSgZAAAAcwcAAABfcHJpbnRfcwYAAABfcHJpbnRzGgAAAFByb2R1Y3Rz +LkVSUDVUeXBlLkRvY3VtZW50cwsAAABuZXdUZW1wQmFzZXMJAAAAX2dldGF0dHJfcwcAAABjb250 +ZXh0cxMAAABzdXBwb3J0ZWRfbGFuZ3VhZ2Vzcw8AAAB0cmFuc2xhdGVkX2tleXNzDgAAAHNxbF9j +YXRhbG9nX2lkcwEAAABpcwkAAABfZ2V0aXRlcl9zAgAAAHdmcwsAAABvYmplY3RfbGlzdHMJAAAA +c3RhdGVfdmFycwgAAABzdGF0ZV9pZHMFAAAAc3RhdGVzBAAAAGxhbmdzAwAAAGtleXMEAAAATm9u +ZXMHAAAAX3dyaXRlX3MDAAAAb2Jqcw8AAABzdGF0ZV92YXJfdGl0bGVzEgAAAHRyYW5zbGF0ZWRf +bWVzc2FnZXMFAAAAcHR5cGVzBQAAAHRpdGxlKBkAAABzDgAAAHNxbF9jYXRhbG9nX2lkcwcAAABf +cHJpbnRfcwYAAABfcHJpbnRzGgAAAFByb2R1Y3RzLkVSUDVUeXBlLkRvY3VtZW50cwsAAABuZXdU +ZW1wQmFzZXMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cxMAAABzdXBwb3J0ZWRfbGFuZ3VhZ2Vz +cw8AAAB0cmFuc2xhdGVkX2tleXNzAQAAAGlzCQAAAF9nZXRpdGVyX3MCAAAAd2ZzCwAAAG9iamVj +dF9saXN0cwkAAABzdGF0ZV92YXJzCAAAAHN0YXRlX2lkcwUAAABzdGF0ZXMEAAAAbGFuZ3MDAAAA +a2V5cwQAAABOb25lcwcAAABfd3JpdGVfcwMAAABvYmpzDwAAAHN0YXRlX3Zhcl90aXRsZXMSAAAA +dHJhbnNsYXRlZF9tZXNzYWdlcwUAAABwdHlwZXMFAAAAdGl0bGUoAAAAACgAAAAAcw8AAABTY3Jp +cHQgKFB5dGhvbilzHwAAAEVSUDVTaXRlX3VwZGF0ZVRyYW5zbGF0aW9uVGFibGUBAAAAc3IAAAAW +AhsBDAIZAgYDIgAGAQYBHgENASIAEwENAAYBDwEXARABEAEbATMBFAENARQDFgEKAT8BDwEXARAB +EAEMARIBFAENASQCDQEkAyIABgEPARsBBgENAAYBDwEXARABEAEMAQ8BMwEUAQ0BGAINASQCCgEo +AgAAAHMEAAAATm9uZXMfAAAARVJQNVNpdGVfdXBkYXRlVHJhbnNsYXRpb25UYWJsZSgCAAAAcwQA +AABOb25lcx8AAABFUlA1U2l0ZV91cGRhdGVUcmFuc2xhdGlvblRhYmxlKAAAAAAoAAAAAHMPAAAA +U2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -157,7 +192,7 @@ AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string></string> </value> + <value> <string>sql_catalog_id=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -177,20 +212,25 @@ AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>sql_catalog_id</string> <string>_print_</string> <string>_print</string> + <string>Products.ERP5Type.Document</string> + <string>newTempBase</string> <string>_getattr_</string> <string>context</string> <string>supported_languages</string> <string>translated_keys</string> + <string>i</string> <string>_getiter_</string> <string>wf</string> + <string>object_list</string> <string>state_var</string> <string>state_id</string> <string>state</string> @@ -198,6 +238,7 @@ AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> <string>key</string> <string>None</string> <string>_write_</string> + <string>obj</string> <string>state_var_title</string> <string>translated_message</string> <string>ptype</string> @@ -213,7 +254,9 @@ AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <none/> + </tuple> </value> </item> <item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml index 0f6121072a68ca61a3eda6468e0259d0021fc76e..635d59e25c074f39f1618e1e8864c095ee141d23 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml @@ -74,32 +74,36 @@ for o in [ x.getObject() for x in context.portal_catalog(\n portal_type = (\'Inventory Cell\',\'Inventory Line\')\n , limit = None\n , sort_on = [(\'movement.start_date\',\'ascending\')]\n + , sql_catalog_id = sql_catalog_id\n )\n ]:\n o.reindexObject( after_tag = \'inventory_%i\' % count\n , tag = \'inventory_%i\' % (count+1)\n + , sql_catalog_id = sql_catalog_id\n )\n count += 1\n </string> </value> </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAoAAAATAAAASwAA -AHOzAAAAZAEAfQEAeKYAdAEAZwAABGkCAH0EAHQBAHQEAHQFAGQCAIMCAGQDAGQEAGQFAGYCAGQG -AHQGAGQHAGQIAGQJAGYCAGcBAIMAA4MBAERdHAB9CAB8BAB0BAB8CABkCgCDAgCDAACDAQABcU0A -fgQAgwEARF04AH0JAHQEAHwJAGQLAIMCAGQMAGQNAHwBABZkDgBkDQB8AQBkAQAXFoMAAgF8AQBk -AQA3fQEAcXMAV2QAAFMoDwAAAE5pAQAAAHMOAAAAcG9ydGFsX2NhdGFsb2dzCwAAAHBvcnRhbF90 -eXBlcw4AAABJbnZlbnRvcnkgQ2VsbHMOAAAASW52ZW50b3J5IExpbmVzBQAAAGxpbWl0cwcAAABz -b3J0X29ucxMAAABtb3ZlbWVudC5zdGFydF9kYXRlcwkAAABhc2NlbmRpbmdzCQAAAGdldE9iamVj -dHMNAAAAcmVpbmRleE9iamVjdHMJAAAAYWZ0ZXJfdGFncwwAAABpbnZlbnRvcnlfJWlzAwAAAHRh -ZygJAAAAcwUAAABjb3VudHMJAAAAX2dldGl0ZXJfcwYAAABhcHBlbmRzCAAAACRhcHBlbmQwcwkA -AABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzBAAAAE5vbmVzAQAAAHhzAQAAAG8oCgAAAHMCAAAAa3dz -BQAAAGNvdW50cwkAAABfZ2V0aXRlcl9zBgAAAGFwcGVuZHMIAAAAJGFwcGVuZDBzCQAAAF9nZXRh -dHRyX3MHAAAAY29udGV4dHMEAAAATm9uZXMBAAAAeHMBAAAAbygAAAAAKAAAAABzDwAAAFNjcmlw -dCAoUHl0aG9uKXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3ZlbWVudExpc3QBAAAAcxAA -AAAAAQYDIgEMAQYBQgMZAQwCKAEAAABzIwAAAEludmVudG9yeU1vZHVsZV9yZWluZGV4TW92ZW1l -bnRMaXN0KAEAAABzIwAAAEludmVudG9yeU1vZHVsZV9yZWluZGV4TW92ZW1lbnRMaXN0KAAAAAAo -AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> + <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGUAAGQBAIQBAFoBAGQAAFMoAgAAAE5jAQAAAAsAAAAUAAAA +SwAAAHO/AAAAZAEAfQIAeLIAdAEAZwAABGkCAH0FAHQBAHQEAHQFAGQCAIMCAGQDAGQEAGQFAGYC +AGQGAHQGAGQHAGQIAGQJAGYCAGcBAGQKAHwAAIMABIMBAERdHAB9CQB8BQB0BAB8CQBkCwCDAgCD +AACDAQABcVMAfgUAgwEARF0+AH0KAHQEAHwKAGQMAIMCAGQNAGQOAHwCABZkDwBkDgB8AgBkAQAX +FmQKAHwAAIMAAwF8AgBkAQA3fQIAcXkAV2QAAFMoEAAAAE5pAQAAAHMOAAAAcG9ydGFsX2NhdGFs +b2dzCwAAAHBvcnRhbF90eXBlcw4AAABJbnZlbnRvcnkgQ2VsbHMOAAAASW52ZW50b3J5IExpbmVz +BQAAAGxpbWl0cwcAAABzb3J0X29ucxMAAABtb3ZlbWVudC5zdGFydF9kYXRlcwkAAABhc2NlbmRp +bmdzDgAAAHNxbF9jYXRhbG9nX2lkcwkAAABnZXRPYmplY3RzDQAAAHJlaW5kZXhPYmplY3RzCQAA +AGFmdGVyX3RhZ3MMAAAAaW52ZW50b3J5XyVpcwMAAAB0YWcoCgAAAHMFAAAAY291bnRzCQAAAF9n +ZXRpdGVyX3MGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0 +cwQAAABOb25lcw4AAABzcWxfY2F0YWxvZ19pZHMBAAAAeHMBAAAAbygLAAAAcw4AAABzcWxfY2F0 +YWxvZ19pZHMCAAAAa3dzBQAAAGNvdW50cwkAAABfZ2V0aXRlcl9zBgAAAGFwcGVuZHMIAAAAJGFw +cGVuZDBzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMEAAAATm9uZXMBAAAAeHMBAAAAbygAAAAA +KAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3Zl +bWVudExpc3QBAAAAcxQAAAAAAQYDIgEMAQYBDwE5AxkBCwEHAigCAAAAcwQAAABOb25lcyMAAABJ +bnZlbnRvcnlNb2R1bGVfcmVpbmRleE1vdmVtZW50TGlzdCgCAAAAcwQAAABOb25lcyMAAABJbnZl +bnRvcnlNb2R1bGVfcmVpbmRleE1vdmVtZW50TGlzdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0 +aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -107,7 +111,7 @@ AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </valu </item> <item> <key> <string>_params</string> </key> - <value> <string>**kw</string> </value> + <value> <string>sql_catalog_id=None, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -127,19 +131,20 @@ AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </valu <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>sql_catalog_id</string> <string>kw</string> <string>count</string> <string>_getiter_</string> <string>append</string> <string>$append0</string> <string>_getattr_</string> -<string>context</string> + <string>context</string> <string>None</string> <string>x</string> <string>o</string> @@ -154,7 +159,9 @@ AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </valu <item> <key> <string>func_defaults</string> </key> <value> - <none/> + <tuple> + <none/> + </tuple> </value> </item> <item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml index e4ffdddeadcee43c06dc28eada9fc4c24dc27c71..036d130025a2c71ac2ecfd5e952cbf8d7b2dfb84 100755 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml @@ -15,16 +15,7 @@ <item> <key> <string>__ac_local_roles__</string> </key> <value> - <dictionary> - <item> - <key> <string>alex</string> </key> - <value> - <list> - <string>Owner</string> - </list> - </value> - </item> - </dictionary> + <none/> </value> </item> <item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Translation_addMessage.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Translation_addMessage.xml deleted file mode 100755 index de33427cf802beb66a409b749e9afdb5223e60f0..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Translation_addMessage.xml +++ /dev/null @@ -1,165 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.ZSQLMethods.SQL</string> - <string>SQL</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_arg</string> </key> - <value> - <object> - <klass> - <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_data</string> </key> - <value> - <dictionary> - <item> - <key> <string>language</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>message_context</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>original_message</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>translated_message</string> </key> - <value> - <dictionary/> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_keys</string> </key> - <value> - <list> -<string>language</string> -<string>message_context</string> -<string>original_message</string> -<string>translated_message</string> - </list> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>arguments_src</string> </key> - <value> <string>language\r\n -message_context\r\n -original_message\r\n -translated_message</string> </value> - </item> - <item> - <key> <string>connection_id</string> </key> - <value> <string>erp5_sql_connection</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Translation_addMessage</string> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -INSERT INTO translation VALUES \n -(\n - <dtml-sqlvar "language" type="string">,\n - <dtml-sqlvar "message_context" type="string">,\n - <dtml-sqlvar "original_message" type="string">,\n - <dtml-sqlvar "translated_message" type="string">\n -)\n - - -]]></string> </value> - </item> - <item> - <key> <string>template</string> </key> - <value> - <object> - <klass> - <global name="SQL" module="Shared.DC.ZRDB.DA"/> - </klass> - <none/> - <state> - <dictionary> - <item> - <key> <string>__name__</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<string> - -]]></string> </value> - </item> - <item> - <key> <string>_vars</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>globals</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>raw</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -INSERT INTO translation VALUES \n -(\n - <dtml-sqlvar "language" type="string">,\n - <dtml-sqlvar "message_context" type="string">,\n - <dtml-sqlvar "original_message" type="string">,\n - <dtml-sqlvar "translated_message" type="string">\n -)\n - - -]]></string> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Translation_delete.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Translation_delete.xml deleted file mode 100755 index ccfefc73a0eee53d99dae62175e62ecf31ef9fdd..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Translation_delete.xml +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.ZSQLMethods.SQL</string> - <string>SQL</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_arg</string> </key> - <value> - <object> - <klass> - <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_data</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>_keys</string> </key> - <value> - <list/> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>arguments_src</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>connection_id</string> </key> - <value> <string>erp5_sql_connection</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Translation_delete</string> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string>delete from translation</string> </value> - </item> - <item> - <key> <string>template</string> </key> - <value> - <object> - <klass> - <global name="SQL" module="Shared.DC.ZRDB.DA"/> - </klass> - <none/> - <state> - <dictionary> - <item> - <key> <string>__name__</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<string> - -]]></string> </value> - </item> - <item> - <key> <string>_vars</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>globals</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>raw</string> </key> - <value> <string>delete from translation</string> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml index 122b43007c69c641ab5465a3b500e07bc86d4c19..e1f50e5b82e443d9f406c295c80f16169cc8a636 100755 --- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml +++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml @@ -104,7 +104,7 @@ cwYAAABvYmplY3RzCQAAAGdldFBvcnRhbGMBAAAAAwAAAAMAAAADAAAAcxoAAAB0AACIAABkAQCD AgBkAgCIAAAWfAAAgwIAUygDAAAATnMDAAAAbG9nczAAAABQcmVmZXJlbmNlV29ya2Zsb3cuZGlz YWJsZU90aGVyUHJlZmVyZW5jZXMgb24gJXMoAwAAAHMJAAAAX2dldGF0dHJfcwQAAABwcmVmcwMA AABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBAAAAHByZWYoAQAAAHMEAAAAcHJlZigA -AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCgAAADxsYW1iZGEuNT4FAAAAcwAAAABzEgAAAHBvcnRh +AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCgAAADxsYW1iZGEuMT4FAAAAcwAAAABzEgAAAHBvcnRh bF9wcmVmZXJlbmNlc3MMAAAAc2VhcmNoRm9sZGVycwQAAABzcGVjcw8AAABFUlA1IFByZWZlcmVu Y2VzCQAAAGdldE9iamVjdHMRAAAAcG9ydGFsX21lbWJlcnNoaXBzFgAAAGdldEF1dGhlbnRpY2F0 ZWRNZW1iZXJzBwAAAGFsbG93ZWRzBQAAAE93bmVycwgAAABBc3NpZ25vcnMSAAAAZ2V0UHJlZmVy diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index f222906f307beebb742cf6a6a85bb4623d4225a5..9a6e64d60564bffc883331bd70cb0340ca06d6b3 100755 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,7 +1,12 @@ +2005-12-20 yo +* Add an optional parameter sql_catalog_id into ERP5Site_reindexAll, ERP5Site_updateTranslationTable, and InventoryModule_reindexMovementList, and pass sql_catalog_id to catalog methods. +* ERP5Site_updateTranslationTable does not use Translation_addMessage or Translation_delete any longer. Instead, use portal_catalog. +* Remove Translation_addMessage and Translation_delete. + 2005-12-19 Seb * added sub_variation_text in Resource_zGetInventoryList * added category type 'sub_variation' on -aggregate +BaseCategory_view 2005-12-19 Jerome * fix omit_input / omit_output in Resource_zStatInventory.