From 67fa95d82d0e7baf964da74e18a285b212cbc434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 17 Jan 2008 12:43:40 +0000 Subject: [PATCH] Other improvements to Payment Condition views: * use editable fields for display in the listbox * use more robust TALES expressions to avoid logging errors git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18765 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../my_payment_end_of_month.xml | 6 +- .../my_destination_payment.xml | 18 ++- .../my_source_payment.xml | 18 ++- .../erp5_trade/TradeCondition_viewPayment.xml | 7 +- .../TradeCondition_viewPayment/listbox.xml | 30 ++++- .../listbox_efficiency.xml | 99 ++++++++++++++++ .../listbox_payment_date.xml | 99 ++++++++++++++++ .../listbox_payment_end_of_month.xml | 107 ++++++++++++++++++ .../listbox_payment_term.xml | 99 ++++++++++++++++ bt5/erp5_trade/bt/revision | 2 +- 10 files changed, 468 insertions(+), 17 deletions(-) create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_efficiency.xml create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_date.xml create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_end_of_month.xml create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_term.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_end_of_month.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_end_of_month.xml index df300618eb..bfa574e114 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_end_of_month.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_end_of_month.xml @@ -12,9 +12,7 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list> - <string>default</string> - </list> + <list/> </value> </item> <item> @@ -56,7 +54,7 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_destination_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_destination_payment.xml index c7c3dc66d6..9addadc331 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_destination_payment.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_destination_payment.xml @@ -57,6 +57,10 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -66,7 +70,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -75,6 +79,10 @@ <key> <string>target</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> </dictionary> </value> </item> @@ -83,7 +91,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>The payment used on the destination side.</string> </value> </item> <item> @@ -95,7 +103,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> @@ -105,7 +113,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Destination Payment</string> </value> </item> </dictionary> @@ -125,7 +133,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:[(\'\', \'\')] + [(x.Title(), x.getRelativeUrl()) for x in here.getDestinationSectionValue().objectValues(portal_type = here.getPortalPaymentNodeTypeList())]</string> </value> + <value> <string>python:[(\'\', \'\')] + (here.getDestinationSection() and [(x.Title(), x.getRelativeUrl()) for x in here.getDestinationSectionValue().objectValues(portal_type = here.getPortalPaymentNodeTypeList())] or [])</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_source_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_source_payment.xml index 2688556c17..d53ffc0210 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_source_payment.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_source_payment.xml @@ -57,6 +57,10 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -66,7 +70,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -75,6 +79,10 @@ <key> <string>target</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> </dictionary> </value> </item> @@ -83,7 +91,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>The payment used on the source side.</string> </value> </item> <item> @@ -95,7 +103,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> @@ -105,7 +113,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Source Payment</string> </value> </item> </dictionary> @@ -125,7 +133,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:[(\'\', \'\')] + [(x.Title(), x.getRelativeUrl()) for x in here.getSourceSectionValue().objectValues(portal_type = here.getPortalPaymentNodeTypeList())]</string> </value> + <value> <string>python:[(\'\', \'\')] + (here.getSourceSection() and [(x.Title(), x.getRelativeUrl()) for x in here.getSourceSectionValue().objectValues(portal_type = here.getPortalPaymentNodeTypeList())] or [])</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml index 0a20f05432..18fc8f9d13 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml @@ -87,7 +87,12 @@ <item> <key> <string>hidden</string> </key> <value> - <list/> + <list> + <string>listbox_efficiency</string> + <string>listbox_payment_date</string> + <string>listbox_payment_end_of_month</string> + <string>listbox_payment_term</string> + </list> </value> </item> <item> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox.xml index 2a8b23a435..08f65b29ab 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox.xml @@ -18,6 +18,7 @@ <string>sort</string> <string>selection_name</string> <string>portal_types</string> + <string>editable_columns</string> <string>domain_root_list</string> <string>report_root_list</string> </list> @@ -128,7 +129,7 @@ </tuple> <tuple> <string>payment_date</string> - <string>Payment Date</string> + <string>Absolute Payment Date</string> </tuple> </list> </value> @@ -148,6 +149,33 @@ </list> </value> </item> + <item> + <key> <string>editable_columns</string> </key> + <value> + <list> + <tuple> + <string>quantity</string> + <string>Total</string> + </tuple> + <tuple> + <string>efficiency</string> + <string>Percentage Of Total</string> + </tuple> + <tuple> + <string>payment_term</string> + <string>Payment Delay</string> + </tuple> + <tuple> + <string>payment_end_of_month</string> + <string>Payment At The End Of Month</string> + </tuple> + <tuple> + <string>payment_date</string> + <string>Payment Date</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string>my_view_mode_listbox</string> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_efficiency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_efficiency.xml new file mode 100644 index 0000000000..4498889053 --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_efficiency.xml @@ -0,0 +1,99 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>editable</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_efficiency</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_efficiency</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>PaymentCondition_viewFieldLibrary</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> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_date.xml new file mode 100644 index 0000000000..e67861ab43 --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_date.xml @@ -0,0 +1,99 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>editable</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_payment_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_payment_date</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>PaymentCondition_viewFieldLibrary</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> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_end_of_month.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_end_of_month.xml new file mode 100644 index 0000000000..f380db7fe6 --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_end_of_month.xml @@ -0,0 +1,107 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>editable</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_payment_end_of_month</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>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> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>default</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_payment_end_of_month</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>PaymentCondition_viewFieldLibrary</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> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_term.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_term.xml new file mode 100644 index 0000000000..075d328a5b --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox_payment_term.xml @@ -0,0 +1,99 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>editable</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_payment_term</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_payment_term</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>PaymentCondition_viewFieldLibrary</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> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 2d73b5e3ba..f79f5e337e 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -152 \ No newline at end of file +153 \ No newline at end of file -- 2.30.9