From c1b19a6ef2caa6d185d8663a4d1ffbc49c42691e Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Thu, 5 Oct 2006 11:10:06 +0000 Subject: [PATCH] added missing categories git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10563 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../base_category_list.xml | 2 + .../listbox.xml | 43 ++++++++++++++++++- .../listbox.xml | 6 ++- .../CheckbookDelivery_view/listbox.xml | 8 +++- .../CheckbookModel_view.xml | 2 +- ...antity_required.xml => my_fixed_price.xml} | 6 +-- .../CheckbookModel_view/my_price_currency.xml | 2 +- .../CheckbookReception_view/listbox.xml | 6 ++- .../CheckbookReception_view/my_start_date.xml | 2 +- .../listbox.xml | 8 +++- .../Delivery_viewCheckbookInputDialog.xml | 22 +++++++--- .../transitions/cancel_action.xml | 2 +- bt5/erp5_banking_check/bt/revision | 2 +- bt5/erp5_banking_check/bt/short_title | 1 + .../template_portal_type_base_category_list | 2 + 15 files changed, 93 insertions(+), 21 deletions(-) rename bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/{my_quantity_required.xml => my_fixed_price.xml} (96%) create mode 100644 bt5/erp5_banking_check/bt/short_title diff --git a/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml index afdf6a9227..fadf019761 100644 --- a/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml +++ b/bt5/erp5_banking_check/PortalTypeBaseCategoryTemplateItem/base_category_list.xml @@ -4,10 +4,12 @@ </portal_type> <portal_type id="Checkbook Delivery Line"> <item>check_amount</item> + <item>check_type</item> <item>currency_exchange_type</item> </portal_type> <portal_type id="Checkbook Reception Line"> <item>check_amount</item> + <item>check_type</item> </portal_type> <portal_type id="Traveler Check Purchase"> <item>currency_exchange_type</item> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPaymentModule_viewCheckPaymentList/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPaymentModule_viewCheckPaymentList/listbox.xml index 943900ec68..b1c8742c4a 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPaymentModule_viewCheckPaymentList/listbox.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPaymentModule_viewCheckPaymentList/listbox.xml @@ -318,7 +318,44 @@ <item> <key> <string>all_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>id</string> + <string>ID</string> + </tuple> + <tuple> + <string>source_reference</string> + <string>Reference</string> + </tuple> + <tuple> + <string>delivery.start_date</string> + <string>Date</string> + </tuple> + <tuple> + <string>source_logical_path</string> + <string>Counter</string> + </tuple> + <tuple> + <string>destination_payment_id</string> + <string>Account Number</string> + </tuple> + <tuple> + <string>destination_payment_title</string> + <string>Account Name</string> + </tuple> + <tuple> + <string>aggregate_free_text</string> + <string>Check Number</string> + </tuple> + <tuple> + <string>source_total_asset_price</string> + <string>Total</string> + </tuple> + <tuple> + <string>translated_simulation_state_title</string> + <string>State</string> + </tuple> + </list> </value> </item> <item> @@ -482,6 +519,10 @@ <list/> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryModule_viewCheckbookDeliveryList/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryModule_viewCheckbookDeliveryList/listbox.xml index 24874b0c2b..b62c6b8430 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryModule_viewCheckbookDeliveryList/listbox.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryModule_viewCheckbookDeliveryList/listbox.xml @@ -466,6 +466,10 @@ <list/> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> @@ -503,7 +507,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string></string> </value> + <value> <string>checkbook_delivery_module_selection</string> </value> </item> <item> <key> <string>sort</string> </key> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/listbox.xml index 0655290fc1..c14e4dde63 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/listbox.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view/listbox.xml @@ -420,6 +420,10 @@ <list/> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> @@ -457,7 +461,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string></string> </value> + <value> <string>checkbook_delivery_selection</string> </value> </item> <item> <key> <string>sort</string> </key> @@ -511,7 +515,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <unicode>objectValues</unicode> </value> + <value> <string>objectValues</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view.xml index 78e28c3fa4..5506644822 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view.xml @@ -107,7 +107,7 @@ <list> <string>my_title</string> <string>my_account_number_enabled</string> - <string>my_quantity_required</string> + <string>my_fixed_price</string> <string>my_description</string> </list> </value> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_quantity_required.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_fixed_price.xml similarity index 96% rename from bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_quantity_required.xml rename to bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_fixed_price.xml index ccc7c2a53d..4fa0f12fa1 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_quantity_required.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_fixed_price.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>id</string> </key> - <value> <string>my_quantity_required</string> </value> + <value> <string>my_fixed_price</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -165,7 +165,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Amount is mandatory</string> </value> + <value> <string>Fixed price</string> </value> </item> </dictionary> </value> @@ -187,7 +187,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.isAccountNumberEnabled()</string> </value> + <value> <string>python: here.isFixedPrice()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_price_currency.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_price_currency.xml index 1792618328..8317fc32be 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_price_currency.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view/my_price_currency.xml @@ -249,7 +249,7 @@ </item> <item> <key> <string>required</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>size</string> </key> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/listbox.xml index 5ed225611c..fd50446183 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/listbox.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/listbox.xml @@ -440,6 +440,10 @@ <list/> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> @@ -477,7 +481,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string></string> </value> + <value> <string>checkbook_reception_selection</string> </value> </item> <item> <key> <string>sort</string> </key> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_start_date.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_start_date.xml index 45b214c29e..1b857bc2f9 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_start_date.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view/my_start_date.xml @@ -241,7 +241,7 @@ </item> <item> <key> <string>date_only</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>date_separator</string> </key> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CkeckbookReceptionModule_viewCheckbookReceptionList/listbox.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CkeckbookReceptionModule_viewCheckbookReceptionList/listbox.xml index 29e55b870f..efbe10b0fc 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CkeckbookReceptionModule_viewCheckbookReceptionList/listbox.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CkeckbookReceptionModule_viewCheckbookReceptionList/listbox.xml @@ -458,6 +458,10 @@ <list/> </value> </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>portal_types</string> </key> <value> @@ -495,7 +499,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string></string> </value> + <value> <string>checkbook_reception_module_selection</string> </value> </item> <item> <key> <string>sort</string> </key> @@ -549,7 +553,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <unicode>searchFolder</unicode> </value> + <value> <string>searchFolder</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_viewCheckbookInputDialog.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_viewCheckbookInputDialog.xml index 6d3c420a00..ce9791956f 100644 --- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_viewCheckbookInputDialog.xml +++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Delivery_viewCheckbookInputDialog.xml @@ -73,13 +73,22 @@ # to select them\n from DateTime import DateTime\n \n +class Dummy:\n + pass\n +\n +dummy = Dummy()\n +node = kw.get(\'node\',dummy)\n +\n if item_portal_type_list is None:\n item_portal_type_list = ["Checkbook","Check"]\n \n if listbox is None:\n \n - if node is None:\n + if node is dummy:\n + node = None\n + else:\n node = context.getBaobabSource()\n +\n reference_date = DateTime()\n item_list = []\n listbox = []\n @@ -152,7 +161,7 @@ return context.asContext(context=None\n </item> <item> <key> <string>_params</string> </key> - <value> <string>listbox=None, item_portal_type_list=None,destination_payment=None,model_filter_dict=None,node=None,batch_mode=0,**kw</string> </value> + <value> <string>listbox=None, item_portal_type_list=None,destination_payment=None,model_filter_dict=None,batch_mode=0,**kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -172,7 +181,7 @@ return context.asContext(context=None\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>6</int> </value> + <value> <int>5</int> </value> </item> <item> <key> <string>co_varnames</string> </key> @@ -182,12 +191,14 @@ return context.asContext(context=None\n <string>item_portal_type_list</string> <string>destination_payment</string> <string>model_filter_dict</string> - <string>node</string> <string>batch_mode</string> <string>kw</string> <string>DateTime</string> - <string>None</string> + <string>Dummy</string> + <string>dummy</string> <string>_getattr_</string> + <string>node</string> + <string>None</string> <string>context</string> <string>reference_date</string> <string>item_list</string> @@ -222,7 +233,6 @@ return context.asContext(context=None\n <none/> <none/> <none/> - <none/> <int>0</int> </tuple> </value> diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/transitions/cancel_action.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/transitions/cancel_action.xml index 7f27318f17..c8aefd3c40 100644 --- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/transitions/cancel_action.xml +++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/transitions/cancel_action.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Annuler</string> </value> + <value> <string>Cancel</string> </value> </item> <item> <key> <string>actbox_url</string> </key> diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision index 56a6051ca2..c7930257df 100644 --- a/bt5/erp5_banking_check/bt/revision +++ b/bt5/erp5_banking_check/bt/revision @@ -1 +1 @@ -1 \ No newline at end of file +7 \ No newline at end of file diff --git a/bt5/erp5_banking_check/bt/short_title b/bt5/erp5_banking_check/bt/short_title new file mode 100644 index 0000000000..4af18322e3 --- /dev/null +++ b/bt5/erp5_banking_check/bt/short_title @@ -0,0 +1 @@ +None \ No newline at end of file diff --git a/bt5/erp5_banking_check/bt/template_portal_type_base_category_list b/bt5/erp5_banking_check/bt/template_portal_type_base_category_list index c2456859a4..a52b4dc9c2 100644 --- a/bt5/erp5_banking_check/bt/template_portal_type_base_category_list +++ b/bt5/erp5_banking_check/bt/template_portal_type_base_category_list @@ -1,6 +1,8 @@ Checkbook Delivery Line | check_amount +Checkbook Delivery Line | check_type Checkbook Delivery Line | currency_exchange_type Checkbook Delivery | currency_exchange_type Checkbook Reception Line | check_amount +Checkbook Reception Line | check_type Traveler Check Purchase | currency_exchange_type Traveler Check Sale | currency_exchange_type \ No newline at end of file -- 2.30.9