Commit 274ca597 authored by Fabien Morin's avatar Fabien Morin

* add allowed content types on forms portal_types to be able to add attachment on all forms.

* remove old and unused base category (collateral_parent, ...)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23013 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 743f36ab
<allowed_content_type_list> <allowed_content_type_list>
<portal_type id="M0"> <portal_type id="M0">
<item>File</item>
<item>PDF</item> <item>PDF</item>
<item>M0 Bis</item> <item>M0 Bis</item>
<item>File</item>
</portal_type> </portal_type>
<portal_type id="M0 Module"> <portal_type id="M0 Module">
<item>M0</item> <item>M0</item>
...@@ -15,15 +15,21 @@ ...@@ -15,15 +15,21 @@
<portal_type id="M2 Module"> <portal_type id="M2 Module">
<item>M2</item> <item>M2</item>
</portal_type> </portal_type>
<portal_type id="M4">
<item>Image</item>
<item>File</item>
<item>PDF</item>
<item>Text</item>
</portal_type>
<portal_type id="M4 Module"> <portal_type id="M4 Module">
<item>M4</item> <item>M4</item>
</portal_type> </portal_type>
<portal_type id="Organisation"> <portal_type id="Organisation">
<item>Address</item> <item>Address</item>
<item>Link</item> <item>Link</item>
<item>Telephone</item>
<item>Bank Account</item> <item>Bank Account</item>
<item>Fax</item> <item>Fax</item>
<item>Telephone</item>
<item>Credit Card</item> <item>Credit Card</item>
<item>Document</item> <item>Document</item>
<item>Email</item> <item>Email</item>
...@@ -34,22 +40,28 @@ ...@@ -34,22 +40,28 @@
<item>Organisation</item> <item>Organisation</item>
</portal_type> </portal_type>
<portal_type id="P0"> <portal_type id="P0">
<item>Text</item>
<item>PDF</item> <item>PDF</item>
<item>Image</item>
<item>File</item> <item>File</item>
</portal_type> </portal_type>
<portal_type id="P0 Module"> <portal_type id="P0 Module">
<item>P0</item> <item>P0</item>
</portal_type> </portal_type>
<portal_type id="P2"> <portal_type id="P2">
<item>Image</item>
<item>PDF</item> <item>PDF</item>
<item>File</item> <item>File</item>
<item>Text</item>
</portal_type> </portal_type>
<portal_type id="P2 Module"> <portal_type id="P2 Module">
<item>P2</item> <item>P2</item>
</portal_type> </portal_type>
<portal_type id="P4"> <portal_type id="P4">
<item>Text</item>
<item>PDF</item> <item>PDF</item>
<item>File</item> <item>File</item>
<item>Image</item>
</portal_type> </portal_type>
<portal_type id="P4 Module"> <portal_type id="P4 Module">
<item>P4</item> <item>P4</item>
...@@ -70,9 +82,21 @@ ...@@ -70,9 +82,21 @@
<portal_type id="Person Module"> <portal_type id="Person Module">
<item>Person</item> <item>Person</item>
</portal_type> </portal_type>
<portal_type id="S1">
<item>PDF</item>
<item>Image</item>
<item>Text</item>
<item>File</item>
</portal_type>
<portal_type id="S1 Module"> <portal_type id="S1 Module">
<item>S1</item> <item>S1</item>
</portal_type> </portal_type>
<portal_type id="S5">
<item>PDF</item>
<item>File</item>
<item>Text</item>
<item>Image</item>
</portal_type>
<portal_type id="S5 Module"> <portal_type id="S5 Module">
<item>S5</item> <item>S5</item>
</portal_type> </portal_type>
......
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
<item>follow_up</item> <item>follow_up</item>
</portal_type> </portal_type>
<portal_type id="Organisation"> <portal_type id="Organisation">
<item>inscription_parent</item>
<item>role</item> <item>role</item>
<item>collateral_parent</item>
</portal_type> </portal_type>
<portal_type id="Organisation Module"> <portal_type id="Organisation Module">
<item>business_application</item> <item>business_application</item>
...@@ -44,8 +42,6 @@ ...@@ -44,8 +42,6 @@
<item>aggregate</item> <item>aggregate</item>
</portal_type> </portal_type>
<portal_type id="Person"> <portal_type id="Person">
<item>inscription_parent</item>
<item>collateral_parent</item>
<item>destination_form</item> <item>destination_form</item>
</portal_type> </portal_type>
<portal_type id="Person Module"> <portal_type id="Person Module">
...@@ -54,11 +50,9 @@ ...@@ -54,11 +50,9 @@
<portal_type id="S1"> <portal_type id="S1">
<item>follow_up</item> <item>follow_up</item>
<item>destination_form</item> <item>destination_form</item>
<item>collateral_parent</item>
</portal_type> </portal_type>
<portal_type id="S5"> <portal_type id="S5">
<item>destination_form</item> <item>destination_form</item>
<item>inscription_parent</item>
<item>follow_up</item> <item>follow_up</item>
</portal_type> </portal_type>
</base_category_list> </base_category_list>
\ No newline at end of file
...@@ -7,6 +7,10 @@ M2 | File ...@@ -7,6 +7,10 @@ M2 | File
M2 | M2 Bis M2 | M2 Bis
M2 | PDF M2 | PDF
M4 Module | M4 M4 Module | M4
M4 | File
M4 | Image
M4 | PDF
M4 | Text
Organisation Module | Organisation Organisation Module | Organisation
Organisation | Address Organisation | Address
Organisation | Bank Account Organisation | Bank Account
...@@ -20,13 +24,19 @@ Organisation | Link ...@@ -20,13 +24,19 @@ Organisation | Link
Organisation | Telephone Organisation | Telephone
P0 Module | P0 P0 Module | P0
P0 | File P0 | File
P0 | Image
P0 | PDF P0 | PDF
P0 | Text
P2 Module | P2 P2 Module | P2
P2 | File P2 | File
P2 | Image
P2 | PDF P2 | PDF
P2 | Text
P4 Module | P4 P4 Module | P4
P4 | File P4 | File
P4 | Image
P4 | PDF P4 | PDF
P4 | Text
Person Module | Person Person Module | Person
Person | Address Person | Address
Person | Assignment Person | Assignment
...@@ -40,4 +50,12 @@ Person | Image ...@@ -40,4 +50,12 @@ Person | Image
Person | Link Person | Link
Person | Telephone Person | Telephone
S1 Module | S1 S1 Module | S1
S1 | File
S1 | Image
S1 | PDF
S1 | Text
S5 Module | S5 S5 Module | S5
S5 | File
S5 | Image
S5 | PDF
S5 | Text
\ No newline at end of file
...@@ -8,8 +8,6 @@ M4 | destination_form ...@@ -8,8 +8,6 @@ M4 | destination_form
M4 | follow_up M4 | follow_up
Mail Message | follow_up Mail Message | follow_up
Organisation Module | business_application Organisation Module | business_application
Organisation | collateral_parent
Organisation | inscription_parent
Organisation | role Organisation | role
P0 | destination_form P0 | destination_form
P0 | follow_up P0 | follow_up
...@@ -19,13 +17,8 @@ P4 | destination_form ...@@ -19,13 +17,8 @@ P4 | destination_form
P4 | follow_up P4 | follow_up
PDF | aggregate PDF | aggregate
Person Module | business_application Person Module | business_application
Person | collateral_parent
Person | destination_form Person | destination_form
Person | destination_form
Person | inscription_parent
S1 | collateral_parent
S1 | destination_form S1 | destination_form
S1 | follow_up S1 | follow_up
S5 | destination_form S5 | destination_form
S5 | follow_up S5 | follow_up
\ No newline at end of file
S5 | inscription_parent
\ No newline at end of file
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