Commit 61fb9dbb authored by Rafael Monnerat's avatar Rafael Monnerat

Merge branch 'master' into ung_asynchronous

Conflicts:
	bt5/erp5_web_ung_core/bt/revision
	bt5/erp5_web_ung_theme/bt/change_log
	bt5/erp5_web_ung_theme/bt/revision
parents 6ebdf092 ad5722a1

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -5,3 +5,7 @@ ...@@ -5,3 +5,7 @@
build/ build/
dist/ dist/
erp5.util.egg-info/ erp5.util.egg-info/
Products
bt5/bt5list
product/ERP5/bootstrap/bt5list
product/__init__.py
Changes Changes
======= =======
0.1 (unreleased) 0.4 (unreleased)
---------------- ----------------
* No changes yet. * No changes yet.
0.3 (2011-12-23)
----------------
* erp5.util.webchecker:
- Imported from https://svn.erp5.org/repos/public/erp5/trunk/utils/
Utility to check caching policy of websites
* erp5.util.testnode:
- improve logging [Sebastien Robin]
- fix passing bt5_path [Gabriel Monnerat]
- fix profile_path concatenation [Nicolas Delaby]
- fix git updating and parsing repository paths [Julien Muchembled]
* erp5.util.benchmark:
- new utility, work in progress [Arnaud Fontaine]
0.2 (2011-09-20)
----------------
* Imported from https://svn.erp5.org/repos/public/erp5/trunk/utils/
- erp5.util.test_browser:
Programmable browser for functional and performance tests for ERP5
- erp5.util.benchmark:
Performance benchmarks for ERP5 with erp5.utils.test_browser
0.1 (2011-08-08)
----------------
* erp5.util.testnode imported from recipe like slapos.cookbook
[Łukasz Nowak]
...@@ -76,7 +76,9 @@ dQEAAAAA</string> </value> ...@@ -76,7 +76,9 @@ dQEAAAAA</string> </value>
xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n
tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
tal:define=\'at_date request/at_date/latestTime;\n tal:define=\'money_quantity_style python:context.getPortalObject().portal_preferences.getPreferredMoneyQuantityStyle("");\n
money_currency_do_grouping python:"1234" in money_quantity_style and "false" or "true";\n
at_date request/at_date/latestTime;\n
at_date_previous_period python:modules["DateTime"].DateTime(at_date.year() - 1, at_date.month(), at_date.day()).latestTime();\n at_date_previous_period python:modules["DateTime"].DateTime(at_date.year() - 1, at_date.month(), at_date.day()).latestTime();\n
date_formatter nocall:here/Base_viewAccountingReport/my_date/render_pdf;\n date_formatter nocall:here/Base_viewAccountingReport/my_date/render_pdf;\n
from_date python:context.Base_getAccountingPeriodStartDateForSectionCategory(section_category=request["section_category"], date=at_date);\n from_date python:context.Base_getAccountingPeriodStartDateForSectionCategory(section_category=request["section_category"], date=at_date);\n
...@@ -96,6 +98,30 @@ dQEAAAAA</string> </value> ...@@ -96,6 +98,30 @@ dQEAAAAA</string> </value>
<style:font-face svg:font-family=\'Lucidasans\' style:font-family-generic=\'system\' style:name=\'Lucidasans\' style:font-pitch=\'variable\'/>\n <style:font-face svg:font-family=\'Lucidasans\' style:font-family-generic=\'system\' style:name=\'Lucidasans\' style:font-pitch=\'variable\'/>\n
</office:font-face-decls>\n </office:font-face-decls>\n
<office:automatic-styles> <!-- {{{ -->\n <office:automatic-styles> <!-- {{{ -->\n
<number:number-style style:name="qus">\n
<number:number number:decimal-places="2" number:min-integer-digits="1"\n
tal:attributes="number:grouping money_currency_do_grouping"/>\n
</number:number-style>\n
<style:style style:name="report-content-currency" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="11pt" fo:font-weight="bold"/>\n
</style:style>\n
<style:style style:name="report-content-currency2" style:family="table-cell" style:parent-style-name="report-content-currency" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="10pt" fo:font-weight="normal"/>\n
</style:style>\n
<style:style style:name="report-content-currency3" style:family="table-cell" style:parent-style-name="report-content-currency" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="9pt" fo:font-weight="normal"/>\n
</style:style>\n
<style:style style:name="report-stat-currency1" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="11pt" fo:font-weight="bold"/>\n
</style:style>\n
<style:style style:name="report-stat-currency" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="12pt" fo:font-weight="bold"/>\n
</style:style>\n
<style:style style:family=\'table-column\' style:name=\'co1\'>\n <style:style style:family=\'table-column\' style:name=\'co1\'>\n
<style:table-column-properties fo:break-before=\'auto\' style:column-width=\'6.21cm\'/>\n <style:table-column-properties fo:break-before=\'auto\' style:column-width=\'6.21cm\'/>\n
</style:style>\n </style:style>\n
......
...@@ -76,7 +76,9 @@ dQEAAAAA</string> </value> ...@@ -76,7 +76,9 @@ dQEAAAAA</string> </value>
xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n
tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
tal:define=\'at_date request/at_date/latestTime;\n tal:define=\'money_quantity_style python:context.getPortalObject().portal_preferences.getPreferredMoneyQuantityStyle("");\n
money_currency_do_grouping python:"1234" in money_quantity_style and "false" or "true";\n
at_date request/at_date/latestTime;\n
at_date_previous_period python:modules["DateTime"].DateTime(at_date.year() - 1, at_date.month(), at_date.day()).latestTime();\n at_date_previous_period python:modules["DateTime"].DateTime(at_date.year() - 1, at_date.month(), at_date.day()).latestTime();\n
from_date python:context.Base_getAccountingPeriodStartDateForSectionCategory(section_category=request["section_category"], date=at_date);\n from_date python:context.Base_getAccountingPeriodStartDateForSectionCategory(section_category=request["section_category"], date=at_date);\n
from_date_previous_period python:context.Base_getAccountingPeriodStartDateForSectionCategory(section_category=request["section_category"], date=at_date_previous_period);\n from_date_previous_period python:context.Base_getAccountingPeriodStartDateForSectionCategory(section_category=request["section_category"], date=at_date_previous_period);\n
...@@ -96,6 +98,30 @@ dQEAAAAA</string> </value> ...@@ -96,6 +98,30 @@ dQEAAAAA</string> </value>
<style:font-face svg:font-family=\'Lucidasans\' style:font-family-generic=\'system\' style:name=\'Lucidasans\' style:font-pitch=\'variable\'/>\n <style:font-face svg:font-family=\'Lucidasans\' style:font-family-generic=\'system\' style:name=\'Lucidasans\' style:font-pitch=\'variable\'/>\n
</office:font-face-decls>\n </office:font-face-decls>\n
<office:automatic-styles> <!-- {{{ -->\n <office:automatic-styles> <!-- {{{ -->\n
<number:number-style style:name="qus">\n
<number:number number:decimal-places="2" number:min-integer-digits="1"\n
tal:attributes="number:grouping money_currency_do_grouping"/>\n
</number:number-style>\n
<style:style style:name="report-content-currency" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="11pt" fo:font-weight="bold"/>\n
</style:style>\n
<style:style style:name="report-content-currency2" style:family="table-cell" style:parent-style-name="report-content-currency" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="10pt" fo:font-weight="normal"/>\n
</style:style>\n
<style:style style:name="report-content-currency3" style:family="table-cell" style:parent-style-name="report-content-currency" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="9pt" fo:font-weight="normal"/>\n
</style:style>\n
<style:style style:name="report-stat-currency1" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="11pt" fo:font-weight="bold"/>\n
</style:style>\n
<style:style style:name="report-stat-currency" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="qus">\n
<style:table-cell-properties fo:border-bottom="none" fo:border-left="0.002cm solid #000000" fo:border-right="0.002cm solid #000000" fo:border-top="none"/>\n
<style:text-properties fo:font-size="12pt" fo:font-weight="bold"/>\n
</style:style>\n
<style:style style:family=\'table-column\' style:name=\'co1\'>\n <style:style style:family=\'table-column\' style:name=\'co1\'>\n
<style:table-column-properties fo:break-before=\'auto\' style:column-width=\'6.21cm\'/>\n <style:table-column-properties fo:break-before=\'auto\' style:column-width=\'6.21cm\'/>\n
</style:style>\n </style:style>\n
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
<string>listbox_delivery_mirror_section_title_with_link</string> <string>listbox_delivery_mirror_section_title_with_link</string>
<string>listbox_total_net_price</string> <string>listbox_total_net_price</string>
<string>listbox_total_price</string> <string>listbox_total_price</string>
<string>listbox_delivery_own_section_title</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -157,6 +157,10 @@ ...@@ -157,6 +157,10 @@
<key> <string>all_columns</string> </key> <key> <string>all_columns</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>delivery_own_section_title</string>
<string>Own Section</string>
</tuple>
<tuple> <tuple>
<string>translated_portal_type</string> <string>translated_portal_type</string>
<string>Type</string> <string>Type</string>
...@@ -293,6 +297,10 @@ ...@@ -293,6 +297,10 @@
<string>operation_date</string> <string>operation_date</string>
<string>operation_date</string> <string>operation_date</string>
</tuple> </tuple>
<tuple>
<string>delivery_own_section_title</string>
<string>delivery_own_section_title</string>
</tuple>
<tuple> <tuple>
<string>delivery_mirror_section_title</string> <string>delivery_mirror_section_title</string>
<string>delivery_mirror_section_title</string> <string>delivery_mirror_section_title</string>
...@@ -381,6 +389,10 @@ ...@@ -381,6 +389,10 @@
<string>title</string> <string>title</string>
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple>
<string>delivery_own_section_title</string>
<string>Own Section</string>
</tuple>
<tuple> <tuple>
<string>delivery_mirror_section_title</string> <string>delivery_mirror_section_title</string>
<string>Third Party</string> <string>Third Party</string>
......
...@@ -49,6 +49,7 @@ specific_reference\r\n ...@@ -49,6 +49,7 @@ specific_reference\r\n
group_by\r\n group_by\r\n
search_result_keys=\'\'\r\n search_result_keys=\'\'\r\n
delivery_mirror_section_title=""\r\n delivery_mirror_section_title=""\r\n
delivery_own_section_title=""\r\n
source_section_where_expression\r\n source_section_where_expression\r\n
destination_section_where_expression</string> </value> destination_section_where_expression</string> </value>
</item> </item>
...@@ -90,7 +91,7 @@ destination_section_where_expression</string> </value> ...@@ -90,7 +91,7 @@ destination_section_where_expression</string> </value>
<key> <string>src</string> </key> <key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), select_expression_key=(\'operation_date\', \'specific_reference\', \'delivery_mirror_section_title\',), **selection_params)">\n <dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), select_expression_key=(\'operation_date\', \'specific_reference\', \'delivery_mirror_section_title\', \'delivery_own_section_title\'), **selection_params)">\n
<dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n <dtml-let search_result_keys="search_result_keys or portal_catalog.getCatalogSearchResultKeys()">\n
<dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n <dtml-let use_movement_table="from_date or to_date or at_date or resource or stat or amount or amount_range_min or amount_range_max">\n
<dtml-let accounting_movement_list="portal_url.getPortalObject().getPortalAccountingMovementTypeList()">\n <dtml-let accounting_movement_list="portal_url.getPortalObject().getPortalAccountingMovementTypeList()">\n
...@@ -299,6 +300,7 @@ destination_section_where_expression</string> </value> ...@@ -299,6 +300,7 @@ destination_section_where_expression</string> </value>
<dtml-else>\n <dtml-else>\n
catalog.*,\n catalog.*,\n
( SELECT title FROM catalog as mirror_catalog WHERE mirror_catalog.uid=catalog.delivery_mirror_section_uid ) AS delivery_mirror_section_title,\n ( SELECT title FROM catalog as mirror_catalog WHERE mirror_catalog.uid=catalog.delivery_mirror_section_uid ) AS delivery_mirror_section_title,\n
( SELECT title FROM catalog as own_catalog WHERE own_catalog.uid=catalog.delivery_own_section_uid ) AS delivery_own_section_title,\n
( SELECT IFNULL(SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price > 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS debit,\n ( SELECT IFNULL(SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price > 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS debit,\n
( SELECT IFNULL(-SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price < 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS credit\n ( SELECT IFNULL(-SUM(stock.total_price), 0) FROM stock, catalog AS child WHERE child.uid = stock.uid AND child.parent_uid = catalog.uid AND stock.section_uid=catalog.category_uid AND stock.total_price < 0 AND <dtml-sqltest accounting_movement_list type=string column=child.portal_type op=eq multiple>) AS credit\n
</dtml-if>\n </dtml-if>\n
...@@ -325,6 +327,7 @@ destination_section_where_expression</string> </value> ...@@ -325,6 +327,7 @@ destination_section_where_expression</string> </value>
DISTINCT\n DISTINCT\n
delivery.start_date as operation_date\n delivery.start_date as operation_date\n
, delivery.destination_section_uid as delivery_mirror_section_uid\n , delivery.destination_section_uid as delivery_mirror_section_uid\n
, delivery.source_section_uid as delivery_own_section_uid\n
, \'source\' as section_mark\n , \'source\' as section_mark\n
, catalog.source_reference as specific_reference\n , catalog.source_reference as specific_reference\n
, catalog.*\n , catalog.*\n
...@@ -355,6 +358,7 @@ destination_section_where_expression</string> </value> ...@@ -355,6 +358,7 @@ destination_section_where_expression</string> </value>
stock, catalog as child, </dtml-if>\n stock, catalog as child, </dtml-if>\n
<dtml-if "section_category">category, catalog as section, </dtml-if>\n <dtml-if "section_category">category, catalog as section, </dtml-if>\n
<dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n
<dtml-if "delivery_own_section_title">delivery AS own_section_delivery, catalog AS own_section_catalog,</dtml-if>\n
catalog,\n catalog,\n
delivery\n delivery\n
\n \n
...@@ -420,6 +424,11 @@ destination_section_where_expression</string> </value> ...@@ -420,6 +424,11 @@ destination_section_where_expression</string> </value>
AND mirror_section_delivery.uid = catalog.uid\n AND mirror_section_delivery.uid = catalog.uid\n
AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
</dtml-if>\n </dtml-if>\n
<dtml-if "delivery_own_section_title">\n
AND own_section_catalog.uid = own_section_delivery.source_section_uid\n
AND own_section_delivery.uid = catalog.uid\n
AND <dtml-sqltest delivery_own_section_title type=string op=like column=own_section_catalog.title>\n
</dtml-if>\n
\n \n
<dtml-if from_date>\n <dtml-if from_date>\n
AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n AND delivery.start_date >= <dtml-sqlvar from_date type="datetime">\n
...@@ -513,6 +522,7 @@ UNION\n ...@@ -513,6 +522,7 @@ UNION\n
DISTINCT\n DISTINCT\n
delivery.stop_date as operation_date\n delivery.stop_date as operation_date\n
, delivery.source_section_uid as delivery_mirror_section_uid\n , delivery.source_section_uid as delivery_mirror_section_uid\n
, delivery.destination_section_uid as delivery_own_section_uid\n
, \'destination\' as section_mark\n , \'destination\' as section_mark\n
, catalog.destination_reference as specific_reference\n , catalog.destination_reference as specific_reference\n
, catalog.*\n , catalog.*\n
...@@ -543,6 +553,7 @@ UNION\n ...@@ -543,6 +553,7 @@ UNION\n
stock, catalog as child, </dtml-if>\n stock, catalog as child, </dtml-if>\n
<dtml-if "section_category">category, catalog as section, </dtml-if>\n <dtml-if "section_category">category, catalog as section, </dtml-if>\n
<dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n <dtml-if "delivery_mirror_section_title">delivery AS mirror_section_delivery, catalog AS mirror_section_catalog,</dtml-if>\n
<dtml-if "delivery_own_section_title">delivery AS own_section_delivery, catalog AS own_section_catalog,</dtml-if>\n
catalog,\n catalog,\n
delivery\n delivery\n
\n \n
...@@ -608,6 +619,11 @@ UNION\n ...@@ -608,6 +619,11 @@ UNION\n
AND mirror_section_delivery.uid = catalog.uid\n AND mirror_section_delivery.uid = catalog.uid\n
AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n AND <dtml-sqltest delivery_mirror_section_title type=string op=like column=mirror_section_catalog.title>\n
</dtml-if>\n </dtml-if>\n
<dtml-if "delivery_own_section_title">\n
AND own_section_catalog.uid = own_section_delivery.destination_section_uid\n
AND own_section_delivery.uid = catalog.uid\n
AND <dtml-sqltest delivery_own_section_title type=string op=like column=own_section_catalog.title>\n
</dtml-if>\n
\n \n
<dtml-if from_date>\n <dtml-if from_date>\n
AND delivery.stop_date >= <dtml-sqlvar from_date type="datetime">\n AND delivery.stop_date >= <dtml-sqlvar from_date type="datetime">\n
......
...@@ -146,7 +146,10 @@ for line in line_list:\n ...@@ -146,7 +146,10 @@ for line in line_list:\n
if plan:\n if plan:\n
reversal.plan()\n reversal.plan()\n
\n \n
return reversal.Base_redirect(\'view\',\n if batch:\n
return reversal\n
else:\n
return reversal.Base_redirect(\'view\',\n
keep_items=dict(portal_status_message=\n keep_items=dict(portal_status_message=\n
Base_translateString("Reversal Transaction for ${specific_reference} created.",\n Base_translateString("Reversal Transaction for ${specific_reference} created.",\n
mapping={\'specific_reference\': specific_reference})))\n mapping={\'specific_reference\': specific_reference})))\n
...@@ -154,7 +157,7 @@ return reversal.Base_redirect(\'view\',\n ...@@ -154,7 +157,7 @@ return reversal.Base_redirect(\'view\',\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>cancellation_amount=False, date=None, plan=False, **kw</string> </value> <value> <string>cancellation_amount=False, date=None, plan=False, batch=False, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""Deletes all empty (ie. with balance == 0) lines in an accounting transaction\n
"""\n
from Products.ERP5Type.Message import translateString\n
lines_portal_type = context.getPortalAccountingMovementTypeList()\n
transaction = context.getObject()\n
transaction_lines = transaction.objectValues(portal_type=lines_portal_type)\n
id_to_delete_list = []\n
\n
for line in transaction_lines:\n
if line.getSourceInventoriatedTotalAssetPrice() or \\\n
line.getDestinationInventoriatedTotalAssetPrice() or \\\n
line.isSimulated():\n
continue\n
id_to_delete_list.append(line.getId())\n
\n
# Don\'t delete everything\n
if len(id_to_delete_list) != len(transaction_lines):\n
transaction.deleteContent(id_to_delete_list)\n
\n
if redirect:\n
context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" % (\n
transaction.absolute_url(), translateString(\'Empty lines deleted.\')))\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>redirect=0</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>AccountingTransaction_deleteEmptyLines</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -95,10 +95,18 @@ if multiple_sections:\n ...@@ -95,10 +95,18 @@ if multiple_sections:\n
else:\n else:\n
a((\'getSourceSectionTitle\', \'Third Party\'))\n a((\'getSourceSectionTitle\', \'Third Party\'))\n
if multiple_payment:\n if multiple_payment:\n
bank_account_display_method = \\\n
context.portal_preferences.getPreferredAccountingBankAccountDisplayMethod()\n
if source:\n if source:\n
a((\'getSourcePaymentReference\', \'Bank Account\'))\n if bank_account_display_method == \'bank_account_title\':\n
a((\'getSourcePaymentTitle\', \'Bank Account\'))\n
else:\n
a((\'getSourcePaymentReference\', \'Bank Account\'))\n
else:\n else:\n
a((\'getDestinationPaymentReference\', \'Bank Account\'))\n if bank_account_display_method == \'bank_account_title\':\n
a((\'getDestinationPaymentTitle\', \'Bank Account\'))\n
else:\n
a((\'getDestinationPaymentReference\', \'Bank Account\'))\n
if source:\n if source:\n
a((\'source_debit\', \'Debit\'))\n a((\'source_debit\', \'Debit\'))\n
a((\'source_credit\', \'Credit\'))\n a((\'source_credit\', \'Credit\'))\n
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>if brain is not None:\n
transaction = brain.getObject()\n
else:\n
transaction = context\n
\n
if transaction.AccountingTransaction_isSourceView():\n
own_section = transaction.getSourceSectionValue()\n
else:\n
own_section = transaction.getDestinationSectionValue()\n
\n
if own_section is not None:\n
return own_section.getTitle()\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>brain=None, selection=None, selection_name=None, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>AccountingTransaction_getOwnSectionTitle</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>base_category</string>
<string>portal_type</string>
<string>allow_creation</string> <string>allow_creation</string>
<string>base_category</string>
<string>catalog_index</string> <string>catalog_index</string>
<string>columns</string> <string>columns</string>
<string>portal_type</string>
<string>proxy_listbox_ids</string> <string>proxy_listbox_ids</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -156,6 +156,10 @@ ...@@ -156,6 +156,10 @@
<string>Accounting Transaction</string> <string>Accounting Transaction</string>
<string>Accounting Transaction</string> <string>Accounting Transaction</string>
</tuple> </tuple>
<tuple>
<string>Payment Transaction</string>
<string>Payment Transaction</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
<string>my_preferred_accounting_section_category_strict</string> <string>my_preferred_accounting_section_category_strict</string>
<string>my_preferred_accounting_transaction_source_section</string> <string>my_preferred_accounting_transaction_source_section</string>
<string>my_preferred_accounting_transaction_currency</string> <string>my_preferred_accounting_transaction_currency</string>
<string>my_preferred_accounting_bank_account_display_method</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -70,8 +70,9 @@ container.validateTransaction(state_change)\n ...@@ -70,8 +70,9 @@ container.validateTransaction(state_change)\n
\n \n
# Check that all lines uses open accounts, and doesn\'t use invalid third\n # Check that all lines uses open accounts, and doesn\'t use invalid third\n
# parties or bank accounts\n # parties or bank accounts\n
for line in transaction.contentValues(filter=dict(\n transaction_lines = transaction.objectValues(portal_type=transaction.getPortalAccountingMovementTypeList())\n
portal_type=transaction.getPortalAccountingMovementTypeList())):\n id_to_delete_list = []\n
for line in transaction_lines:\n
\n \n
for account, third_party, bank_account in (\n for account, third_party, bank_account in (\n
( line.getSourceValue(portal_type=\'Account\'),\n ( line.getSourceValue(portal_type=\'Account\'),\n
...@@ -102,7 +103,7 @@ for line in transaction.contentValues(filter=dict(\n ...@@ -102,7 +103,7 @@ for line in transaction.contentValues(filter=dict(\n
mapping=dict(bank_account_reference=unicode(\n mapping=dict(bank_account_reference=unicode(\n
bank_account.getReference(), \'utf8\')))\n bank_account.getReference(), \'utf8\')))\n
\n \n
if account is not None:\n if account is not None and account.isMemberOf(\'account_type/asset/cash/bank\'):\n
# also check that currencies are consistent if we use this quantity for\n # also check that currencies are consistent if we use this quantity for\n
# accounting.\n # accounting.\n
bank_account_currency = bank_account.getProperty(\'price_currency\')\n bank_account_currency = bank_account.getProperty(\'price_currency\')\n
...@@ -139,9 +140,17 @@ for line in transaction.contentValues(filter=dict(\n ...@@ -139,9 +140,17 @@ for line in transaction.contentValues(filter=dict(\n
line.getDestinationInventoriatedTotalAssetDebit())):\n line.getDestinationInventoriatedTotalAssetDebit())):\n
raise ValidationFailed(translateString(\n raise ValidationFailed(translateString(\n
"Destination conversion should not be set."))\n "Destination conversion should not be set."))\n
\n
if line.getSourceInventoriatedTotalAssetPrice() or \\\n
line.getDestinationInventoriatedTotalAssetPrice() or \\\n
line.isSimulated():\n
continue\n
id_to_delete_list.append(line.getId())\n
\n \n
# Delete empty lines\n # Delete empty lines\n
transaction.AccountingTransaction_deleteEmptyLines(redirect=0)\n # Don\'t delete everything\n
if len(id_to_delete_list) != len(transaction_lines):\n
transaction.deleteContent(id_to_delete_list)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
2011-12-16 arnaud.fontaine
* Display "Own Section" along "Third Party" in AccountingTransactionModule_viewAccountingTransactionList.
2011-12-12 arnaud.fontaine
* Display thousand separator of currency fields according to 'Money Quantity Style' user preference.
2011-10-12 tatuya
* Make it selectable in Accounting Preference how to display bank account.
2011-04-04 Kazuhiko 2011-04-04 Kazuhiko
* configure searchable text property ids for Accounting Period, Accounting Transaction, Balance Transaction, Internal Invoice Transaction, Payment Transaction, Purchase Invoice Transaction and Sale Invoice Transaction. * configure searchable text property ids for Accounting Period, Accounting Transaction, Balance Transaction, Internal Invoice Transaction, Payment Transaction, Purchase Invoice Transaction and Sale Invoice Transaction.
......
1466 1475
\ No newline at end of file \ No newline at end of file
57 58
\ No newline at end of file \ No newline at end of file
...@@ -70,8 +70,9 @@ container.validateTransaction(state_change)\n ...@@ -70,8 +70,9 @@ container.validateTransaction(state_change)\n
\n \n
# Check that all lines uses open accounts, and doesn\'t use invalid third\n # Check that all lines uses open accounts, and doesn\'t use invalid third\n
# parties or bank accounts\n # parties or bank accounts\n
for line in transaction.contentValues(filter=dict(\n transaction_lines = transaction.objectValues(portal_type=transaction.getPortalAccountingMovementTypeList())\n
portal_type=transaction.getPortalAccountingMovementTypeList())):\n id_to_delete_list = []\n
for line in transaction_lines:\n
\n \n
for account, third_party, bank_account in (\n for account, third_party, bank_account in (\n
( line.getSourceValue(portal_type=\'Account\'),\n ( line.getSourceValue(portal_type=\'Account\'),\n
...@@ -139,9 +140,17 @@ for line in transaction.contentValues(filter=dict(\n ...@@ -139,9 +140,17 @@ for line in transaction.contentValues(filter=dict(\n
line.getDestinationInventoriatedTotalAssetDebit())):\n line.getDestinationInventoriatedTotalAssetDebit())):\n
raise ValidationFailed(translateString(\n raise ValidationFailed(translateString(\n
"Destination conversion should not be set."))\n "Destination conversion should not be set."))\n
\n
if line.getSourceInventoriatedTotalAssetPrice() or \\\n
line.getDestinationInventoriatedTotalAssetPrice() or \\\n
line.isSimulated():\n
continue\n
id_to_delete_list.append(line.getId())\n
\n \n
# Delete empty lines\n # Delete empty lines\n
transaction.AccountingTransaction_deleteEmptyLines(redirect=0)\n # Don\'t delete everything\n
if len(id_to_delete_list) != len(transaction_lines):\n
transaction.deleteContent(id_to_delete_list)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
5 6
\ No newline at end of file \ No newline at end of file
...@@ -100,6 +100,8 @@ ...@@ -100,6 +100,8 @@
<string>my_translated_causality_state_title</string> <string>my_translated_causality_state_title</string>
<string>my_translated_simulation_state_title</string> <string>my_translated_simulation_state_title</string>
<string>my_price</string> <string>my_price</string>
<string>my_view_mode_listbox_read_only_stop_date</string>
<string>my_view_mode_listbox_read_only_start_date</string>
</list> </list>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_listbox_read_only_start_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_date_time_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Invoice Date</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_listbox_read_only_stop_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_date_time_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Invoice Date</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -59,9 +59,6 @@ ...@@ -59,9 +59,6 @@
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
<value> <value>
<list> <list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string> <string>bottom</string>
<string>hidden</string> <string>hidden</string>
</list> </list>
...@@ -79,28 +76,12 @@ ...@@ -79,28 +76,12 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list/> <list>
</value> <string>listbox_delivery_stop_date</string>
</item> </list>
<item>
<key> <string>left</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value> </value>
</item> </item>
</dictionary> </dictionary>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<value> <value>
<list> <list>
<string>columns</string> <string>columns</string>
<string>editable_columns</string>
<string>search_columns</string> <string>search_columns</string>
<string>selection_name</string> <string>selection_name</string>
<string>sort</string> <string>sort</string>
...@@ -85,15 +86,15 @@ ...@@ -85,15 +86,15 @@
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_section_title</string> <string>destination_section_title</string>
<string>Client</string> <string>Client</string>
</tuple> </tuple>
<tuple> <tuple>
<string>destination_section_title</string> <string>source_section_title</string>
<string>Supplier</string> <string>Supplier</string>
</tuple> </tuple>
<tuple> <tuple>
<string>delivery.start_date</string> <string>delivery.stop_date</string>
<string>Invoice Date</string> <string>Invoice Date</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -107,6 +108,17 @@ ...@@ -107,6 +108,17 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
<string>delivery.stop_date</string>
<string>Invoice Date</string>
</tuple>
</list>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_list_mode_listbox</string> </value> <value> <string>my_list_mode_listbox</string> </value>
...@@ -124,15 +136,15 @@ ...@@ -124,15 +136,15 @@
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_section_title</string> <string>destination_section_title</string>
<string>Client</string> <string>Client</string>
</tuple> </tuple>
<tuple> <tuple>
<string>destination_section_title</string> <string>source_section_title</string>
<string>Supplier</string> <string>Supplier</string>
</tuple> </tuple>
<tuple> <tuple>
<string>delivery.start_date</string> <string>delivery.stop_date</string>
<string>Invoice Date</string> <string>Invoice Date</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -155,7 +167,7 @@ ...@@ -155,7 +167,7 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>delivery.start_date</string> <string>delivery.stop_date</string>
<string>ASC</string> <string>ASC</string>
</tuple> </tuple>
</list> </list>
...@@ -170,15 +182,15 @@ ...@@ -170,15 +182,15 @@
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_section_title</string> <string>destination_section_title</string>
<string>Client</string> <string>Client</string>
</tuple> </tuple>
<tuple> <tuple>
<string>destination_section_title</string> <string>source_section_title</string>
<string>Supplier</string> <string>Supplier</string>
</tuple> </tuple>
<tuple> <tuple>
<string>delivery.start_date</string> <string>delivery.stop_date</string>
<string>Invoice Date</string> <string>Invoice Date</string>
</tuple> </tuple>
<tuple> <tuple>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_delivery_stop_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_listbox_read_only_stop_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewAdvancedInvoicingFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -59,9 +59,6 @@ ...@@ -59,9 +59,6 @@
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
<value> <value>
<list> <list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string> <string>bottom</string>
<string>hidden</string> <string>hidden</string>
</list> </list>
...@@ -79,28 +76,12 @@ ...@@ -79,28 +76,12 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list/> <list>
</value> <string>listbox_delivery_start_date</string>
</item> </list>
<item>
<key> <string>left</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value> </value>
</item> </item>
</dictionary> </dictionary>
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<value> <value>
<list> <list>
<string>columns</string> <string>columns</string>
<string>editable_columns</string>
<string>search_columns</string> <string>search_columns</string>
<string>selection_name</string> <string>selection_name</string>
<string>sort</string> <string>sort</string>
...@@ -107,6 +108,17 @@ ...@@ -107,6 +108,17 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
<string>delivery.start_date</string>
<string>Invoice Date</string>
</tuple>
</list>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_list_mode_listbox</string> </value> <value> <string>my_list_mode_listbox</string> </value>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_delivery_start_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_listbox_read_only_start_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewAdvancedInvoicingFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
2011-12-06 arnaud.fontaine
* Fix inverted Supplier and Client columns labels.
2011-11-22 yusei
* Stop showing detailed DateTime in listbox. This problem started occur due to recent specification change of zope's DateTime.
2010-11-04 tatuya 2010-11-04 tatuya
* Fix stop_action on invoice_workflow. The settings were missing. * Fix stop_action on invoice_workflow. The settings were missing.
......
100 102
\ No newline at end of file \ No newline at end of file
...@@ -77,6 +77,7 @@ if len(payment_uid_list):\n ...@@ -77,6 +77,7 @@ if len(payment_uid_list):\n
\n \n
inventory_module = context.getPortalObject().archive_inventory_module\n inventory_module = context.getPortalObject().archive_inventory_module\n
node_inventory_dict = {}\n node_inventory_dict = {}\n
activate_kw = {"tag": tag}\n
for inventory in node_inventory_list:\n for inventory in node_inventory_list:\n
# Do only one inventory per node\n # Do only one inventory per node\n
if not node_inventory_dict.has_key(inventory.node_relative_url):\n if not node_inventory_dict.has_key(inventory.node_relative_url):\n
...@@ -84,22 +85,22 @@ for inventory in node_inventory_list:\n ...@@ -84,22 +85,22 @@ for inventory in node_inventory_list:\n
inv = inventory_module.newContent(portal_type="Archive Inventory",\n inv = inventory_module.newContent(portal_type="Archive Inventory",\n
destination=inventory.node_relative_url,\n destination=inventory.node_relative_url,\n
start_date = date,\n start_date = date,\n
activate_kw = {"tag" : tag},\n activate_kw = activate_kw,\n
reindex_kw = {"sql_catalog_id" : destination_sql_catalog_id})\n reindex_kw = {"sql_catalog_id" : destination_sql_catalog_id})\n
node_inventory_dict[inventory.node_relative_url] = inv\n node_inventory_dict[inventory.node_relative_url] = inv\n
else:\n else:\n
inv = node_inventory_dict[inventory.node_relative_url]\n inv = node_inventory_dict[inventory.node_relative_url]\n
\n \n
inv.setDefaultActivateParameters(tag=tag)\n inv.setDefaultActivateParameterDict(activate_kw)\n
inv.setDefaultReindexParameters(sql_catalog_id=destination_sql_catalog_id)\n inv.setDefaultReindexParameterDict(dict(sql_catalog_id=destination_sql_catalog_id))\n
# Create one line per resource\n # Create one line per resource\n
inv_line = inv.newContent(portal_type = "Archive Inventory Line",\n inv_line = inv.newContent(portal_type = "Archive Inventory Line",\n
resource=inventory.resource_relative_url,\n resource=inventory.resource_relative_url,\n
destination_section=inventory.section_relative_url,\n destination_section=inventory.section_relative_url,\n
activate_kw = {"tag" : tag},\n activate_kw = activate_kw,\n
reindex_kw = {"sql_catalog_id" : destination_sql_catalog_id})\n reindex_kw = {"sql_catalog_id" : destination_sql_catalog_id})\n
inv_line.setDefaultActivateParameters(tag=tag)\n inv_line.setDefaultActivateParameterDict(activate_kw)\n
inv_line.setDefaultReindexParameters(sql_catalog_id=destination_sql_catalog_id)\n inv_line.setDefaultReindexParameterDict(dict(sql_catalog_id=destination_sql_catalog_id))\n
# This is a hack so that price is now and not at reindexing part\n # This is a hack so that price is now and not at reindexing part\n
inv_line.getPrice()\n inv_line.getPrice()\n
\n \n
...@@ -118,7 +119,7 @@ for inventory in node_inventory_list:\n ...@@ -118,7 +119,7 @@ for inventory in node_inventory_list:\n
inv_line.setVariationCategoryList(variation_category_list)\n inv_line.setVariationCategoryList(variation_category_list)\n
context.log("construct cell", "base %s, %s" %(base_category_list,variation_category_list))\n context.log("construct cell", "base %s, %s" %(base_category_list,variation_category_list))\n
base_id = "movement"\n base_id = "movement"\n
line_kwd = {\'base_id\':base_id, "activate_kw":{"tag":tag}}\n line_kwd = {\'base_id\':base_id, "activate_kw": activate_kw}\n
inv_line.updateCellRange(script_id=\'CashDetail_asCellRange\', base_id=base_id)\n inv_line.updateCellRange(script_id=\'CashDetail_asCellRange\', base_id=base_id)\n
# create cell\n # create cell\n
cell_range_key_list = inv_line.getCellRangeKeyList(base_id=base_id)\n cell_range_key_list = inv_line.getCellRangeKeyList(base_id=base_id)\n
...@@ -126,8 +127,8 @@ for inventory in node_inventory_list:\n ...@@ -126,8 +127,8 @@ for inventory in node_inventory_list:\n
for k in cell_range_key_list:\n for k in cell_range_key_list:\n
category_list = filter(lambda k_item: k_item is not None, k)\n category_list = filter(lambda k_item: k_item is not None, k)\n
cell = inv_line.newCell(*k, **line_kwd)\n cell = inv_line.newCell(*k, **line_kwd)\n
cell.setDefaultActivateParameters(tag=tag)\n cell.setDefaultActivateParameterDict(activate_kw)\n
cell.setDefaultReindexParameters(sql_catalog_id=destination_sql_catalog_id)\n cell.setDefaultReindexParameterDict(dict(sql_catalog_id=destination_sql_catalog_id))\n
\n \n
mapped_value_list = [\'price\', \'quantity\']\n mapped_value_list = [\'price\', \'quantity\']\n
cell.edit( membership_criterion_category_list = category_list\n cell.edit( membership_criterion_category_list = category_list\n
...@@ -141,8 +142,8 @@ for inventory in node_inventory_list:\n ...@@ -141,8 +142,8 @@ for inventory in node_inventory_list:\n
\n \n
# deliver all inventory\n # deliver all inventory\n
for inv in node_inventory_dict.values(): \n for inv in node_inventory_dict.values(): \n
inv.setDefaultActivateParameters(tag=tag)\n inv.setDefaultActivateParameterDict(activate_kw)\n
inv.setDefaultReindexParameters(sql_catalog_id=destination_sql_catalog_id)\n inv.setDefaultReindexParameterDict(dict(sql_catalog_id=destination_sql_catalog_id))\n
inv.deliver()\n inv.deliver()\n
\n \n
\n \n
...@@ -158,22 +159,22 @@ for inventory in payment_inventory_list:\n ...@@ -158,22 +159,22 @@ for inventory in payment_inventory_list:\n
destination=inventory.node_relative_url,\n destination=inventory.node_relative_url,\n
destination_payment_uid=inventory.payment_uid,\n destination_payment_uid=inventory.payment_uid,\n
start_date = date,\n start_date = date,\n
activate_kw = {"tag" : tag},\n activate_kw = activate_kw,\n
reindex_kw = {"sql_catalog_id" : destination_sql_catalog_id})\n reindex_kw = {"sql_catalog_id" : destination_sql_catalog_id})\n
payment_inventory_dict[inventory.payment_uid] = inv\n payment_inventory_dict[inventory.payment_uid] = inv\n
else:\n else:\n
inv = payment_inventory_dict[inventory.payment_uid]\n inv = payment_inventory_dict[inventory.payment_uid]\n
\n \n
inv.setDefaultActivateParameters(tag=tag)\n inv.setDefaultActivateParameterDict(activate_kw)\n
inv.setDefaultReindexParameters(sql_catalog_id=destination_sql_catalog_id)\n inv.setDefaultReindexParameterDict(dict(sql_catalog_id=destination_sql_catalog_id))\n
# Create one line per resource\n # Create one line per resource\n
inv_line = inv.newContent(portal_type = "Archive Inventory Line",\n inv_line = inv.newContent(portal_type = "Archive Inventory Line",\n
resource=inventory.resource_relative_url,\n resource=inventory.resource_relative_url,\n
destination_section=inventory.section_relative_url,\n destination_section=inventory.section_relative_url,\n
activate_kw = {"tag" : tag},\n activate_kw = activate_kw,\n
reindex_kw = {"sql_catalog_id" : destination_sql_catalog_id})\n reindex_kw = {"sql_catalog_id" : destination_sql_catalog_id})\n
inv_line.setDefaultActivateParameters(tag=tag)\n inv_line.setDefaultActivateParameterDict(activate_kw)\n
inv_line.setDefaultReindexParameters(sql_catalog_id=destination_sql_catalog_id)\n inv_line.setDefaultReindexParameterDict(dict(sql_catalog_id=destination_sql_catalog_id))\n
inv_line.edit(quantity=inventory.total_quantity)\n inv_line.edit(quantity=inventory.total_quantity)\n
# This is a hack so that price is now and not at reindexing part\n # This is a hack so that price is now and not at reindexing part\n
inv_line.getPrice()\n inv_line.getPrice()\n
...@@ -181,8 +182,8 @@ for inventory in payment_inventory_list:\n ...@@ -181,8 +182,8 @@ for inventory in payment_inventory_list:\n
\n \n
# deliver all inventory\n # deliver all inventory\n
for inv in payment_inventory_dict.values(): \n for inv in payment_inventory_dict.values(): \n
inv.setDefaultActivateParameters(tag=tag)\n inv.setDefaultActivateParameterDict(activate_kw)\n
inv.setDefaultReindexParameters(sql_catalog_id=destination_sql_catalog_id)\n inv.setDefaultReindexParameterDict(dict(sql_catalog_id=destination_sql_catalog_id))\n
inv.deliver()\n inv.deliver()\n
......
95 96
\ No newline at end of file \ No newline at end of file
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<key> <string>permissions</string> </key> <key> <string>permissions</string> </key>
<value> <value>
<tuple> <tuple>
<string>Modify portal content</string> <string>View</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Alarm" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>active_sense_method_id</string> </key>
<value> <string>SystemEventModule_expireAuthenticationEventList</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>expire_authentication_events</string> </value>
</item>
<item>
<key> <string>periodicity_day_frequency</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>periodicity_hour</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>periodicity_minute</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>periodicity_minute_frequency</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>periodicity_month</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>periodicity_month_day</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>periodicity_start_date</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1309996800.0</float>
<string>GMT</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>periodicity_week</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Alarm</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Expire old Authentication Events</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<property_sheet_list>
<portal_type id="Person">
<item>LoginAccountProvider</item>
</portal_type>
</property_sheet_list>
\ No newline at end of file
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>The number of authentication failures an user is allowed to make before being blocked into the system.</string> </value> <value> <string>The number of authentication failures an user is allowed to make before being blocked by the system.</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>The time interval ( (in hours) before real password expire happens. During it interval an warning will be shown to user after every successful login.</string> </value> <value> <string>The time interval ( (in hours) before real password expire happens. During it an warning will be shown to user after every successful log in.</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>If selected will make sure that any part of user\'s name (i.e. first and / or last name) are not contained in password.</string> </value> <value> <string>If selected will make sure that any part of user\'s name (i.e. first and / or last name) is not contained in password.</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Property Sheet" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Login Account Provider</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>LoginAccountProvider</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>2</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Property Sheet</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/lines</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Return list of last used passwords.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>last_changed_password_value_property</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: []</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/date</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Store last password modification date.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>last_password_modification_date_property</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -50,9 +50,7 @@ ...@@ -50,9 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>"""\n
"""\n
Form validator which will check if password is valid for the user.\n Form validator which will check if password is valid for the user.\n
"""\n """\n
from Products.ERP5Type.Document import newTempBase\n from Products.ERP5Type.Document import newTempBase\n
...@@ -69,11 +67,12 @@ message_dict = { 0: \'Unknown error\',\n ...@@ -69,11 +67,12 @@ message_dict = { 0: \'Unknown error\',\n
\n \n
def doValidation(person, password):\n def doValidation(person, password):\n
# raise so Formulator shows proper message\n # raise so Formulator shows proper message\n
result = person.Person_isPasswordValid(password)\n result_code_list = person.Person_analyzePassword(password)\n
if result<=0:\n if result_code_list!=[]:\n
message = context.Base_translateString(message_dict[result])\n translateString = context.Base_translateString\n
message = \' \'.join([translateString(message_dict[x]) for x in result_code_list])\n
raise ValidationError(\'external_validator_failed\', context, error_text=message)\n raise ValidationError(\'external_validator_failed\', context, error_text=message)\n
return result\n return 1\n
\n \n
user_login = request.get(\'field_user_login\', None)\n user_login = request.get(\'field_user_login\', None)\n
# find Person object (or authenticated member) and validate it on it (password recovered for an existing account)\n # find Person object (or authenticated member) and validate it on it (password recovered for an existing account)\n
...@@ -90,9 +89,7 @@ kw = {\'title\': \'%s %s\' %(first_name, last_name),\n ...@@ -90,9 +89,7 @@ kw = {\'title\': \'%s %s\' %(first_name, last_name),\n
person = newTempBase(portal, kw[\'title\'], **kw)\n person = newTempBase(portal, kw[\'title\'], **kw)\n
\n \n
return doValidation(person, password)\n return doValidation(person, password)\n
</string> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
"""\n
Returns if password is valid or not. \n
If not valid return a negative code to indicate failure.\n
"""\n
from Products.Formulator.Errors import ValidationError\n
from DateTime import DateTime\n
import re\n
\n
MARKER = [\'\', None]\n
\n
portal = context.getPortalObject()\n
request = context.REQUEST\n
is_temp_object = context.isTempObject()\n
result_code_list = []\n
min_password_length = portal.portal_preferences.getPreferredMinPasswordLength()\n
\n
if password is None:\n
# means simply that password will be reseted in this case \n
# it\'s a valid value (i.e. it\'s job of form validation yo handle this in UI appropriately)\n
return []\n
\n
# not long enough\n
if min_password_length is not None:\n
if len(password) < min_password_length:\n
result_code_list.append(-1)\n
\n
# password contain X out of following Y regular expression groups ?\n
regular_expression_list = portal.portal_preferences.getPreferredRegularExpressionGroupList()\n
min_regular_expression_group_number = portal.portal_preferences.getPreferredMinRegularExpressionGroupNumber()\n
if regular_expression_list:\n
group_counter = 0\n
for re_expr in regular_expression_list:\n
mo = re.search(re_expr, password)\n
if mo is not None and len(mo.groups()):\n
group_counter+=1\n
#context.log(\'%s %s %s %s\' %(password, group_counter, min_regular_expression_group_number, regular_expression_list))\n
if group_counter < min_regular_expression_group_number:\n
# not enough groups match\n
result_code_list.append(-2)\n
\n
if not is_temp_object:\n
# not changed in last period ?\n
now = DateTime()\n
one_hour = 1/24.0\n
min_password_lifetime_duration = portal.portal_preferences.getPreferredMinPasswordLifetimeDuration()\n
#last_password_modification_date = context.getLastPasswordModificationDate()\n
last_password_modification_date = None\n
last_password_event = portal.portal_catalog.getResultValue(\n
portal_type = \'Password Event\',\n
default_destination_uid = context.getUid(),\n
validation_state = \'confirmed\',\n
sort_on = ((\'creation_date\', \'DESC\',),))\n
if last_password_event is not None:\n
last_password_modification_date = last_password_event.getCreationDate()\n
\n
if last_password_modification_date is not None and \\\n
min_password_lifetime_duration is not None and \\\n
(last_password_modification_date + min_password_lifetime_duration*one_hour) > now:\n
# too early to change password\n
result_code_list.append(-3)\n
\n
# not already used before ?\n
preferred_number_of_last_password_to_check = portal.portal_preferences.getPreferredNumberOfLastPasswordToCheck()\n
if preferred_number_of_last_password_to_check not in [None, 0]:\n
if context.isPasswordAlreadyUsed(password):\n
result_code_list.append(-4)\n
\n
# not contain the full name of the user in password or any parts of it (i.e. last and / or first name)\n
if portal.portal_preferences.isPrefferedForceUsernameCheckInPassword():\n
lower_password = password.lower()\n
if not is_temp_object:\n
# real object\n
first_name = context.getFirstName()\n
last_name = context.getLastName()\n
else:\n
# temporary object\n
first_name = getattr(context, \'first_name\', None)\n
last_name = getattr(context, \'last_name\', None)\n
\n
if first_name not in MARKER:\n
first_name = first_name.lower()\n
if last_name not in MARKER:\n
last_name = last_name.lower()\n
\n
if (first_name not in MARKER and first_name in lower_password) or \\\n
(last_name not in MARKER and last_name in lower_password):\n
# user\'s name must not be contained in password\n
result_code_list.append(-5)\n
\n
return result_code_list\n
]]></string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>password, request={}</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Person_analyzePassword</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
Get authentication session Id.\n
"""\n
return \'__authentication_session_%s\' %context.getReference()\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Person_getAuthenticationSessionId</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
Used to generate an URL to person object in a listbox.\n
"""\n
return brain.url\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>brain, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Person_getListboxUrl</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
"""\n """\n
Return true if user account is blocked.\n Return true if user account is blocked.\n
"""\n """\n
\n
from DateTime import DateTime\n from DateTime import DateTime\n
from Products.ZSQLCatalog.SQLCatalog import Query\n
\n \n
request = context.REQUEST\n request = context.REQUEST\n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
...@@ -68,26 +68,37 @@ if not portal_preferences.isAuthenticationPolicyEnabled():\n ...@@ -68,26 +68,37 @@ if not portal_preferences.isAuthenticationPolicyEnabled():\n
\n \n
now = DateTime()\n now = DateTime()\n
one_second = 1/24.0/60.0/60.0\n one_second = 1/24.0/60.0/60.0\n
key = \'authentication_failure_list\'\n
session_id = context.Person_getAuthenticationSessionId()\n
# session might not be initialized yet\n
session = portal.portal_sessions[session_id]\n
authentication_failure_list = session.get(key, [])\n
\n
check_duration = portal_preferences.getPreferredAuthenticationFailureCheckDuration()\n check_duration = portal_preferences.getPreferredAuthenticationFailureCheckDuration()\n
block_duration = portal_preferences.getPreferredAuthenticationFailureBlockDuration()\n block_duration = portal_preferences.getPreferredAuthenticationFailureBlockDuration()\n
max_authentication_failures = portal_preferences.getPreferredMaxAuthenticationFailure()\n max_authentication_failures = portal_preferences.getPreferredMaxAuthenticationFailure()\n
\n
check_time = now - check_duration*one_second\n check_time = now - check_duration*one_second\n
failures_for_period = [x for x in authentication_failure_list if x >= check_time]\n
\n \n
#context.log(\'%s %s %s\' %(authentication_failure_list, failures_for_period, max_authentication_failures))\n # some failures might be still unindexed\n
if len(failures_for_period)>= max_authentication_failures:\n tag = \'authentication_event_%s\' %context.getReference()\n
# block login as too many authentication failure for given time interval back\n unindexed_failures = portal.portal_activities.countMessageWithTag(tag)\n
block_timeout = failures_for_period[-1] + block_duration*one_second\n \n
#context.log(\'check=%s block=%s release=%s-> %s\' %(check_duration, block_duration, block_timeout, failures_for_period))\n if unindexed_failures >= max_authentication_failures:\n
if block_timeout > now:\n # no need to check further\n
context.log(\'block %s\' %context.getReference())\n return 1\n
\n
# some are already indexed\n
kw = {\'portal_type\': \'Authentication Event\',\n
\'default_destination_uid\': context.getUid(),\n
\'creation_date\': Query(creation_date = check_time,\n
range=\'min\'),\n
\'validation_state\' : \'confirmed\',\n
\'sort_on\' : ((\'creation_date\', \'ASC\',),),\n
\'limit\': max_authentication_failures\n
}\n
indexed_failure_list = portal.portal_catalog(**kw)\n
indexed_failures = len(indexed_failure_list)\n
\n
#context.log(\'== %s %s %s\' %(unindexed_failures, indexed_failures, max_authentication_failures))\n
if (indexed_failures + unindexed_failures) >= max_authentication_failures:\n
last_authentication_failure = indexed_failure_list[-1].getObject()\n
block_timeout = last_authentication_failure.getCreationDate() + block_duration*one_second\n
if block_timeout >= now:\n
#context.log(\'block %s\' %context.getReference())\n
request.set(\'is_user_account_blocked\', True)\n request.set(\'is_user_account_blocked\', True)\n
return 1\n return 1\n
\n \n
......
...@@ -67,29 +67,33 @@ def _isPasswordExpired():\n ...@@ -67,29 +67,33 @@ def _isPasswordExpired():\n
now = DateTime()\n now = DateTime()\n
max_password_lifetime_duration = portal.portal_preferences.getPreferredMaxPasswordLifetimeDuration()\n max_password_lifetime_duration = portal.portal_preferences.getPreferredMaxPasswordLifetimeDuration()\n
password_lifetime_expire_warning_duration = portal.portal_preferences.getPreferredPasswordLifetimeExpireWarningDuration()\n password_lifetime_expire_warning_duration = portal.portal_preferences.getPreferredPasswordLifetimeExpireWarningDuration()\n
last_password_modification_date = context.getLastPasswordModificationDate()\n last_password_event = portal.portal_catalog.getResultValue(\n
early_warning = 0 #False\n portal_type = \'Password Event\',\n
if last_password_modification_date is not None:\n default_destination_uid = context.getUid(),\n
validation_state = \'confirmed\',\n
sort_on = ((\'creation_date\', \'DESC\',),))\n
expire_date_warning = 0 \n
if last_password_event is not None:\n
last_password_modification_date = last_password_event.getCreationDate()\n
expire_date = last_password_modification_date + max_password_lifetime_duration*one_hour \n expire_date = last_password_modification_date + max_password_lifetime_duration*one_hour \n
if password_lifetime_expire_warning_duration not in (0, None,):\n if password_lifetime_expire_warning_duration not in (0, None,):\n
# calculate early warning period\n # calculate early warning period\n
#context.log( \'%s %s\' %(now, (expire_date - password_lifetime_expire_warning_duration*one_hour)))\n if now > expire_date - password_lifetime_expire_warning_duration*one_hour and \\\n
if now > expire_date - password_lifetime_expire_warning_duration*one_hour \\\n expire_date > now:\n
and expire_date > now:\n expire_date_warning = expire_date\n
early_warning = int(round((expire_date - now))) # return number of hours till expire password moment\n
if expire_date < now:\n if expire_date < now:\n
# password is expired\n # password is expired\n
#context.log(\'expired %s\' %context.getReference())\n #context.log(\'expired %s\' %context.getReference())\n
return True, early_warning\n return True, expire_date_warning\n
return False, early_warning\n return False, expire_date_warning\n
\n \n
_isPasswordExpired = CachingMethod(_isPasswordExpired,\n _isPasswordExpired = CachingMethod(_isPasswordExpired,\n
id=\'Person_isPasswordExpired\',\n id=\'Person_isPasswordExpired_%s\' %context.getReference(),\n
cache_factory=\'erp5_content_short\')\n cache_factory=\'erp5_content_short\')\n
is_password_expired, is_user_account_password_expired_warning_on = _isPasswordExpired()\n is_password_expired, expire_date = _isPasswordExpired()\n
\n \n
request.set(\'is_user_account_password_expired\', is_password_expired)\n request.set(\'is_user_account_password_expired\', is_password_expired)\n
request.set(\'is_user_account_password_expired_warning_on\', is_user_account_password_expired_warning_on)\n request.set(\'is_user_account_password_expired_expire_date\', expire_date)\n
\n \n
return is_password_expired\n return is_password_expired\n
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
"""\n
Returns if password is valid or not. \n
If not valid return a negative code to indicate failure.\n
"""\n
from Products.Formulator.Errors import ValidationError\n
from DateTime import DateTime\n
import re\n
\n
MARKER = [\'\', None]\n
\n
portal = context.getPortalObject()\n
request = context.REQUEST\n
is_temp_object = context.isTempObject()\n
min_password_length = portal.portal_preferences.getPreferredMinPasswordLength()\n
\n
# not long enough\n
if min_password_length is not None:\n
if len(password) < min_password_length:\n
return -1\n
\n
# password contain X out of following Y regular expression groups ?\n
regular_expression_list = portal.portal_preferences.getPreferredRegularExpressionGroupList()\n
min_regular_expression_group_number = portal.portal_preferences.getPreferredMinRegularExpressionGroupNumber()\n
if regular_expression_list:\n
group_counter = 0\n
for re_expr in regular_expression_list:\n
mo = re.search(re_expr, password)\n
if mo is not None and len(mo.groups()):\n
group_counter+=1\n
#context.log(\'%s %s %s %s\' %(password, group_counter, min_regular_expression_group_number, regular_expression_list))\n
if group_counter < min_regular_expression_group_number:\n
# not enough groups match\n
return -2\n
\n
if not is_temp_object:\n
# not changed in last period ?\n
now = DateTime()\n
one_hour = 1/24.0\n
min_password_lifetime_duration = portal.portal_preferences.getPreferredMinPasswordLifetimeDuration()\n
last_password_modification_date = context.getLastPasswordModificationDate()\n
if last_password_modification_date is not None and \\\n
min_password_lifetime_duration is not None and \\\n
(last_password_modification_date + min_password_lifetime_duration*one_hour) > now:\n
# too early to change password\n
return -3\n
\n
# not already used before ?\n
preferred_number_of_last_password_to_check = portal.portal_preferences.getPreferredNumberOfLastPasswordToCheck()\n
if preferred_number_of_last_password_to_check not in [None, 0]:\n
if context.isPasswordAlreadyUsed(password):\n
return -4\n
\n
# not contain the full name of the user in password or any parts of it (i.e. last and / or first name)\n
if portal.portal_preferences.isPrefferedForceUsernameCheckInPassword():\n
lower_password = password.lower()\n
if not is_temp_object:\n
# real object\n
first_name = context.getFirstName()\n
last_name = context.getLastName()\n
else:\n
# temporary object\n
first_name = getattr(context, \'first_name\', None)\n
last_name = getattr(context, \'last_name\', None)\n
\n
if first_name not in MARKER:\n
first_name = first_name.lower()\n
if last_name not in MARKER:\n
last_name = last_name.lower()\n
\n
if (first_name not in MARKER and first_name in lower_password) or \\\n
(last_name not in MARKER and last_name in lower_password):\n
# user\'s name must not be contained in password\n
return -5\n
\n
return 1\n
]]></string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>password, request={}</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Person_isPasswordValid</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -50,9 +50,7 @@ ...@@ -50,9 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>"""\n
"""\n
File a failed authentication attempt.\n File a failed authentication attempt.\n
"""\n """\n
from DateTime import DateTime\n from DateTime import DateTime\n
...@@ -63,32 +61,14 @@ if not portal_preferences.isAuthenticationPolicyEnabled():\n ...@@ -63,32 +61,14 @@ if not portal_preferences.isAuthenticationPolicyEnabled():\n
# no policy, no sense to file failure\n # no policy, no sense to file failure\n
return 0\n return 0\n
\n \n
key = \'authentication_failure_list\'\n activate_kw = {\'tag\': \'authentication_event_%s\' %context.getReference()}\n
session_id = context.Person_getAuthenticationSessionId()\n authentication_event = portal.system_event_module.newContent(\n
session = portal.portal_sessions[session_id]\n portal_type = "Authentication Event",\n
\n activate_kw = activate_kw)\n
if key not in session.keys():\n authentication_event.setDestinationValue(context)\n
# init it only once\n authentication_event.confirm()\n
session[key] = []\n return authentication_event\n
\n </string> </value>
authentication_failure_list = session[key]\n
authentication_failure_list.append(DateTime())\n
\n
# we care for only recent failures, no need to save all so purge old one\n
max_authentication_failures = portal.portal_preferences.getPreferredMaxAuthenticationFailure()\n
if len(authentication_failure_list)> max_authentication_failures:\n
authentication_failure_list.reverse()\n
authentication_failure_list = authentication_failure_list[0:max_authentication_failures]\n
authentication_failure_list.reverse()\n
\n
# update backend\n
session[key] = authentication_failure_list\n
\n
#context.log(\'notify login failure %s %s %s\' %(session_id, session, len(session[key])))\n
return session[key]\n
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
......
...@@ -50,24 +50,49 @@ ...@@ -50,24 +50,49 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query\n
\n
portal = context.getPortalObject()\n
portal_preferences = portal.portal_preferences\n
\n \n
if not portal.portal_preferences.isAuthenticationPolicyEnabled():\n if not portal.portal_preferences.isAuthenticationPolicyEnabled():\n
# no policy, no sense to block account\n # no policy, no sense to unblock account\n
return 0\n return 0\n
\n \n
key = \'authentication_failure_list\'\n now = DateTime()\n
session_id = context.Person_getAuthenticationSessionId()\n one_second = 1/24.0/60.0/60.0\n
session = portal.portal_sessions[session_id]\n check_duration = portal_preferences.getPreferredAuthenticationFailureCheckDuration()\n
session[key] = []\n block_duration = portal_preferences.getPreferredAuthenticationFailureBlockDuration()\n
max_authentication_failures = portal_preferences.getPreferredMaxAuthenticationFailure()\n
check_time = now - check_duration*one_second\n
\n
# acknowledge last authentication events for user\n
kw = {\'portal_type\': \'Authentication Event\',\n
\'default_destination_uid\': context.getUid(),\n
\'creation_date\': Query(creation_date = check_time,\n
range=\'min\'),\n
\'validation_state\' : \'confirmed\',\n
\'sort_on\' : ((\'creation_date\', \'ASC\',),),\n
}\n
\n
authentication_event_list = [x.getObject() for x in portal.portal_catalog(**kw)]\n
\n
for authentication_event in authentication_event_list:\n
authentication_event.activate().acknowledge(comment=\'User account unblocked.\')\n
\n
if not batch_mode:\n if not batch_mode:\n
message = context.Base_translateString(\'User Login unblocked.\')\n message = context.Base_translateString(\'User Login unblocked.\')\n
context.Base_redirect(form_id=form_id, keep_items={\'portal_status_message\': message})\n if cancel_url is None:\n
context.Base_redirect(form_id=form_id, keep_items={\'portal_status_message\': message})\n
else:\n
context.REQUEST.RESPONSE.redirect(\'%s?portal_status_message=%s\' %(cancel_url, message))\n
\n
return\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>form_id, batch_mode=False</string> </value> <value> <string>form_id="view", cancel_url=None, batch_mode=False</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
Expire old Authentication Events.\n
"""\n
from DateTime import DateTime\n
from Products.ZSQLCatalog.SQLCatalog import Query\n
from Products.ERP5Type.Document import newTempBase\n
\n
portal = context.getPortalObject()\n
portal_preferences = portal.portal_preferences\n
\n
now = DateTime()\n
one_second = 1/24.0/60.0/60.0\n
check_duration = portal_preferences.getPreferredAuthenticationFailureCheckDuration()\n
check_time = now - check_duration*one_second\n
\n
kw = {\'portal_type\': \'Authentication Event\',\n
\'creation_date\': Query(creation_date = check_time,\n
range=\'max\'),\n
\'validation_state\' : \'confirmed\'}\n
failure_list = portal.portal_catalog(**kw)\n
\n
for failure in failure_list:\n
tag = \'expire_%s\' %failure.getUid()\n
failure.activate(tag = tag).expire(comment=\'System expire.\')\n
failure.activate(after_tag = tag).reindexObject()\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SystemEventModule_expireAuthenticationEventList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
"""\n
Return list of blocked user logins in a \'listbox\' format\n
"""\n
from DateTime import DateTime\n
from Products.ZSQLCatalog.SQLCatalog import Query\n
from Products.ERP5Type.Document import newTempBase\n
\n
portal = context.getPortalObject()\n
portal_preferences = portal.portal_preferences\n
\n
blocked_user_login_list = []\n
all_blocked_user_login_dict = {}\n
\n
now = DateTime()\n
one_second = 1/24.0/60.0/60.0\n
check_duration = portal_preferences.getPreferredAuthenticationFailureCheckDuration()\n
max_authentication_failures = portal_preferences.getPreferredMaxAuthenticationFailure()\n
check_time = now - check_duration*one_second\n
\n
kw = {\'portal_type\': \'Authentication Event\',\n
\'creation_date\': Query(creation_date = check_time,\n
range=\'min\'),\n
\'validation_state\' : \'confirmed\'}\n
failure_list = portal.portal_catalog(**kw)\n
for failure in failure_list:\n
person = failure.getDestinationValue()\n
if person not in all_blocked_user_login_dict.keys():\n
all_blocked_user_login_dict[person] = []\n
all_blocked_user_login_dict[person].append(failure)\n
\n
# leave only ones that are blocked:\n
for person, failure_list in all_blocked_user_login_dict.items():\n
if len(failure_list) >= max_authentication_failures:\n
blocked_user_login_list.append(newTempBase(portal, \n
person.getTitle(), \n
**{\'title\': person.getTitle(),\n
\'count\':len(failure_list),\n
\'reference\': person.getReference(),\n
\'url\': person.absolute_url()}))\n
return blocked_user_login_list\n
]]></string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>**kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SystemEventModule_getBlockedUserLoginList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>Base_doSelect</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_unblockHTML</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SystemEventModule_viewBlockUseLoginList</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>SystemEventModule_viewAuthenticationEventList</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_list</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Blocked User Login</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>all_columns</string>
<string>columns</string>
<string>hide_rows_on_no_search_criterion</string>
<string>list_method</string>
<string>search_columns</string>
<string>selection_name</string>
<string>sort_columns</string>
<string>style_columns</string>
<string>title</string>
<string>url_columns</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>all_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Login</string>
</tuple>
<tuple>
<string>count</string>
<string>Number of Failures</string>
</tuple>
<tuple>
<string>unblockHTML</string>
<string>Unblock</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_mode_listbox</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>hide_rows_on_no_search_criterion</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Authentication Event</string>
<string>Authentication Event</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>unblock_user_login_search_selection</string> </value>
</item>
<item>
<key> <string>sort_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>style_columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Blocked User Login List</string> </value>
</item>
<item>
<key> <string>url_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Person_getListboxUrl</string>
</tuple>
<tuple>
<string>reference</string>
<string>Person_getListboxUrl</string>
</tuple>
<tuple>
<string>count</string>
<string>Person_getListboxUrl</string>
</tuple>
</list>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>SystemEventModule_getBlockedUserLoginList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default</string>
<string>editable</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_unblockHTML</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_editor_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Unblock</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
python: \'<a title="Click to unblock login" href="%s/Person_unblockLogin?cancel_url=%s"> Unblock </a>\' %(cell.url, here.absolute_url())
]]></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Maximal Failed Authentication Atttempts</string> </value> <value> <string>Maximal Failed Authentication Attempts</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -75,15 +75,15 @@ ...@@ -75,15 +75,15 @@
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
<tal:block tal:condition="not: isAnon"\n <tal:block tal:condition="not: isAnon"\n
tal:define="is_user_account_password_expired_warning_on python:request.get(\'is_user_account_password_expired_warning_on\', 0);">\n tal:define="is_user_account_password_expired_expire_date python:request.get(\'is_user_account_password_expired_expire_date\', 0);">\n
\n \n
<!-- Password will expire soon just warn user ? -->\n <!-- Password will expire soon just warn user ? -->\n
<tal:block tal:condition="is_user_account_password_expired_warning_on">\n <tal:block tal:condition="is_user_account_password_expired_expire_date">\n
<tal:block tal:define="came_from python: request.get(\'came_from\') or here.absolute_url();\n <tal:block tal:define="came_from python: request.get(\'came_from\') or here.absolute_url();\n
dummy python: response.redirect(\'%s/ERP5Site_viewNewPersonCredentialUpdateDialog?portal_status_message=%s&amp;cancel_url=%s\' %(came_from, here.Base_translateString(\'Your password will expire in %s hours. You are advised to change it as soon as possible.\' %is_user_account_password_expired_warning_on), came_from));" />\n dummy python: response.redirect(\'%s/ERP5Site_viewNewPersonCredentialUpdateDialog?portal_status_message=%s&amp;cancel_url=%s\' %(came_from, here.Base_translateString(\'Your password will expire at %s. You are advised to change it as soon as possible.\' %context.Base_FormatDate(is_user_account_password_expired_expire_date, hour_minute=1)), came_from));" />\n
</tal:block>\n </tal:block>\n
\n \n
<tal:block tal:condition="not: is_user_account_password_expired_warning_on">\n <tal:block tal:condition="not: is_user_account_password_expired_expire_date">\n
<tal:block tal:define="came_from python: request.get(\'came_from\') or here.absolute_url();\n <tal:block tal:define="came_from python: request.get(\'came_from\') or here.absolute_url();\n
dummy python: response.redirect(came_from);" />\n dummy python: response.redirect(came_from);" />\n
</tal:block>\n </tal:block>\n
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string>Used to provide password trackability.</string> </value>
</item> </item>
<item> <item>
<key> <string>groups</string> </key> <key> <string>groups</string> </key>
......
...@@ -59,14 +59,13 @@ number_of_last_password_to_check = portal.portal_preferences.getPreferredNumberO ...@@ -59,14 +59,13 @@ number_of_last_password_to_check = portal.portal_preferences.getPreferredNumberO
\n \n
if number_of_last_password_to_check is not None and number_of_last_password_to_check:\n if number_of_last_password_to_check is not None and number_of_last_password_to_check:\n
# save password and modification date\n # save password and modification date\n
person.setLastPasswordModificationDate(DateTime())\n
old_password_list = person.getLastChangedPasswordValueList()\n
current_password = person.getPassword()\n current_password = person.getPassword()\n
if current_password is not None and current_password not in old_password_list:\n if current_password is not None:\n
# we care only if password is set\n password_event = portal.system_event_module.newContent(portal_type = \'Password Event\',\n
old_password_list.append(current_password)\n source_value = person,\n
person.setLastChangedPasswordValueList(old_password_list)\n destination_value = person,\n
context.log(\'%s %s %s\' %(person.getPassword(), person.getLastPasswordModificationDate(), old_password_list))\n password = current_password)\n
password_event.confirm()\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
erp5_credential erp5_credential
\ No newline at end of file erp5_system_event
\ No newline at end of file
12 22
\ No newline at end of file \ No newline at end of file
portal_alarms/expire_authentication_events
\ No newline at end of file
Person | LoginAccountProvider
\ No newline at end of file
AuthenticationPolicyPreference AuthenticationPolicyPreference
LoginAccountProvider \ No newline at end of file
\ No newline at end of file
...@@ -170,7 +170,9 @@ ...@@ -170,7 +170,9 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from DateTime import DateTime\n <value> <string encoding="cdata"><![CDATA[
from DateTime import DateTime\n
kw = {\'name\': cookie_name,\n kw = {\'name\': cookie_name,\n
\'value\': cookie_value,\n \'value\': cookie_value,\n
\'path\': \'/\'}\n \'path\': \'/\'}\n
...@@ -180,10 +182,10 @@ expire_interval = context.ERP5Site_getMaxUserInactivityDuration(user_name)\n ...@@ -180,10 +182,10 @@ expire_interval = context.ERP5Site_getMaxUserInactivityDuration(user_name)\n
\n \n
# set cookie expire argument only if it\'s defined for current user\n # set cookie expire argument only if it\'s defined for current user\n
if expire_interval not in (\'\', None):\n if expire_interval not in (\'\', None):\n
expire_time_offset = 0.00069444444444444436 * (expire_interval / 60.0)\n expire_interval /= 86400. # seconds -> days\n
ac_expires = DateTime() + expire_time_offset\n ac_expires = DateTime() + expire_interval\n
ac_renew = DateTime() + expire_time_offset / 2\n ac_renew = DateTime() + expire_interval / 2\n
kw[\'expires\'] = ac_expires.rfc822()\n kw[\'expires\'] = ac_expires.toZone(\'GMT\').rfc822()\n
# save next \'__ac\' renew time\n # save next \'__ac\' renew time\n
context.portal_sessions[ac_session_key_pattern %user_name][\'ac_renew\'] = ac_renew.millis()\n context.portal_sessions[ac_session_key_pattern %user_name][\'ac_renew\'] = ac_renew.millis()\n
else:\n else:\n
...@@ -193,7 +195,9 @@ else:\n ...@@ -193,7 +195,9 @@ else:\n
\n \n
# set cookie\n # set cookie\n
resp.setCookie(**kw)\n resp.setCookie(**kw)\n
</string> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
......
10 12
\ No newline at end of file \ No newline at end of file
...@@ -92,7 +92,7 @@ CREATE TABLE `catalog` (\n ...@@ -92,7 +92,7 @@ CREATE TABLE `catalog` (\n
KEY `Path` (`path`),\n KEY `Path` (`path`),\n
KEY `relative_url` (`relative_url`),\n KEY `relative_url` (`relative_url`),\n
KEY `indexation_date` (`indexation_date`)\n KEY `indexation_date` (`indexation_date`)\n
) TYPE=InnoDB;\n ) ENGINE=InnoDB;\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
`category_strict_membership` tinyint(1) default \'0\',\n `category_strict_membership` tinyint(1) default \'0\',\n
PRIMARY KEY (`uid`, `category_uid`, `base_category_uid`, `category_strict_membership`),\n PRIMARY KEY (`uid`, `category_uid`, `base_category_uid`, `category_strict_membership`),\n
KEY `Membership` (`category_uid`,`base_category_uid`)\n KEY `Membership` (`category_uid`,`base_category_uid`)\n
) TYPE = InnoDB;</string> </value> ) ENGINE=InnoDB;</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
KEY `resource_uid` (`resource_uid`),\n KEY `resource_uid` (`resource_uid`),\n
KEY `source_reference` (`source_payment_reference`),\n KEY `source_reference` (`source_payment_reference`),\n
KEY `destination_payment_reference` (`destination_payment_reference`)\n KEY `destination_payment_reference` (`destination_payment_reference`)\n
) TYPE=InnoDB\n ) ENGINE=InnoDB\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -77,7 +77,7 @@ CREATE TABLE `item` (\n ...@@ -77,7 +77,7 @@ CREATE TABLE `item` (\n
KEY `variation_text` (`variation_text`),\n KEY `variation_text` (`variation_text`),\n
KEY `aggregate_simulation_state_date` (`aggregate_uid`,`simulation_state`,`date`),\n KEY `aggregate_simulation_state_date` (`aggregate_uid`,`simulation_state`,`date`),\n
KEY `node_simulation_state_date` (`node_uid`,`simulation_state`,`date`)\n KEY `node_simulation_state_date` (`node_uid`,`simulation_state`,`date`)\n
) TYPE=InnoDB;\n ) ENGINE=InnoDB;\n
\n \n
</string> </value> </string> </value>
</item> </item>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
allowedRolesAndUsers VARCHAR(255) NOT NULL,\n allowedRolesAndUsers VARCHAR(255) NOT NULL,\n
KEY `uid` (`uid`),\n KEY `uid` (`uid`),\n
KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n
) TYPE=InnoDB; \n ) ENGINE=InnoDB;\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -88,7 +88,7 @@ CREATE TABLE `stock` (\n ...@@ -88,7 +88,7 @@ CREATE TABLE `stock` (\n
KEY `resource_payment_uid` (`resource_uid`, `payment_uid`),\n KEY `resource_payment_uid` (`resource_uid`, `payment_uid`),\n
KEY `resource_payment_state_date` (`resource_uid`, `payment_uid`, `simulation_state`, `date`),\n KEY `resource_payment_state_date` (`resource_uid`, `payment_uid`, `simulation_state`, `date`),\n
KEY `node_resource_variation_state_date` (`node_uid`, `resource_uid`, `variation_text`, `simulation_state`, `date`)\n KEY `node_resource_variation_state_date` (`node_uid`, `resource_uid`, `variation_text`, `simulation_state`, `date`)\n
) TYPE = InnoDB;\n ) ENGINE=InnoDB;\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -69,7 +69,7 @@ activity_tag = \'%s_CounterDay\' % (site_uid, )\n ...@@ -69,7 +69,7 @@ activity_tag = \'%s_CounterDay\' % (site_uid, )\n
if context.getPortalObject().portal_activities.countMessageWithTag(activity_tag) != 0:\n if context.getPortalObject().portal_activities.countMessageWithTag(activity_tag) != 0:\n
msg = Message(domain=\'ui\',message="Sorry, there is a pending counter date opening, please retry later")\n msg = Message(domain=\'ui\',message="Sorry, there is a pending counter date opening, please retry later")\n
raise ValidationFailed (msg,)\n raise ValidationFailed (msg,)\n
counter_date.setDefaultActivateParameters(tag=activity_tag)\n counter_date.setDefaultActivateParameterDict({"tag": activity_tag})\n
counter_date_list = [x.getObject() for x in counter_date.portal_catalog(portal_type=\'Counter Date\',site_uid=site_uid,simulation_state=\'open\')]\n counter_date_list = [x.getObject() for x in counter_date.portal_catalog(portal_type=\'Counter Date\',site_uid=site_uid,simulation_state=\'open\')]\n
for other_counter in counter_date_list:\n for other_counter in counter_date_list:\n
if other_counter.getUid()!=counter_date.getUid():\n if other_counter.getUid()!=counter_date.getUid():\n
......
583 584
\ No newline at end of file \ No newline at end of file
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="SQL" module="Products.ZSQLMethods.SQL"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>table_0\r\n
table_1</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>z_related_child_telephone</string> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
<dtml-comment>\n
table_0 : catalog as child\n
table_1 : telephone as telephone\n
</dtml-comment>\n
catalog.uid = <dtml-var table_0>.parent_uid\n
AND <dtml-var table_0>.portal_type = \'Telephone\'\n
AND <dtml-var table_0>.uid = <dtml-var table_1>.uid
]]></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<key_list> <key_list>
<key>child_address_SearchableText | catalog,full_text/SearchableText/z_related_child_address</key> <key>child_address_SearchableText | catalog,full_text/SearchableText/z_related_child_address</key>
<key>child_telephone_SearchableText | catalog,full_text/SearchableText/z_related_child_telephone</key>
<key>default_email_text | catalog,email/url_string/z_related_default_email</key> <key>default_email_text | catalog,email/url_string/z_related_default_email</key>
<key>destination_person_title | category,catalog/title/z_related_destination_person</key> <key>destination_person_title | category,catalog/title/z_related_destination_person</key>
<key>owner_title | catalog/title/z_related_owner_title</key> <key>owner_title | catalog/title/z_related_owner_title</key>
......
...@@ -123,4 +123,4 @@ ...@@ -123,4 +123,4 @@
<portal_type id="Solver Tool"> <portal_type id="Solver Tool">
<item>Solver Type</item> <item>Solver Type</item>
</portal_type> </portal_type>
</allowed_content_type_list> </allowed_content_type_list>
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="Base Type" module="erp5.portal_type"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -111,6 +111,18 @@ to Simulation Movements related to a limited set of existing Deliveries.</string ...@@ -111,6 +111,18 @@ to Simulation Movements related to a limited set of existing Deliveries.</string
<key> <string>type_class</string> </key> <key> <string>type_class</string> </key>
<value> <string>SimulatedDeliveryBuilder</string> </value> <value> <string>SimulatedDeliveryBuilder</string> </value>
</item> </item>
<item>
<key> <string>type_interface</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>type_mixin</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
...@@ -122,7 +134,9 @@ to Simulation Movements related to a limited set of existing Deliveries.</string ...@@ -122,7 +134,9 @@ to Simulation Movements related to a limited set of existing Deliveries.</string
<dictionary> <dictionary>
<item> <item>
<key> <string>domain_name</string> </key> <key> <string>domain_name</string> </key>
<value> <none/> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>property_name</string> </key> <key> <string>property_name</string> </key>
...@@ -139,7 +153,9 @@ to Simulation Movements related to a limited set of existing Deliveries.</string ...@@ -139,7 +153,9 @@ to Simulation Movements related to a limited set of existing Deliveries.</string
<dictionary> <dictionary>
<item> <item>
<key> <string>domain_name</string> </key> <key> <string>domain_name</string> </key>
<value> <none/> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>property_name</string> </key> <key> <string>property_name</string> </key>
......
...@@ -90,7 +90,8 @@ else:\n ...@@ -90,7 +90,8 @@ else:\n
version = context.getVersion()\n version = context.getVersion()\n
language = context.getLanguage()\n language = context.getLanguage()\n
modification_date = context.modification_date\n modification_date = context.modification_date\n
inline_popup = context.Document_getPopupInfo(web_site)\n document_web_section_list = web_site.getWebSectionValueList(context)\n
inline_popup = context.Document_getPopupInfo(web_site, document_web_section_list)\n
if isinstance(inline_popup, unicode):\n if isinstance(inline_popup, unicode):\n
inline_popup = inline_popup.encode(\'utf-8\')\n inline_popup = inline_popup.encode(\'utf-8\')\n
found = context.Base_showFoundText()\n found = context.Base_showFoundText()\n
...@@ -104,7 +105,6 @@ else:\n ...@@ -104,7 +105,6 @@ else:\n
owner_title = None\n owner_title = None\n
reference = context.getReference\n reference = context.getReference\n
reference_url = web_site.getPermanentURL(context)\n reference_url = web_site.getPermanentURL(context)\n
document_web_section_list = web_site.getWebSectionValueList(context)\n
\n \n
local_parameter_dict = {\n local_parameter_dict = {\n
\'uid\': uid,\n \'uid\': uid,\n
......
...@@ -93,6 +93,14 @@ ...@@ -93,6 +93,14 @@
<string>my_view_mode_contact_listbox_int_index</string> <string>my_view_mode_contact_listbox_int_index</string>
<string>my_view_mode_contact_listbox_title</string> <string>my_view_mode_contact_listbox_title</string>
<string>my_view_mode_role</string> <string>my_view_mode_role</string>
<string>my_view_mode_telephone_area</string>
<string>my_view_mode_telephone_city</string>
<string>my_view_mode_telephone_coordinate_text</string>
<string>my_view_mode_telephone_country</string>
<string>my_view_mode_telephone_extension</string>
<string>my_view_mode_telephone_number</string>
<string>my_view_mode_email_coordinate_text</string>
<string>my_view_mode_email_url_string</string>
</list> </list>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>enabled</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_email_coordinate_text</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Email</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>not:here/isDetailed</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>enabled</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_email_url_string</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Email</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here/isDetailed</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>description</string>
<string>display_width</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_telephone_area</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>The telephone area</string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>5</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Area</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>description</string>
<string>display_width</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_telephone_city</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>The telephone city</string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>City</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_telephone_coordinate_text</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Telephone</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>description</string>
<string>display_width</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_telephone_country</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>The telephone country code</string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Country</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>description</string>
<string>display_width</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_telephone_extension</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>The telephone number suffix (extension)</string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Suffix</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>description</string>
<string>display_width</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_view_mode_telephone_number</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>The phone number</string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>9</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Number</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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