Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
preetwinder
erp5
Commits
1ed317d1
Commit
1ed317d1
authored
8 years ago
by
Kazuhiko Shiozaki
Browse files
Options
Download
Email Patches
Plain Diff
we no longer use order/delivery category to acquire categories and properties.
parent
a55c859b
Changes
57
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
15 additions
and
24 deletions
+15
-24
bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml
...tegoryTemplateItem/portal_categories/delivery_builder.xml
+0
-1
bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml
...oryTemplateItem/portal_categories/destination_carrier.xml
+0
-1
bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml
...ryTemplateItem/portal_categories/destination_referral.xml
+0
-1
bt5/erp5_base/CategoryTemplateItem/portal_categories/ledger.xml
...p5_base/CategoryTemplateItem/portal_categories/ledger.xml
+0
-1
bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml
.../CategoryTemplateItem/portal_categories/order_builder.xml
+0
-1
bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml
...CategoryTemplateItem/portal_categories/source_carrier.xml
+0
-1
bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml
...ategoryTemplateItem/portal_categories/source_referral.xml
+0
-1
bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml
...se/CategoryTemplateItem/portal_categories/trade_phase.xml
+0
-1
bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml
bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml
+0
-1
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml
...rp5_pdm/CategoryTemplateItem/portal_categories/colour.xml
+0
-1
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/industrial_phase.xml
...tegoryTemplateItem/portal_categories/industrial_phase.xml
+0
-1
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml
...pdm/CategoryTemplateItem/portal_categories/morphology.xml
+0
-1
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml
..._pdm/CategoryTemplateItem/portal_categories/variation.xml
+0
-1
bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml
.../CategoryTemplateItem/portal_categories/delivery_mode.xml
+0
-1
bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml
...trade/CategoryTemplateItem/portal_categories/incoterm.xml
+0
-1
product/CMFCategory/tests/testCMFCategory.py
product/CMFCategory/tests/testCMFCategory.py
+15
-5
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml
...re/CategoryTemplateItem/portal_categories/destination.xml
+0
-1
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_account.xml
...oryTemplateItem/portal_categories/destination_account.xml
+0
-1
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml
...lateItem/portal_categories/destination_administration.xml
+0
-1
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_advice.xml
...goryTemplateItem/portal_categories/destination_advice.xml
+0
-1
No files found.
bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml
View file @
1ed317d1
...
...
@@ -32,7 +32,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_carrier.xml
View file @
1ed317d1
...
...
@@ -14,7 +14,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_referral.xml
View file @
1ed317d1
...
...
@@ -14,7 +14,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/CategoryTemplateItem/portal_categories/ledger.xml
View file @
1ed317d1
...
...
@@ -28,7 +28,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml
View file @
1ed317d1
...
...
@@ -32,7 +32,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/CategoryTemplateItem/portal_categories/source_carrier.xml
View file @
1ed317d1
...
...
@@ -10,7 +10,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/CategoryTemplateItem/portal_categories/source_referral.xml
View file @
1ed317d1
...
...
@@ -10,7 +10,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/CategoryTemplateItem/portal_categories/trade_phase.xml
View file @
1ed317d1
...
...
@@ -32,7 +32,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/CategoryTemplateItem/portal_categories/use.xml
View file @
1ed317d1
...
...
@@ -28,7 +28,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/colour.xml
View file @
1ed317d1
...
...
@@ -32,7 +32,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/industrial_phase.xml
View file @
1ed317d1
...
...
@@ -14,7 +14,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/morphology.xml
View file @
1ed317d1
...
...
@@ -32,7 +32,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_pdm/CategoryTemplateItem/portal_categories/variation.xml
View file @
1ed317d1
...
...
@@ -15,7 +15,6 @@
<value>
<tuple>
<string>
specialise
</string>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_trade/CategoryTemplateItem/portal_categories/delivery_mode.xml
View file @
1ed317d1
...
...
@@ -32,7 +32,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
<string>
resource
</string>
</tuple>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_trade/CategoryTemplateItem/portal_categories/incoterm.xml
View file @
1ed317d1
...
...
@@ -32,7 +32,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
<string>
resource
</string>
</tuple>
...
...
This diff is collapsed.
Click to expand it.
product/CMFCategory/tests/testCMFCategory.py
View file @
1ed317d1
...
...
@@ -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."""
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination.xml
View file @
1ed317d1
...
...
@@ -32,7 +32,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_account.xml
View file @
1ed317d1
...
...
@@ -14,7 +14,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_administration.xml
View file @
1ed317d1
...
...
@@ -14,7 +14,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/destination_advice.xml
View file @
1ed317d1
...
...
@@ -32,7 +32,6 @@
<key>
<string>
acquisition_base_category
</string>
</key>
<value>
<tuple>
<string>
order
</string>
<string>
parent
</string>
</tuple>
</value>
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment