Skip to content

erp5
erp5
Commit 7a50121e authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

we no longer use order/delivery category to acquire categories and properties.

parent 47be0acf
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 74 deletions
bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_base/CategoryTemplateItem/portal_categories/ledger.xml
View file @ 7a50121e
......@@ -28,7 +28,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml
View file @ 7a50121e
......@@ -10,7 +10,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml
View file @ 7a50121e
......@@ -10,7 +10,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml
View file @ 7a50121e
......@@ -28,7 +28,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/industrial_phase.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml
View file @ 7a50121e
......@@ -15,7 +15,6 @@
<value>
<tuple>
<string>specialise</string>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
<string>resource</string>
</tuple>
......
bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
<string>resource</string>
</tuple>
......
product/CMFCategory/tests/testCMFCategory.py
View file @ 7a50121e
......@@ -762,12 +762,22 @@ class TestCMFCategory(ERP5TypeTestCase):
order.setDestinationAdministrationValue(person)
self.assertEqual(order.getDestinationAdministrationPersonTitle(), 'toto')
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.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."""
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_account.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_advice.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_carrier_administration.xml
View file @ 7a50121e
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_decision_administration.xml
View file @ 7a50121e
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_function.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_funding.xml
View file @ 7a50121e
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_payment_request.xml
View file @ 7a50121e
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_project.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_section_administration.xml
View file @ 7a50121e
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_trade.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/quantity_unit.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/resource.xml
View file @ 7a50121e
......@@ -78,7 +78,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/size.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source.xml
View file @ 7a50121e
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_account.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_administration.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_advice.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_carrier_administration.xml
View file @ 7a50121e
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_decision_administration.xml
View file @ 7a50121e
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_function.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_funding.xml
View file @ 7a50121e
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment.xml
View file @ 7a50121e
......@@ -14,7 +14,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_payment_request.xml
View file @ 7a50121e
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_project.xml
View file @ 7a50121e
......@@ -79,7 +79,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_section_administration.xml
View file @ 7a50121e
......@@ -61,7 +61,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/source_trade.xml
View file @ 7a50121e
......@@ -32,7 +32,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/efficiency_property.xml
View file @ 7a50121e
......@@ -40,9 +40,7 @@
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Amount/quantity_property.xml
View file @ 7a50121e
......@@ -40,10 +40,7 @@
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>delivery</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/InventoryMovement/inventory_property.xml
View file @ 7a50121e
......@@ -40,9 +40,7 @@
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Movement/frozen_property.xml
View file @ 7a50121e
......@@ -41,7 +41,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/base_unit_price_property.xml
View file @ 7a50121e
......@@ -42,8 +42,6 @@
<value>
<tuple>
<string>parent</string>
<string>order</string>
<string>delivery</string>
</tuple>
</value>
</item>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Price/price_property.xml
View file @ 7a50121e
......@@ -40,10 +40,7 @@
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>order</string>
<string>delivery</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/start_date_property.xml
View file @ 7a50121e
......@@ -41,8 +41,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Task/stop_date_property.xml
View file @ 7a50121e
......@@ -41,8 +41,6 @@
<key> <string>acquisition_base_category</string> </key>
<value>
<tuple>
<string>delivery</string>
<string>order</string>
<string>parent</string>
</tuple>
</value>
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7