diff --git a/doc/src/technical/guia-desenvolvemento/guia-integracion-terceiros.rst b/doc/src/technical/guia-desenvolvemento/guia-integracion-terceiros.rst index 40c8da650..febf382ff 100644 --- a/doc/src/technical/guia-desenvolvemento/guia-integracion-terceiros.rst +++ b/doc/src/technical/guia-desenvolvemento/guia-integracion-terceiros.rst @@ -372,14 +372,14 @@ Exemplo de ficheiro de importación - + - + diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialCategoryDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialCategoryDTO.java index 91683ef1a..0b64ede98 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialCategoryDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialCategoryDTO.java @@ -43,7 +43,7 @@ public class MaterialCategoryDTO extends IntegrationEntityDTO { @XmlAttribute public String parent; - @XmlElement + @XmlElement(name = "children") public MaterialCategoryListDTO subcategories; @XmlElementWrapper(name = "material-list") diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialDTO.java index 093c87fe2..1d9c1a4b2 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/api/MaterialDTO.java @@ -37,10 +37,10 @@ public class MaterialDTO extends IntegrationEntityDTO { @XmlAttribute public String description; - @XmlAttribute + @XmlAttribute(name = "price") public BigDecimal defaultPrice; - @XmlAttribute + @XmlAttribute(name = "unit-type") public String unitType; @XmlAttribute diff --git a/scripts/rest-clients/material-categories-sample.xml b/scripts/rest-clients/material-categories-sample.xml index d19af03f9..74582a375 100644 --- a/scripts/rest-clients/material-categories-sample.xml +++ b/scripts/rest-clients/material-categories-sample.xml @@ -1,42 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/rest-clients/unit-types-sample.xml b/scripts/rest-clients/unit-types-sample.xml index 30c4b93a9..e483b20c2 100644 --- a/scripts/rest-clients/unit-types-sample.xml +++ b/scripts/rest-clients/unit-types-sample.xml @@ -9,6 +9,8 @@ + +