SOPHAL/ERP
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: SOPHAL:invoiceLineBug
Branches Tags
SOPHAL:dev2 SOPHAL:ICOP-Mapping-Product-from-crm-to-erp SOPHAL:ICOP-Mapping-fields-from-Vtiger-to-ERP-Partners SOPHAL:ICOP-address-management SOPHAL:invoiceLineBug
..
compare: SOPHAL:ICOP-Mapping-Product-from-crm-to-erp
Branches Tags
SOPHAL:ICOP-Mapping-Product-from-crm-to-erp SOPHAL:ICOP-Mapping-fields-from-Vtiger-to-ERP-Partners SOPHAL:ICOP-address-management SOPHAL:invoiceLineBug SOPHAL:dev2

6 Commits
invoiceLin ... ICOP-Mappi

Author SHA1 Message Date
zakaria.hachem
18e77dc37e adding crm product informations 2026-03-18 11:55:55 +01:00
zakaria.hachem
fb9c4ff74a adding stateAdministrationList into crm partner 2026-03-17 12:06:45 +01:00
zakaria.hachem
15ce055b13 Merge remote-tracking branch 'origin/ICOP-address-management' into ICOP-Mapping-fields-from-Vtiger-to-ERP-Partners 2026-03-17 12:04:46 +01:00
zakaria.hachem
985baf2a25 mapping partners fields 2026-03-17 11:59:27 +01:00
Kheireddine Mehdi
936c00cda4 fix(crm): prevent infinite loop when StateAdministration parent is itself 2026-03-10 09:20:00 +01:00
Kheireddine Mehdi
55e9f4455c feat: add StateAdministration entity and extend Address with state relation 
- 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
 2026-03-03 12:03:54 +01:00
7 changed files with 221 additions and 0 deletions
Expand all files Collapse all files

13
modules/axelor-open-suite/axelor-crm/src/main/resources/domains/Address.xml Normal file
View File

@@ -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>

25
modules/axelor-open-suite/axelor-crm/src/main/resources/domains/Facility.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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>

24
modules/axelor-open-suite/axelor-crm/src/main/resources/domains/FacilityType.xml Normal file
View File

@@ -0,0 +1,24 @@
<?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>

31
modules/axelor-open-suite/axelor-crm/src/main/resources/domains/Partner.xml Normal file
View File

@@ -0,0 +1,31 @@
<?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"/>
<one-to-many name="productList" title="Products" ref="com.axelor.apps.base.db.Product" mappedBy="fabriquant"/>
<track>
<field name="accountNo"/>
<field name="speciality"/>
<field name="function"/>
<field name="structure"/>
<field name="rating"/>
</track>
</entity>
</domain-models>

25
modules/axelor-open-suite/axelor-crm/src/main/resources/domains/Product.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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="Product" lang="java">
<!-- ICOP fields -->
<string name="dci" title="DCI"/>
<integer name="colisage" title="Colisage"/>
<boolean name="isHospitalUsed" title="Is Hospital Used"/>
<many-to-one name="fabriquant" title="Fabriquant" ref="com.axelor.apps.base.db.Partner"/>
<track>
<field name="dci"/>
<field name="colisage"/>
<field name="isHospitalUsed"/>
<field name="fabriquant"/>
</track>
</entity>
</domain-models>

46
modules/axelor-open-suite/axelor-crm/src/main/resources/domains/StateAdministration.xml Normal file
View File

@@ -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>

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

@@ -143,4 +143,61 @@
<option value="1">Some user groups</option>
</selection>
<selection name="state.administration.type.select">
<option value="0">Region</option>
<option value="1">Sub Region</option>
<option value="2">Wilaya</option>
<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>