Skip to content

erp5
erp5
Commit 60bd1770 authored by Yoshinori Okuji's avatar Yoshinori Okuji
Browse files
Options

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.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4820 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 584884d8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 438 deletions
product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/currency_module.xml
View file @ 60bd1770
...@@ -85,6 +85,9 @@ ...@@ -85,6 +85,9 @@
<permission> <permission>
<name>Add ERP5 Forms</name> <name>Add ERP5 Forms</name>
</permission> </permission>
<permission>
<name>Add ERP5 OOo Templates</name>
</permission>
<permission> <permission>
<name>Add ERP5 PDF Forms</name> <name>Add ERP5 PDF Forms</name>
</permission> </permission>
......
product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/organisation_module.xml
View file @ 60bd1770
...@@ -131,6 +131,9 @@ ...@@ -131,6 +131,9 @@
<name>Add ERP5 Forms</name> <name>Add ERP5 Forms</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ERP5 OOo Templates</name>
</permission>
<permission> <permission>
<name>Add ERP5 PDF Forms</name> <name>Add ERP5 PDF Forms</name>
</permission> </permission>
......
product/ERP5/bootstrap/erp5_core/ModuleTemplateItem/person_module.xml
View file @ 60bd1770
...@@ -131,6 +131,9 @@ ...@@ -131,6 +131,9 @@
<name>Add ERP5 Forms</name> <name>Add ERP5 Forms</name>
<role>Manager</role> <role>Manager</role>
</permission> </permission>
<permission>
<name>Add ERP5 OOo Templates</name>
</permission>
<permission> <permission>
<name>Add ERP5 PDF Forms</name> <name>Add ERP5 PDF Forms</name>
</permission> </permission>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseCategory_view/my_category_type_list.xml
View file @ 60bd1770
...@@ -257,6 +257,10 @@ ...@@ -257,6 +257,10 @@
<string>variation</string> <string>variation</string>
<string>variation</string> <string>variation</string>
</tuple> </tuple>
<tuple>
<string>sub_variation</string>
<string>sub_variation</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_view.xml
View file @ 60bd1770
...@@ -108,9 +108,10 @@ ...@@ -108,9 +108,10 @@
<string>my_building_state</string> <string>my_building_state</string>
<string>my_installation_state</string> <string>my_installation_state</string>
<string>my_description</string> <string>my_description</string>
<string>my_change_log</string>
<string>my_dependency_list</string> <string>my_dependency_list</string>
<string>my_change_log</string>
<string>my_license</string> <string>my_license</string>
<string>my_copyright_list</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -123,7 +124,6 @@ ...@@ -123,7 +124,6 @@
<string>my_template_module_id_list</string> <string>my_template_module_id_list</string>
<string>my_template_base_category_list</string> <string>my_template_base_category_list</string>
<string>my_template_workflow_id_list</string> <string>my_template_workflow_id_list</string>
<string>my_copyright_list</string>
</list> </list>
</value> </value>
</item> </item>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml
View file @ 60bd1770
...@@ -74,32 +74,36 @@ for o in [ x.getObject() for x in context.portal_catalog(\n ...@@ -74,32 +74,36 @@ for o in [ x.getObject() for x in context.portal_catalog(\n
portal_type = (\'Inventory Cell\',\'Inventory Line\')\n portal_type = (\'Inventory Cell\',\'Inventory Line\')\n
, limit = None\n , limit = None\n
, sort_on = [(\'movement.start_date\',\'ascending\')]\n , sort_on = [(\'movement.start_date\',\'ascending\')]\n
, sql_catalog_id = sql_catalog_id\n
)\n )\n
]:\n ]:\n
o.reindexObject( after_tag = \'inventory_%i\' % count\n o.reindexObject( after_tag = \'inventory_%i\' % count\n
, tag = \'inventory_%i\' % (count+1)\n , tag = \'inventory_%i\' % (count+1)\n
, sql_catalog_id = sql_catalog_id\n
)\n )\n
count += 1\n count += 1\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
<key> <string>_code</string> </key> <key> <string>_code</string> </key>
<value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAoAAAATAAAASwAA <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGUAAGQBAIQBAFoBAGQAAFMoAgAAAE5jAQAAAAsAAAAUAAAA
AHOzAAAAZAEAfQEAeKYAdAEAZwAABGkCAH0EAHQBAHQEAHQFAGQCAIMCAGQDAGQEAGQFAGYCAGQG SwAAAHO/AAAAZAEAfQIAeLIAdAEAZwAABGkCAH0FAHQBAHQEAHQFAGQCAIMCAGQDAGQEAGQFAGYC
AHQGAGQHAGQIAGQJAGYCAGcBAIMAA4MBAERdHAB9CAB8BAB0BAB8CABkCgCDAgCDAACDAQABcU0A AGQGAHQGAGQHAGQIAGQJAGYCAGcBAGQKAHwAAIMABIMBAERdHAB9CQB8BQB0BAB8CQBkCwCDAgCD
fgQAgwEARF04AH0JAHQEAHwJAGQLAIMCAGQMAGQNAHwBABZkDgBkDQB8AQBkAQAXFoMAAgF8AQBk AACDAQABcVMAfgUAgwEARF0+AH0KAHQEAHwKAGQMAIMCAGQNAGQOAHwCABZkDwBkDgB8AgBkAQAX
AQA3fQEAcXMAV2QAAFMoDwAAAE5pAQAAAHMOAAAAcG9ydGFsX2NhdGFsb2dzCwAAAHBvcnRhbF90 FmQKAHwAAIMAAwF8AgBkAQA3fQIAcXkAV2QAAFMoEAAAAE5pAQAAAHMOAAAAcG9ydGFsX2NhdGFs
eXBlcw4AAABJbnZlbnRvcnkgQ2VsbHMOAAAASW52ZW50b3J5IExpbmVzBQAAAGxpbWl0cwcAAABz b2dzCwAAAHBvcnRhbF90eXBlcw4AAABJbnZlbnRvcnkgQ2VsbHMOAAAASW52ZW50b3J5IExpbmVz
b3J0X29ucxMAAABtb3ZlbWVudC5zdGFydF9kYXRlcwkAAABhc2NlbmRpbmdzCQAAAGdldE9iamVj BQAAAGxpbWl0cwcAAABzb3J0X29ucxMAAABtb3ZlbWVudC5zdGFydF9kYXRlcwkAAABhc2NlbmRp
dHMNAAAAcmVpbmRleE9iamVjdHMJAAAAYWZ0ZXJfdGFncwwAAABpbnZlbnRvcnlfJWlzAwAAAHRh bmdzDgAAAHNxbF9jYXRhbG9nX2lkcwkAAABnZXRPYmplY3RzDQAAAHJlaW5kZXhPYmplY3RzCQAA
ZygJAAAAcwUAAABjb3VudHMJAAAAX2dldGl0ZXJfcwYAAABhcHBlbmRzCAAAACRhcHBlbmQwcwkA AGFmdGVyX3RhZ3MMAAAAaW52ZW50b3J5XyVpcwMAAAB0YWcoCgAAAHMFAAAAY291bnRzCQAAAF9n
AABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzBAAAAE5vbmVzAQAAAHhzAQAAAG8oCgAAAHMCAAAAa3dz ZXRpdGVyX3MGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0
BQAAAGNvdW50cwkAAABfZ2V0aXRlcl9zBgAAAGFwcGVuZHMIAAAAJGFwcGVuZDBzCQAAAF9nZXRh cwQAAABOb25lcw4AAABzcWxfY2F0YWxvZ19pZHMBAAAAeHMBAAAAbygLAAAAcw4AAABzcWxfY2F0
dHRyX3MHAAAAY29udGV4dHMEAAAATm9uZXMBAAAAeHMBAAAAbygAAAAAKAAAAABzDwAAAFNjcmlw YWxvZ19pZHMCAAAAa3dzBQAAAGNvdW50cwkAAABfZ2V0aXRlcl9zBgAAAGFwcGVuZHMIAAAAJGFw
dCAoUHl0aG9uKXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3ZlbWVudExpc3QBAAAAcxAA cGVuZDBzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMEAAAATm9uZXMBAAAAeHMBAAAAbygAAAAA
AAAAAQYDIgEMAQYBQgMZAQwCKAEAAABzIwAAAEludmVudG9yeU1vZHVsZV9yZWluZGV4TW92ZW1l KAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMjAAAASW52ZW50b3J5TW9kdWxlX3JlaW5kZXhNb3Zl
bnRMaXN0KAEAAABzIwAAAEludmVudG9yeU1vZHVsZV9yZWluZGV4TW92ZW1lbnRMaXN0KAAAAAAo bWVudExpc3QBAAAAcxQAAAAAAQYDIgEMAQYBDwE5AxkBCwEHAigCAAAAcwQAAABOb25lcyMAAABJ
AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> bnZlbnRvcnlNb2R1bGVfcmVpbmRleE1vdmVtZW50TGlzdCgCAAAAcwQAAABOb25lcyMAAABJbnZl
bnRvcnlNb2R1bGVfcmVpbmRleE1vdmVtZW50TGlzdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0
aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
</item> </item>
<item> <item>
<key> <string>_filepath</string> </key> <key> <string>_filepath</string> </key>
...@@ -107,7 +111,7 @@ AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </valu ...@@ -107,7 +111,7 @@ AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </valu
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>**kw</string> </value> <value> <string>sql_catalog_id=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -127,19 +131,20 @@ AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </valu ...@@ -127,19 +131,20 @@ AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </valu
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>sql_catalog_id</string>
<string>kw</string> <string>kw</string>
<string>count</string> <string>count</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>append</string> <string>append</string>
<string>$append0</string> <string>$append0</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>None</string> <string>None</string>
<string>x</string> <string>x</string>
<string>o</string> <string>o</string>
...@@ -154,7 +159,9 @@ AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </valu ...@@ -154,7 +159,9 @@ AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </valu
<item> <item>
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<none/> <tuple>
<none/>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
View file @ 60bd1770
...@@ -15,16 +15,7 @@ ...@@ -15,16 +15,7 @@
<item> <item>
<key> <string>__ac_local_roles__</string> </key> <key> <string>__ac_local_roles__</string> </key>
<value> <value>
<dictionary> <none/>
<item>
<key> <string>alex</string> </key>
<value>
<list>
<string>Owner</string>
</list>
</value>
</item>
</dictionary>
</value> </value>
</item> </item>
<item> <item>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Translation_addMessage.xml deleted 100755 → 0
View file @ 584884d8
<?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>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Translation_delete.xml deleted 100755 → 0
View file @ 584884d8
<?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>
product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml
View file @ 60bd1770
...@@ -104,7 +104,7 @@ cwYAAABvYmplY3RzCQAAAGdldFBvcnRhbGMBAAAAAwAAAAMAAAADAAAAcxoAAAB0AACIAABkAQCD ...@@ -104,7 +104,7 @@ cwYAAABvYmplY3RzCQAAAGdldFBvcnRhbGMBAAAAAwAAAAMAAAADAAAAcxoAAAB0AACIAABkAQCD
AgBkAgCIAAAWfAAAgwIAUygDAAAATnMDAAAAbG9nczAAAABQcmVmZXJlbmNlV29ya2Zsb3cuZGlz AgBkAgCIAAAWfAAAgwIAUygDAAAATnMDAAAAbG9nczAAAABQcmVmZXJlbmNlV29ya2Zsb3cuZGlz
YWJsZU90aGVyUHJlZmVyZW5jZXMgb24gJXMoAwAAAHMJAAAAX2dldGF0dHJfcwQAAABwcmVmcwMA YWJsZU90aGVyUHJlZmVyZW5jZXMgb24gJXMoAwAAAHMJAAAAX2dldGF0dHJfcwQAAABwcmVmcwMA
AABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBAAAAHByZWYoAQAAAHMEAAAAcHJlZigA AABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBAAAAHByZWYoAQAAAHMEAAAAcHJlZigA
AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCgAAADxsYW1iZGEuNT4FAAAAcwAAAABzEgAAAHBvcnRh AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCgAAADxsYW1iZGEuMT4FAAAAcwAAAABzEgAAAHBvcnRh
bF9wcmVmZXJlbmNlc3MMAAAAc2VhcmNoRm9sZGVycwQAAABzcGVjcw8AAABFUlA1IFByZWZlcmVu bF9wcmVmZXJlbmNlc3MMAAAAc2VhcmNoRm9sZGVycwQAAABzcGVjcw8AAABFUlA1IFByZWZlcmVu
Y2VzCQAAAGdldE9iamVjdHMRAAAAcG9ydGFsX21lbWJlcnNoaXBzFgAAAGdldEF1dGhlbnRpY2F0 Y2VzCQAAAGdldE9iamVjdHMRAAAAcG9ydGFsX21lbWJlcnNoaXBzFgAAAGdldEF1dGhlbnRpY2F0
ZWRNZW1iZXJzBwAAAGFsbG93ZWRzBQAAAE93bmVycwgAAABBc3NpZ25vcnMSAAAAZ2V0UHJlZmVy ZWRNZW1iZXJzBwAAAGFsbG93ZWRzBQAAAE93bmVycwgAAABBc3NpZ25vcnMSAAAAZ2V0UHJlZmVy
......
product/ERP5/bootstrap/erp5_core/bt/change_log
View file @ 60bd1770
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 2005-12-19 Seb
* added sub_variation_text in Resource_zGetInventoryList * added sub_variation_text in Resource_zGetInventoryList
* added category type 'sub_variation' on * added category type 'sub_variation' on
aggregate BaseCategory_view
2005-12-19 Jerome 2005-12-19 Jerome
* fix omit_input / omit_output in Resource_zStatInventory. * fix omit_input / omit_output in Resource_zStatInventory.
......
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