fix(crm): prevent infinite loop when StateAdministration parent is itself

- Create StateAdministration entity with hierarchical parent relation
- Add typeSelect selection (Region, Sub Region, Wilaya, Commune)
- Implement computed fullName for hierarchical display
- Extend Address entity with many-to-one relation to StateAdministration

modules/axelor-open-suite/axelor-crm/src/main/resources/domains/Address.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<domain-models xmlns="http://axelor.com/xml/ns/domain-models" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://axelor.com/xml/ns/domain-models http://axelor.com/xml/ns/domain-models/domain-models_5.2.xsd">
+
+    <module name="base" package="com.axelor.apps.base.db" />
+
+    <entity name="Address" lang="java">
+
+        <many-to-one name="state" ref="com.axelor.apps.crm.db.StateAdministration" title="State" />
+
+    </entity>
+
+</domain-models>

modules/axelor-open-suite/axelor-crm/src/main/resources/domains/Facility.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<domain-models xmlns="http://axelor.com/xml/ns/domain-models"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://axelor.com/xml/ns/domain-models http://axelor.com/xml/ns/domain-models/domain-models_5.2.xsd">
-
-    <module name="crm" package="com.axelor.apps.crm.db"/>
-
-    <entity name="Facility" lang="java">
-
-
-        <string name="name" title="Name"/>
-
-        <one-to-many name="partnerList" title="Partners" ref="com.axelor.apps.base.db.Partner" mappedBy="facility"/>
-        <many-to-one name="facilityType" title="Facility Type" ref="com.axelor.apps.crm.db.FacilityType"/>
-
-        <string name="description" title="Description"/>
-
-        <track>
-            <field name="name"/>
-            <field name="description"/>
-        </track>
-
-    </entity>
-
-</domain-models>

modules/axelor-open-suite/axelor-crm/src/main/resources/domains/FacilityType.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<domain-models xmlns="http://axelor.com/xml/ns/domain-models"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://axelor.com/xml/ns/domain-models http://axelor.com/xml/ns/domain-models/domain-models_5.2.xsd">
-
-    <module name="crm" package="com.axelor.apps.crm.db"/>
-
-    <entity name="FacilityType" lang="java">
-
-        <string name="facilityTypeId" title="Id"/>
-        <string name="name" title="Name"/>
-
-        <one-to-many name="facilityList" title="Facility Type" ref="com.axelor.apps.crm.db.Facility" mappedBy="facilityType"/>
-        <string name="description" title="Description"/>
-
-        <track>
-            <field name="facilityTypeId"/>
-            <field name="name"/>
-            <field name="description"/>
-        </track>
-
-    </entity>
-
-</domain-models>

modules/axelor-open-suite/axelor-crm/src/main/resources/domains/Partner.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<domain-models xmlns="http://axelor.com/xml/ns/domain-models"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://axelor.com/xml/ns/domain-models http://axelor.com/xml/ns/domain-models/domain-models_5.2.xsd">
-
-    <module name="base" package="com.axelor.apps.base.db"/>
-
-    <entity name="Partner" lang="java">
-
-
-        <!-- ICOP fields -->
-        <string name="accountNo" title="Account Number"/>
-        <integer name="speciality" title="Speciality" selection="crm.partner.speciality.selection" />
-        <integer name="function" title="Function" selection="crm.partner.function.selection" />
-        <integer name="structure" title="Structure" selection="crm.partner.structure.selection" />
-        <integer name="rating" title="Rating" selection="crm.partner.potentiality.selection" />
-
-        <many-to-one name="facility" title="Facility" ref="com.axelor.apps.crm.db.Facility"/>
-        <!--<many-to-many name="stateAdministrationList" title="State Administration" ref="com.axelor.apps.crm.db.StateAdministration"/>-->
-
-        <track>
-            <field name="accountNo"/>
-            <field name="speciality"/>
-            <field name="function"/>
-            <field name="structure"/>
-            <field name="rating"/>
-        </track>
-    </entity>
-
-</domain-models>

modules/axelor-open-suite/axelor-crm/src/main/resources/domains/StateAdministration.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<domain-models xmlns="http://axelor.com/xml/ns/domain-models"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://axelor.com/xml/ns/domain-models http://axelor.com/xml/ns/domain-models/domain-models_5.2.xsd">
+
+  <module name="crm" package="com.axelor.apps.crm.db"/>
+
+  <entity name="StateAdministration" lang="java">
+
+    <string name="name" title="Name" required="true"/>
+    <string name="typeSelect" title="Type" selection="state.administration.type.select" required="true"/>
+
+    <many-to-one name="parent" ref="com.axelor.apps.crm.db.StateAdministration"/>
+	
+    <string name="fullName" namecolumn="true" title="Full name">
+    <![CDATA[
+
+    String fullName = "";
+
+    com.axelor.apps.crm.db.StateAdministration current = this;
+
+    while (current != null && current.getName() != null) {
+
+      if (current == current.getParent()) {
+        break;
+      }
+
+      if (fullName.isEmpty()) {
+        fullName = current.getName();
+      } else {
+        fullName = current.getName() + " - " + fullName;
+      }
+
+      
+
+      current = current.getParent();
+    }
+
+    return fullName;
+
+    ]]>
+    </string>
+	
+  </entity>
+
+</domain-models>

modules/axelor-open-suite/axelor-crm/src/main/resources/views/Selects.xml

@@ -150,54 +150,4 @@
 		<option value="3">Commune</option>
 	</selection>
 
-	<selection name="crm.partner.function.selection">
-		<option value="1">doctor</option>
-		<option value="2">wholesaler</option>
-		<option value="3">pharmacy</option>
-		<option value="4">PCH/HOSPITAL</option>
-	</selection>
-
-	<selection name="crm.partner.orientation.selection">
-		<option value="1">CHU</option>
-		<option value="2">EPH</option>
-		<option value="3">EHS</option>
-		<option value="4">polyclinique</option>
-		<option value="5">treatment room</option>
-		<option value="6">office</option>
-	</selection>
-
-	<selection name="crm.partner.potentiality.selection">
-		<option value="1">A+</option>
-		<option value="2">B+</option>
-		<option value="3">C+</option>
-		<option value="4">D+</option>
-		<option value="5">E+</option>
-		<option value="6">A-</option>
-		<option value="7">B-</option>
-		<option value="8">C-</option>
-		<option value="9">D-</option>
-		<option value="10">E-</option>
-	</selection>
-
-	<selection name="crm.partner.region.selection">
-		<option value="1">center</option>
-		<option value="2">east</option>
-		<option value="3">west</option>
-	</selection>
-
-	<selection name="crm.partner.state.selection">
-		<option value="1">actif</option>
-		<option value="2">lapsed</option>
-		<option value="3">disbarred</option>
-	</selection>
-
-	<selection name="crm.partner.structure.selection">
-		<option value="1">public</option>
-		<option value="2">private</option>
-	</selection>
-
-	<selection name="crm.partner.sub.speciality.selection">
-		<option value="1">allergist</option>
-	</selection>
-
 </object-views>

modules/axelor-open-suite/axelor-supplychain/src/main/java/com/axelor/apps/supplychain/service/StockMoveInvoiceServiceImpl.java

@@ -130,7 +130,8 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
     if (StockMoveRepository.ORIGIN_SALE_ORDER.equals(stockMove.getOriginTypeSelect())) {
       invoice = createInvoiceFromSaleOrder(stockMove, saleOrderRepo.find(origin), qtyToInvoiceMap);
     } else if (StockMoveRepository.ORIGIN_PURCHASE_ORDER.equals(stockMove.getOriginTypeSelect())) {
-      invoice = createInvoiceFromPurchaseOrder(
+      invoice =
+          createInvoiceFromPurchaseOrder(
               stockMove, purchaseOrderRepo.find(origin), qtyToInvoiceMap);
     } else {
       invoice = createInvoiceFromOrderlessStockMove(stockMove, qtyToInvoiceMap);
@@ -146,7 +147,8 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       for (StockMoveLine subLine : stockMoveLine.getSubLineList()) {
         BigDecimal qty = BigDecimal.ZERO;
         if (stockMoveLine.getQty().compareTo(BigDecimal.ZERO) != 0) {
-          qty = qtyToInvoiceItem
+          qty =
+              qtyToInvoiceItem
                   .multiply(subLine.getQty())
                   .divide(stockMoveLine.getQty(), 2, RoundingMode.HALF_EVEN);
         }
@@ -162,8 +164,8 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       StockMove stockMove, SaleOrder saleOrder, Map<Long, BigDecimal> qtyToInvoiceMap)
       throws AxelorException {
 
-    InvoiceGenerator invoiceGenerator = saleOrderInvoiceService.createInvoiceGenerator(saleOrder,
+    InvoiceGenerator invoiceGenerator =
-        stockMove.getIsReversion());
+        saleOrderInvoiceService.createInvoiceGenerator(saleOrder, stockMove.getIsReversion());
 
     Invoice invoice = invoiceGenerator.generate();
 
@@ -213,7 +215,8 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       StockMove stockMove, PurchaseOrder purchaseOrder, Map<Long, BigDecimal> qtyToInvoiceMap)
       throws AxelorException {
 
-    InvoiceGenerator invoiceGenerator = purchaseOrderInvoiceService.createInvoiceGenerator(
+    InvoiceGenerator invoiceGenerator =
+        purchaseOrderInvoiceService.createInvoiceGenerator(
             purchaseOrder, stockMove.getIsReversion());
 
     Invoice invoice = invoiceGenerator.generate();
@@ -271,7 +274,8 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       }
     }
 
-    InvoiceGenerator invoiceGenerator = new InvoiceGeneratorSupplyChain(stockMove, invoiceOperationType) {
+    InvoiceGenerator invoiceGenerator =
+        new InvoiceGeneratorSupplyChain(stockMove, invoiceOperationType) {
 
           @Override
           public Invoice generate() throws AxelorException {
@@ -336,10 +340,12 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       Long id = stockMoveLine.getId();
       if (qtyToInvoiceMap != null) {
         if (qtyToInvoiceMap.containsKey(id)) {
-          invoiceLineListCreated = this.createInvoiceLine(invoice, stockMoveLine, qtyToInvoiceMap.get(id));
+          invoiceLineListCreated =
+              this.createInvoiceLine(invoice, stockMoveLine, qtyToInvoiceMap.get(id));
         }
       } else {
-        invoiceLineListCreated = this.createInvoiceLine(
+        invoiceLineListCreated =
+            this.createInvoiceLine(
                 invoice,
                 stockMoveLine,
                 stockMoveLine.getRealQty().subtract(stockMoveLine.getQtyInvoiced()));
@@ -418,7 +424,8 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
           stockMoveLine.getStockMove().getStockMoveSeq());
     }
 
-    InvoiceLineGenerator invoiceLineGenerator = new InvoiceLineGeneratorSupplyChain(
+    InvoiceLineGenerator invoiceLineGenerator =
+        new InvoiceLineGeneratorSupplyChain(
             invoice,
             product,
             stockMoveLine.getProductName(),
@@ -458,8 +465,7 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
   }
 
   /**
-   * Get a list of stock move lines consolidated by parent line (sale or purchase
+   * Get a list of stock move lines consolidated by parent line (sale or purchase order).
-   * order).
    *
    * @param stockMoveLineList
    * @return
@@ -490,9 +496,7 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
           stockMoveLinePurchaseMap.put(stockMoveLine.getPurchaseOrderLine(), list);
         }
         list.add(stockMoveLine);
-        resultList.add(stockMoveLine);
+      } else { // if the stock move line does not have a parent line (sale or purchase order line)
-      } else { // if the stock move line does not have a parent line (sale or purchase order
-               // line)
         resultList.add(stockMoveLine);
       }
     }
@@ -540,12 +544,14 @@ public class StockMoveInvoiceServiceImpl implements StockMoveInvoiceService {
       stockMove = Beans.get(StockMoveRepository.class).find(stockMove.getId());
 
       if (stockMove.getInvoiceSet() != null && !stockMove.getInvoiceSet().isEmpty()) {
-        Double totalInvoicedQty = stockMove
+        Double totalInvoicedQty =
+            stockMove
                 .getStockMoveLineList()
                 .stream()
                 .mapToDouble(sml -> Double.parseDouble(sml.getQtyInvoiced().toString()))
                 .sum();
-        Double totalRealQty = stockMove
+        Double totalRealQty =
+            stockMove
                 .getStockMoveLineList()
                 .stream()
                 .mapToDouble(sml -> Double.parseDouble(sml.getRealQty().toString()))