From 8c0b1e96edbeff6854bea98571de5db01f3728de Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki Date: Mon, 20 Mar 2017 11:25:49 +0100 Subject: [PATCH] we no longer use order/delivery category to acquire categories and properties. --- .../portal_categories/delivery_builder.xml | 1 - .../portal_categories/destination_carrier.xml | 1 - .../destination_referral.xml | 1 - .../portal_categories/ledger.xml | 1 - .../portal_categories/order_builder.xml | 1 - .../portal_categories/source_carrier.xml | 1 - .../portal_categories/source_referral.xml | 1 - .../portal_categories/trade_phase.xml | 1 - .../portal_categories/use.xml | 1 - .../portal_categories/colour.xml | 1 - .../portal_categories/industrial_phase.xml | 1 - .../portal_categories/morphology.xml | 1 - .../portal_categories/variation.xml | 1 - .../portal_categories/delivery_mode.xml | 1 - .../portal_categories/incoterm.xml | 1 - product/CMFCategory/tests/testCMFCategory.py | 20 ++++++++++++++----- .../portal_categories/destination.xml | 1 - .../portal_categories/destination_account.xml | 1 - .../destination_administration.xml | 1 - .../portal_categories/destination_advice.xml | 1 - .../destination_carrier_administration.xml | 1 - .../destination_decision.xml | 1 - .../destination_decision_administration.xml | 1 - .../destination_function.xml | 1 - .../portal_categories/destination_funding.xml | 1 - .../portal_categories/destination_payment.xml | 1 - .../destination_payment_request.xml | 1 - .../portal_categories/destination_project.xml | 1 - .../portal_categories/destination_section.xml | 1 - .../destination_section_administration.xml | 1 - .../portal_categories/destination_trade.xml | 1 - .../portal_categories/quantity_unit.xml | 1 - .../portal_categories/resource.xml | 1 - .../portal_categories/size.xml | 1 - .../portal_categories/source.xml | 1 - .../portal_categories/source_account.xml | 1 - .../source_administration.xml | 1 - .../portal_categories/source_advice.xml | 1 - .../source_carrier_administration.xml | 1 - .../portal_categories/source_decision.xml | 1 - .../source_decision_administration.xml | 1 - .../portal_categories/source_function.xml | 1 - .../portal_categories/source_funding.xml | 1 - .../portal_categories/source_payment.xml | 1 - .../source_payment_request.xml | 1 - .../portal_categories/source_project.xml | 1 - .../portal_categories/source_section.xml | 1 - .../source_section_administration.xml | 1 - .../portal_categories/source_trade.xml | 1 - .../Amount/efficiency_property.xml | 4 +--- .../Amount/quantity_property.xml | 5 +---- .../InventoryMovement/inventory_property.xml | 4 +--- .../Movement/frozen_property.xml | 1 - .../Price/base_unit_price_property.xml | 2 -- .../Price/price_property.xml | 5 +---- .../Task/start_date_property.xml | 2 -- .../Task/stop_date_property.xml | 2 -- 57 files changed, 19 insertions(+), 74 deletions(-) diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml index 79eaa02d303..27c879f1a88 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml index 0df075d11a7..97cc132108e 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml index fc2a6ced2c4..a1d025ce112 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/ledger.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/ledger.xml index 74ab51ba3aa..c9abcd986a6 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/ledger.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/ledger.xml @@ -28,7 +28,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml index 2930ebf2606..972a9c5e75c 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml index 2f226dda7c3..0cb47338e54 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml @@ -10,7 +10,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml index 3d863d396e0..0a6def46abc 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml @@ -10,7 +10,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml index 0c70032e16b..19e26670fc1 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml index 9d8513468c9..14880341319 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml @@ -28,7 +28,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml index dad42aac845..6f92410a069 100644 --- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml +++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/industrial_phase.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/industrial_phase.xml index 755956e4623..aa47bfd9357 100644 --- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/industrial_phase.xml +++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/industrial_phase.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml index 049eb06ac4a..13be3d1dfb4 100644 --- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml +++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml index f855b2913bc..da91779925f 100644 --- a/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml +++ b/bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml @@ -15,7 +15,6 @@ specialise - order parent diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml index 1dca2fe56e9..90291b946af 100644 --- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml +++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent resource diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml index 47027a9fb5f..ecb48728dea 100644 --- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml +++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent resource diff --git a/product/CMFCategory/tests/testCMFCategory.py b/product/CMFCategory/tests/testCMFCategory.py index c0685f06050..d2399a0211f 100644 --- a/product/CMFCategory/tests/testCMFCategory.py +++ b/product/CMFCategory/tests/testCMFCategory.py @@ -762,12 +762,22 @@ class TestCMFCategory(ERP5TypeTestCase): order.setDestinationAdministrationValue(person) self.assertEqual(order.getDestinationAdministrationPersonTitle(), 'toto') - packing_list.setDestinationAdministrationValue(None) - packing_list.setOrderValue(None) - self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), None) + try: + category = self.portal.portal_categories.destination_administration + original_acquisition_base_category_list = category.getAcquisitionBaseCategoryList() + category.setAcquisitionBaseCategoryList(['parent', 'order']) + + line = order.newContent(portal_type='Sale Order Line') + self.assertEqual(line.getDestinationAdministrationPersonTitle(), 'toto') - packing_list.setOrderValue(order) - self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), 'toto') + packing_list.setDestinationAdministrationValue(None) + packing_list.setOrderValue(None) + self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), None) + + packing_list.setOrderValue(order) + self.assertEqual(packing_list.getDestinationAdministrationPersonTitle(), 'toto') + finally: + category.setAcquisitionBaseCategoryList(original_acquisition_base_category_list) def test_22_UserFriendlyException(self): """Test message raise if bad use of setter.""" diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml index 43a1e4efcb7..ac2a44beef4 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_account.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_account.xml index d212c18f977..180c74fb4cd 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_account.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_account.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml index 7dc46111ebe..907d250c654 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_advice.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_advice.xml index 93ed8b54d64..84f0208c28a 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_advice.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_advice.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_carrier_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_carrier_administration.xml index 1b658c82ea3..e45bb719ea1 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_carrier_administration.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_carrier_administration.xml @@ -61,7 +61,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml index cf7cc441b7a..8f3566e01ed 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision_administration.xml index 20df5be5889..7565611cbad 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision_administration.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision_administration.xml @@ -61,7 +61,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml index a28d0f2e524..bb6b85b919a 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_funding.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_funding.xml index 180ede84682..9a3b53d2496 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_funding.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_funding.xml @@ -79,7 +79,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml index b6145a4b9d7..90c8d46545c 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment_request.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment_request.xml index 1d20edd246e..ae9f71108e2 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment_request.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment_request.xml @@ -79,7 +79,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml index 690d5a55970..9b614f56661 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml index 1c2e6828de6..fea8393599f 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section_administration.xml index ad71e7fa287..ea0fe0c94e5 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section_administration.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section_administration.xml @@ -61,7 +61,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml index eac6cdf827a..af539b635ff 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml index dcf717523e3..a72c24c6464 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml index 70d129a7634..cfe6af6a963 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml @@ -78,7 +78,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml index 00f1cdc4cd1..7577bb3e509 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml index f73069e5ce4..e375e669c05 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml @@ -79,7 +79,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_account.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_account.xml index 32b0144ba31..ad23d946470 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_account.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_account.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml index 91185634296..26f3767d73b 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_advice.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_advice.xml index 5d3bc2f7207..3247e31cb09 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_advice.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_advice.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_carrier_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_carrier_administration.xml index ab2ce2090fb..6fa8b3ae8b2 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_carrier_administration.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_carrier_administration.xml @@ -61,7 +61,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml index fbb727399bd..8ccc0754222 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision_administration.xml index 8c098185e3f..84e12aca73f 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision_administration.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision_administration.xml @@ -61,7 +61,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml index a006af1d165..5eae4e71884 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_funding.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_funding.xml index da2188f263c..f98f0c9f5dc 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_funding.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_funding.xml @@ -79,7 +79,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml index 8e0aa127b63..e2dca3d0f8a 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml @@ -14,7 +14,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment_request.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment_request.xml index 51abc11f0b6..deb79211587 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment_request.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment_request.xml @@ -79,7 +79,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml index cf11012a5d1..005d3f5ee23 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml @@ -79,7 +79,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml index 4857657f2e6..791a59af5a0 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section_administration.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section_administration.xml index e77a88248e7..ac274bc61ba 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section_administration.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section_administration.xml @@ -61,7 +61,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml index 7ae5bc5f1d2..62f23b2e6fb 100644 --- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml +++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml @@ -32,7 +32,6 @@ acquisition_base_category - order parent diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/efficiency_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/efficiency_property.xml index 60d8bc60b01..1a374f41659 100644 --- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/efficiency_property.xml +++ b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/efficiency_property.xml @@ -40,9 +40,7 @@ acquisition_base_category - - delivery - + diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/quantity_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/quantity_property.xml index e6e9c943232..f57cde2b1dd 100644 --- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/quantity_property.xml +++ b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/quantity_property.xml @@ -40,10 +40,7 @@ acquisition_base_category - - order - delivery - + diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/InventoryMovement/inventory_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/InventoryMovement/inventory_property.xml index b5ebdff0e19..ff18f7961eb 100644 --- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/InventoryMovement/inventory_property.xml +++ b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/InventoryMovement/inventory_property.xml @@ -40,9 +40,7 @@ acquisition_base_category - - delivery - + diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Movement/frozen_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Movement/frozen_property.xml index a146a4d6034..768bb27133b 100644 --- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Movement/frozen_property.xml +++ b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Movement/frozen_property.xml @@ -41,7 +41,6 @@ acquisition_base_category - delivery parent diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/base_unit_price_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/base_unit_price_property.xml index 788053aca99..e6dbe1b926d 100644 --- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/base_unit_price_property.xml +++ b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/base_unit_price_property.xml @@ -42,8 +42,6 @@ parent - order - delivery diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/price_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/price_property.xml index e89c89b273b..aa34516df71 100644 --- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/price_property.xml +++ b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/price_property.xml @@ -40,10 +40,7 @@ acquisition_base_category - - order - delivery - + diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/start_date_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/start_date_property.xml index 9f849f29764..2d465d9365a 100644 --- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/start_date_property.xml +++ b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/start_date_property.xml @@ -41,8 +41,6 @@ acquisition_base_category - delivery - order parent diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/stop_date_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/stop_date_property.xml index d3325ffee37..416b2f060ad 100644 --- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/stop_date_property.xml +++ b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/stop_date_property.xml @@ -41,8 +41,6 @@ acquisition_base_category - delivery - order parent -- 2.30.9