From 7fb221fe94cb5b932118281cc46650968a85b9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 29 Sep 2006 08:15:27 +0000 Subject: [PATCH] use listbox_total_price for better display add a total_amount field remove useless Invoice_getPayableRemainingQuantity column git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10428 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../listbox.xml | 35 ++- .../PurchaseInvoiceTransmissionSheet_view.xml | 6 +- .../listbox.xml | 19 +- .../listbox_total_price.xml | 260 ++++++++++++++++++ .../total_amount.xml | 2 +- bt5/erp5_accounting_l10n_fr_m9/bt/revision | 2 +- 6 files changed, 308 insertions(+), 16 deletions(-) create mode 100644 bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox_total_price.xml diff --git a/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheetModule_viewPurchaseInvoiceTransmissionSheetList/listbox.xml b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheetModule_viewPurchaseInvoiceTransmissionSheetList/listbox.xml index 3798e2c258..b1122a77c6 100644 --- a/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheetModule_viewPurchaseInvoiceTransmissionSheetList/listbox.xml +++ b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheetModule_viewPurchaseInvoiceTransmissionSheetList/listbox.xml @@ -316,7 +316,28 @@ <item> <key> <string>all_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>id</string> + <string>ID</string> + </tuple> + <tuple> + <string>title</string> + <string>Transmission Sheet Reference</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>start_date</string> + <string>Emission Date</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>State</string> + </tuple> + </list> </value> </item> <item> @@ -333,14 +354,14 @@ <key> <string>columns</string> </key> <value> <list> - <tuple> - <string>id</string> - <string>ID</string> - </tuple> <tuple> <string>title</string> <string>Transmission Sheet Reference</string> </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> <tuple> <string>start_date</string> <string>Emission Date</string> @@ -486,6 +507,10 @@ <string>title</string> <string>Transmission Sheet Reference</string> </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> <tuple> <string>start_date</string> <string>Creation Date</string> diff --git a/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view.xml b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view.xml index 891ec90280..8b514d4680 100644 --- a/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view.xml +++ b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view.xml @@ -98,7 +98,9 @@ <item> <key> <string>hidden</string> </key> <value> - <list/> + <list> + <string>listbox_total_price</string> + </list> </value> </item> <item> @@ -107,6 +109,7 @@ <list> <string>my_title</string> <string>my_description</string> + <string>my_default_role_definition_agent_title</string> <string>total_amount</string> </list> </value> @@ -119,7 +122,6 @@ <string>my_visa_date</string> <string>my_payment_date</string> <string>my_translated_validation_state_title</string> - <string>my_default_role_definition_agent_title</string> </list> </value> </item> diff --git a/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox.xml b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox.xml index 5d553388b6..039ca34bc3 100644 --- a/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox.xml +++ b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox.xml @@ -345,9 +345,13 @@ <string>title</string> <string>Title</string> </tuple> + <tuple> + <string>getOriginTitle</string> + <string>Origin</string> + </tuple> <tuple> <string>int_index</string> - <string>Invoice Reference</string> + <string>Invoice Transmission Reference</string> </tuple> <tuple> <string>translated_simulation_state_title</string> @@ -357,10 +361,6 @@ <string>total_price</string> <string>Total Amount</string> </tuple> - <tuple> - <string>Invoice_getPayableRemainingQuantity</string> - <string>Invoice Total Net Quantity</string> - </tuple> </list> </value> </item> @@ -403,7 +403,12 @@ <item> <key> <string>editable_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>total_price</string> + <string>Total Amount</string> + </tuple> + </list> </value> </item> <item> @@ -506,7 +511,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Purchase Invoices</string> </value> + <value> <string>Transmitted Invoices</string> </value> </item> <item> <key> <string>url_columns</string> </key> diff --git a/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox_total_price.xml b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox_total_price.xml new file mode 100644 index 0000000000..b32bd224b2 --- /dev/null +++ b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox_total_price.xml @@ -0,0 +1,260 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>FloatField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>listbox_total_price</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> + <item> + <key> <string>not_float</string> </key> + <value> <string>You did not enter a floating point number.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>input_style</string> </key> + <value> <string>-1 234.5</string> </value> + </item> + <item> + <key> <string>precision</string> </key> + <value> <int>2</int> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Total Price</string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/total_amount.xml b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/total_amount.xml index 471a3c8421..335f2014b6 100644 --- a/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/total_amount.xml +++ b/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/total_amount.xml @@ -239,7 +239,7 @@ </item> <item> <key> <string>precision</string> </key> - <value> <string></string> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>required</string> </key> diff --git a/bt5/erp5_accounting_l10n_fr_m9/bt/revision b/bt5/erp5_accounting_l10n_fr_m9/bt/revision index 3cacc0b93c..da2d3988d7 100644 --- a/bt5/erp5_accounting_l10n_fr_m9/bt/revision +++ b/bt5/erp5_accounting_l10n_fr_m9/bt/revision @@ -1 +1 @@ -12 \ No newline at end of file +14 \ No newline at end of file -- 2.30.9