Rebgrand vifib_software_pdm into slapos_pdm.

master/bt5/slapos_erp5/bt/dependency_list

@@ -2,4 +2,5 @@ slapos_category
 slapos_cloud
 slapos_slap_tool
 slapos_cache
-slapos_rest_api_v1
\ No newline at end of file
+slapos_rest_api_v1
+slapos_pdm
\ No newline at end of file

master/bt5/slapos_erp5/bt/revision

-26
\ No newline at end of file
+27
\ No newline at end of file

master/bt5/slapos_erp5/bt/template_local_role_list

@@ -7,4 +7,5 @@ organisation_module
 person_module
 software_installation_module
 software_instance_module
+software_product_module
 software_release_module
\ No newline at end of file

master/bt5/slapos_erp5/bt/template_local_roles_list

@@ -7,4 +7,5 @@ organisation_module
 person_module
 software_installation_module
 software_instance_module
+software_product_module
 software_release_module
\ No newline at end of file

master/bt5/slapos_erp5/bt/template_portal_type_role_list

@@ -18,5 +18,7 @@ Software Installation
 Software Installation Module
 Software Instance
 Software Instance Module
+Software Product
+Software Product Module
 Software Release
 Software Release Module
\ No newline at end of file

master/bt5/slapos_erp5/bt/template_portal_type_roles_list

@@ -18,5 +18,7 @@ Software Installation
 Software Installation Module
 Software Instance
 Software Instance Module
+Software Product
+Software Product Module
 Software Release
 Software Release Module
\ No newline at end of file

master/bt5/vifib_software_pdm/PortalTypePropertySheetTemplateItem/property_sheet_list.xml → master/bt5/slapos_pdm/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

 <property_sheet_list>
  <portal_type id="Software Product">
   <item>DefaultImage</item>
+  <item>SlapOSSoftwareProductConstraint</item>
+ </portal_type>
+ <portal_type id="Software Release">
+  <item>SlapOSSoftwareReleaseConstraint</item>
  </portal_type>
 </property_sheet_list>
\ No newline at end of file

master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareReleaseConstraint.xml → master/bt5/slapos_pdm/PropertySheetTemplateItem/portal_property_sheets/SlapOSSoftwareProductConstraint.xml

@@ -24,9 +24,15 @@
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>VifibSoftwareReleaseConstraint</string> </value>
+            <value> <string>SlapOSSoftwareProductConstraint</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSoftwareProductConstraint.xml → master/bt5/slapos_pdm/PropertySheetTemplateItem/portal_property_sheets/SlapOSSoftwareReleaseConstraint.xml

@@ -24,9 +24,15 @@
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>VifibSoftwareProductConstraint</string> </value>
+            <value> <string>SlapOSSoftwareReleaseConstraint</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

master/bt5/vifib_software_pdm/SkinTemplateItem/portal_skins/vifib_software_pdm.xml → master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm.xml

@@ -35,7 +35,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>vifib_software_pdm</string> </value>
+            <value> <string>slapos_pdm</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

master/bt5/slapos_pdm/bt/copyright_list

+2012 Nexedi SA
\ No newline at end of file

master/bt5/slapos_pdm/bt/description

+Specialised PDM management for SlapOS.
\ No newline at end of file

master/bt5/slapos_pdm/bt/template_format_version

+1
\ No newline at end of file

master/bt5/slapos_pdm/bt/template_portal_type_property_sheet_list

+Software Product | DefaultImage
+Software Product | SlapOSSoftwareProductConstraint
+Software Release | SlapOSSoftwareReleaseConstraint
\ No newline at end of file

master/bt5/slapos_pdm/bt/template_property_sheet_id_list

+SlapOSSoftwareProductConstraint
+SlapOSSoftwareReleaseConstraint
\ No newline at end of file

master/bt5/slapos_pdm/bt/template_skin_id_list

+slapos_pdm
\ No newline at end of file

master/bt5/slapos_pdm/bt/title

+slapos_pdm
\ No newline at end of file

master/bt5/vifib_erp5/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -50,10 +50,4 @@
  <portal_type id="Sale Packing List Line">
   <item>VifibSalePackingListLineConstraint</item>
  </portal_type>
- <portal_type id="Software Product">
-  <item>VifibSoftwareProductConstraint</item>
- </portal_type>
- <portal_type id="Software Release">
-  <item>VifibSoftwareReleaseConstraint</item>
- </portal_type>
 </property_sheet_list>
\ No newline at end of file

master/bt5/vifib_erp5/bt/dependency_list

@@ -23,7 +23,7 @@ vifib_slap
 vifib_slapos_accounting
 vifib_slapos_capacity
 slapos_rest_api_v1
-vifib_software_pdm
+slapos_pdm
 vifib_upgrader
 vifib_web
 slapos_erp5
\ No newline at end of file

master/bt5/vifib_erp5/bt/revision

-533
\ No newline at end of file
+534
\ No newline at end of file

master/bt5/vifib_erp5/bt/template_local_role_list

@@ -68,7 +68,6 @@ service_module/computer_registration
 service_module/vifib_discount
 service_module/vifib_registration
 service_module/vifib_tax
-software_product_module
 software_product_module/test_software_product
 software_release_module/test_software_release
 support_request_module

master/bt5/vifib_erp5/bt/template_local_roles_list

@@ -68,11 +68,10 @@ service_module/computer_registration
 service_module/vifib_discount
 service_module/vifib_registration
 service_module/vifib_tax
-software_product_module
-software_product_module/test_software_product
-software_release_module/test_software_release
 support_request_module
 system_event_module
 tax_module
 transformation_module
-web_page_module
\ No newline at end of file
+web_page_module
+software_product_module/test_software_product
+software_release_module/test_software_release
\ No newline at end of file

master/bt5/vifib_erp5/bt/template_portal_type_property_sheet_list

@@ -14,6 +14,4 @@ Sale Invoice Transaction | VifibSaleInvoiceConstraint
 Sale Order Line | VifibSaleOrderLineConstraint
 Sale Order | VifibSaleOrderConstraint
 Sale Packing List Line | VifibSalePackingListLineConstraint
-Sale Packing List | VifibSalePackingListConstraint
-Software Product | VifibSoftwareProductConstraint
-Software Release | VifibSoftwareReleaseConstraint
\ No newline at end of file
+Sale Packing List | VifibSalePackingListConstraint
\ No newline at end of file

master/bt5/vifib_erp5/bt/template_portal_type_role_list

@@ -76,8 +76,6 @@ Service
 Service Module
 Short Message
 Site Message
-Software Product
-Software Product Module
 Spreadsheet
 Support Request
 Support Request Module

master/bt5/vifib_erp5/bt/template_portal_type_roles_list

@@ -76,8 +76,6 @@ Service
 Service Module
 Short Message
 Site Message
-Software Product
-Software Product Module
 Spreadsheet
 Support Request
 Support Request Module

master/bt5/vifib_erp5/bt/template_property_sheet_id_list

@@ -3,12 +3,10 @@ VifibPersonConstraint
 VifibComputerPartitionConstraint
 VifibEmailConstraint
 VifibComputerConstraint
-VifibSoftwareProductConstraint
 VifibInternalPackingListConstraint
 VifibInternalPackingListLineConstraint
 VifibPurchasePackingListLineConstraint
 VifibPurchasePackingListConstraint
-VifibSoftwareReleaseConstraint
 VifibSaleOrderConstraint
 VifibSaleOrderLineConstraint
 VifibSaleInvoiceConstraint

master/bt5/vifib_software_pdm/bt/copyright_list

-Nexedi SA
\ No newline at end of file

master/bt5/vifib_software_pdm/bt/description

-Specialise ERP5 Software PDM for ViFib Project
\ No newline at end of file

master/bt5/vifib_software_pdm/bt/revision

-20
\ No newline at end of file

master/bt5/vifib_software_pdm/bt/template_portal_type_property_sheet_list

-Software Product | DefaultImage
\ No newline at end of file

master/bt5/vifib_software_pdm/bt/template_skin_id_list

-vifib_software_pdm
\ No newline at end of file

master/bt5/vifib_software_pdm/bt/title

-vifib_software_pdm
\ No newline at end of file

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml

@@ -106,6 +106,7 @@ REQUIRED_BT5_ID_LIST = (\n
   \'vifib_data_category\',\n
   \'vifib_data_payzen\',\n
   \'vifib_data_web\',\n
+  \'slapos_pdm\',\n
   \'slapos_cloud\',\n
   \'vifib_web\',\n
   \'vifib_slap\',\n

master/bt5/vifib_upgrader/bt/revision

-158
\ No newline at end of file
+159
\ No newline at end of file

master/bt5/vifib_web/bt/dependency_list

@@ -4,5 +4,5 @@ erp5_dms
 erp5_jquery
 erp5_km
 erp5_web
-vifib_software_pdm
+slapos_pdm
 vifib_payzen
\ No newline at end of file

master/bt5/vifib_web/bt/revision

-479
\ No newline at end of file
+480
\ No newline at end of file

master/product/SlapOS/tests/testSlapOSMixin.py

@@ -137,6 +137,7 @@ class testSlapOSMixin(Products.Vifib.tests.VifibMixin.testVifibMixin):
       'slapos_rest_api_tool_portal_type',
       'slapos_rest_api',
       'slapos_rest_api_v1',
+      'slapos_pdm',
       'slapos_erp5',
     ]
     return result

master/product/Vifib/tests/VifibMixin.py

@@ -104,7 +104,7 @@ class testVifibMixin(ERP5TypeTestCase):
       'slapos_slap_tool',
       'slapos_category',
       'vifib_payzen',
-      'vifib_software_pdm',
+      'slapos_pdm',
       'erp5_upgrader',
       'slapos_rest_api',
       'vifib_data',

master/product/Vifib/tests/testVifibSkinSelection.py

@@ -114,6 +114,7 @@ custom
 vifib_upgrader
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -127,7 +128,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web
 vifib_web_ui_test
@@ -222,6 +222,7 @@ vifib_upgrader
 vifib_hosting
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -235,7 +236,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web
 vifib_web_ui_test
@@ -329,6 +329,7 @@ custom
 vifib_upgrader
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -339,7 +340,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web_ui_test
 vifib_configurator
@@ -430,6 +430,7 @@ custom
 vifib_upgrader
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -440,7 +441,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web_ui_test
 vifib_configurator
@@ -531,6 +531,7 @@ custom
 vifib_upgrader
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -541,7 +542,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web
 vifib_web_ui_test
@@ -635,6 +635,7 @@ custom
 vifib_upgrader
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -645,7 +646,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web_ui_test
 vifib_configurator
@@ -739,6 +739,7 @@ custom
 vifib_upgrader
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -749,7 +750,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web_ui_test
 vifib_configurator
@@ -840,6 +840,7 @@ custom
 vifib_upgrader
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -850,7 +851,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web_ui_test
 vifib_configurator
@@ -940,6 +940,7 @@ custom
 vifib_upgrader
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -950,7 +951,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web_ui_test
 vifib_configurator
@@ -1043,6 +1043,7 @@ vifib_upgrader_before_201208
 vifib_upgrader_before_201209
 slapos_cloud
 slapos_core
+slapos_pdm
 slapos_rest_api
 vifib_agent
 vifib_base
@@ -1053,7 +1054,6 @@ vifib_promise
 vifib_simulation
 vifib_slap
 vifib_slapos_capacity
-vifib_software_pdm
 vifib_test
 vifib_web_ui_test
 vifib_configurator

master/tests/__init__.py

@@ -16,7 +16,6 @@ class VIFIB(SavedTestSuite, ProjectTestSuite):
     'vifib_erp5',
     'vifib_open_trade',
     'vifib_slap',
-    'vifib_software_pdm',
     'vifib_upgrader',
     'vifib_web',
   ]