Commit 6f2ec9a1 authored by Mayoro Diagne's avatar Mayoro Diagne

2010-06-25 mayoro

* modify egov table to be generic for erp5_egov bt and catalog methods
* remove specific portal_type in filter expressions of z_catalog_egov_list

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36614 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 802110e3
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
<value>1</value> <value>1</value>
</item> </item>
<item key="_filter_expression_archive" type="str"> <item key="_filter_expression_archive" type="str">
<value>python: here.getPortalType() in ('M0','M0 Bis','M2','M2 Bis','M4','P0','P2','P4','S1','S5','Subscription Form','Declaration TVA','Mandate Form', 'Organisation', 'Assignment')</value> <value>python: context.getPortalType() in ('Organisation', 'Assignment') or (lambda type_info: type_info is not None and type_info.getPortalType() == 'EGov Type')(context.getTypeInfo())</value>
</item> </item>
<item key="_filter_type_archive" type="tuple"> <item key="_filter_expression_cache_key_archive" type="tuple">
<value>portal_type</value>
</item> </item>
</catalog_method> </catalog_method>
...@@ -9,12 +9,6 @@ ...@@ -9,12 +9,6 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_arg</string> </key> <key> <string>_arg</string> </key>
<value> <value>
...@@ -30,13 +24,19 @@ ...@@ -30,13 +24,19 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>getCorporateRegistrationCode</string> </key> <key> <string>getPortalType</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>getVatCode</string> </key> <key> <string>getTranslatedValidationStateTitle</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>modification_date</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
...@@ -54,9 +54,10 @@ ...@@ -54,9 +54,10 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>uid</string> <string>uid</string>
<string>getCorporateRegistrationCode</string> <string>getPortalType</string>
<string>getVatCode</string> <string>getTranslatedValidationStateTitle</string>
<string>modification_date</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -65,6 +66,12 @@ ...@@ -65,6 +66,12 @@
</object> </object>
</value> </value>
</item> </item>
<item>
<key> <string>_col</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>allow_simple_one_argument_traversal</string> </key> <key> <string>allow_simple_one_argument_traversal</string> </key>
<value> <value>
...@@ -74,9 +81,9 @@ ...@@ -74,9 +81,9 @@
<item> <item>
<key> <string>arguments_src</string> </key> <key> <string>arguments_src</string> </key>
<value> <string>uid\r\n <value> <string>uid\r\n
getCorporateRegistrationCode\r\n getPortalType\r\n
getVatCode\r\n getTranslatedValidationStateTitle\r\n
</string> </value> modification_date </string> </value>
</item> </item>
<item> <item>
<key> <string>cache_time_</string> </key> <key> <string>cache_time_</string> </key>
...@@ -123,8 +130,9 @@ VALUES\n ...@@ -123,8 +130,9 @@ VALUES\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
( \n ( \n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
<dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n <dtml-sqlvar expr="getTranslatedValidationStateTitle[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="modification_date[loop_item]" type="datetime" optional>\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
...@@ -176,8 +184,9 @@ VALUES\n ...@@ -176,8 +184,9 @@ VALUES\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
( \n ( \n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
<dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n <dtml-sqlvar expr="getTranslatedValidationStateTitle[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="modification_date[loop_item]" type="datetime" optional>\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
......
...@@ -9,12 +9,6 @@ ...@@ -9,12 +9,6 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_arg</string> </key> <key> <string>_arg</string> </key>
<value> <value>
...@@ -96,11 +90,10 @@ ...@@ -96,11 +90,10 @@
<key> <string>src</string> </key> <key> <string>src</string> </key>
<value> <string>CREATE TABLE `egov` (\n <value> <string>CREATE TABLE `egov` (\n
`uid` BIGINT UNSIGNED NOT NULL,\n `uid` BIGINT UNSIGNED NOT NULL,\n
`corporate_registration_code` VARCHAR(255) DEFAULT \'\',\n `portal_type` VARCHAR(255) DEFAULT \'\',\n
`vat_code` VARCHAR(255) DEFAULT \'\',\n `translated_validation_state_title` VARCHAR(255) DEFAULT \'\',\n
PRIMARY KEY (`uid`),\n `modification_date` DATETIME,\n
KEY `rccm` (`corporate_registration_code`),\n PRIMARY KEY (`uid`)\n
KEY `ninea` (`vat_code`)\n
) TYPE=InnoDB\n ) TYPE=InnoDB\n
</string> </value> </string> </value>
</item> </item>
...@@ -140,11 +133,10 @@ ...@@ -140,11 +133,10 @@
<key> <string>raw</string> </key> <key> <string>raw</string> </key>
<value> <string>CREATE TABLE `egov` (\n <value> <string>CREATE TABLE `egov` (\n
`uid` BIGINT UNSIGNED NOT NULL,\n `uid` BIGINT UNSIGNED NOT NULL,\n
`corporate_registration_code` VARCHAR(255) DEFAULT \'\',\n `portal_type` VARCHAR(255) DEFAULT \'\',\n
`vat_code` VARCHAR(255) DEFAULT \'\',\n `translated_validation_state_title` VARCHAR(255) DEFAULT \'\',\n
PRIMARY KEY (`uid`),\n `modification_date` DATETIME,\n
KEY `rccm` (`corporate_registration_code`),\n PRIMARY KEY (`uid`)\n
KEY `ninea` (`vat_code`)\n
) TYPE=InnoDB\n ) TYPE=InnoDB\n
</string> </value> </string> </value>
</item> </item>
......
2010-06-25 mayoro
* modify egov table to be generic for erp5_egov bt and catalog methods
* remove specific portal_type in filter expressions of z_catalog_egov_list
2008-07-01 fabien 2008-07-01 fabien
* add birth_detail table to be able to catalog details relative to birth (place and date) * add birth_detail table to be able to catalog details relative to birth (place and date)
......
25 29
\ No newline at end of file \ 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