diff --git a/modules/axelor-open-suite/axelor-contract/src/main/resources/domains/ImportationFolder.xml b/modules/axelor-open-suite/axelor-contract/src/main/resources/domains/ImportationFolder.xml
new file mode 100644
index 0000000..4bd5b64
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-contract/src/main/resources/domains/ImportationFolder.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/ImportationFolderService.java b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/ImportationFolderService.java
new file mode 100644
index 0000000..ac709d8
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/ImportationFolderService.java
@@ -0,0 +1,15 @@
+package com.axelor.apps.purchase.service;
+
+import com.axelor.apps.purchase.db.ImportationFolder;
+import com.axelor.exception.AxelorException;
+
+public interface ImportationFolderService {
+
+ public void draftImportationFolder(ImportationFolder importationFolder);
+
+ public void openImportationFolder(ImportationFolder importationFolder) throws AxelorException;
+
+ public void closeImportationFolder(ImportationFolder importationFolder);
+
+ public void cancelImportationFolder(ImportationFolder importationFolder);
+}
\ No newline at end of file
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/ImportationFolderServiceImpl.java b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/ImportationFolderServiceImpl.java
new file mode 100644
index 0000000..0a4076a
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/service/ImportationFolderServiceImpl.java
@@ -0,0 +1,40 @@
+package com.axelor.apps.purchase.service;
+
+import com.axelor.apps.base.service.administration.SequenceService;
+import com.axelor.apps.purchase.db.ImportationFolder;
+import com.axelor.apps.purchase.db.repo.ImportationFolderRepository;
+import com.axelor.exception.AxelorException;
+import com.google.inject.Inject;
+import com.google.inject.persist.Transactional;
+
+public class ImportationFolderServiceImpl implements ImportationFolderService {
+
+ @Inject
+ protected ImportationFolderRepository importationFolderRepository;
+
+ @Override
+ @Transactional
+ public void draftImportationFolder(ImportationFolder importationFolder) {
+ // TODO Auto-generated method stub
+ // importationFolder.setStatusSelect(ImportationFolderRepository.STATUS_DRAFT);
+ }
+
+ @Override
+ @Transactional
+ public void openImportationFolder(ImportationFolder importationFolder) throws AxelorException {
+ // importationFolder.setStatusSelect(ImportationFolderRepository.STATUS_OPEND);
+ }
+
+ @Override
+ @Transactional
+ public void closeImportationFolder(ImportationFolder importationFolder) {
+ // importationFolder.setStatusSelect(ImportationFolderRepository.STATUS_CLOSED);
+ }
+
+ @Override
+ @Transactional
+ public void cancelImportationFolder(ImportationFolder importationFolder) {
+ // importationFolder.setStatusSelect(ImportationFolderRepository.STATUS_CANCELED);
+ }
+
+}
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/web/ImportationFolderController.java b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/web/ImportationFolderController.java
new file mode 100644
index 0000000..ec169ac
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/java/com/axelor/apps/purchase/web/ImportationFolderController.java
@@ -0,0 +1,32 @@
+package com.axelor.apps.purchase.web;
+
+import com.axelor.apps.purchase.db.ImportationFolder;
+import com.axelor.apps.purchase.service.ImportationFolderService;
+import com.axelor.exception.AxelorException;
+import com.axelor.inject.Beans;
+import com.axelor.rpc.ActionRequest;
+import com.axelor.rpc.ActionResponse;
+import com.google.inject.Singleton;
+
+@Singleton
+public class ImportationFolderController {
+ public void draftImportationFolder(ActionRequest request, ActionResponse response) {
+ ImportationFolder importationFolder = request.getContext().asType(ImportationFolder.class);
+ Beans.get(ImportationFolderService.class).draftImportationFolder(importationFolder);
+ }
+
+ public void openImportationFolder(ActionRequest request, ActionResponse response) throws AxelorException {
+ ImportationFolder importationFolder = request.getContext().asType(ImportationFolder.class);
+ Beans.get(ImportationFolderService.class).openImportationFolder(importationFolder);
+ }
+
+ public void closeImportationFolder(ActionRequest request, ActionResponse response) {
+ ImportationFolder importationFolder = request.getContext().asType(ImportationFolder.class);
+ Beans.get(ImportationFolderService.class).closeImportationFolder(importationFolder);
+ }
+
+ public void cancelImportationFolder(ActionRequest request, ActionResponse response) {
+ ImportationFolder importationFolder = request.getContext().asType(ImportationFolder.class);
+ Beans.get(ImportationFolderService.class).cancelImportationFolder(importationFolder);
+ }
+}
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml
new file mode 100644
index 0000000..d40ce9b
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml
index 239bd54..16df4c1 100644
--- a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseOrder.xml
@@ -65,6 +65,10 @@
+
+
+
+
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/ImportationFolder.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/ImportationFolder.xml
new file mode 100644
index 0000000..ccffe96
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/ImportationFolder.xml
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{arrivalGoodiDate}}
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/Selects.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/Selects.xml
index d32263c..60171c8 100644
--- a/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/Selects.xml
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/views/Selects.xml
@@ -3,7 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://axelor.com/xml/ns/object-views http://axelor.com/xml/ns/object-views/object-views_5.2.xsd">
+
+
+
+
+
diff --git a/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/ImportationFolder.xml b/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/ImportationFolder.xml
new file mode 100644
index 0000000..68d01c8
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-stock/src/main/resources/domains/ImportationFolder.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java
index b1deb76..999b4bb 100644
--- a/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java
+++ b/modules/axelor-open-suite/axelor-supplier-management/src/main/java/com/axelor/apps/suppliermanagement/service/PurchaseOrderSupplierLineService.java
@@ -56,7 +56,8 @@ public class PurchaseOrderSupplierLineService {
supplierPartner);
}
purchaseOrderLine.setSupplierPartner(supplierPartner);
-
+ // set tax from tco
+ purchaseOrderLine.setTaxLine(purchaseOrderSupplierLine.getTaxLine());
purchaseOrderLine.setPrice(purchaseOrderSupplierLine.getPrice());
purchaseOrderLine.setExTaxTotal(
PurchaseOrderLineServiceImpl.computeAmount(
diff --git a/src/main/webapp/css/modern-dark/theme.css b/src/main/webapp/css/modern-dark/theme.css
index facaa58..b0b2fe0 100644
--- a/src/main/webapp/css/modern-dark/theme.css
+++ b/src/main/webapp/css/modern-dark/theme.css
@@ -1027,3 +1027,7 @@ text {
box-shadow: none;
border-color: #c0c0c0;
}
+li a[href="#/about"] {
+ display: none;
+ visibility: hidden;
+}
\ No newline at end of file
diff --git a/src/main/webapp/css/theme-default/theme.css b/src/main/webapp/css/theme-default/theme.css
index 630ea8c..d40f0a3 100644
--- a/src/main/webapp/css/theme-default/theme.css
+++ b/src/main/webapp/css/theme-default/theme.css
@@ -232,7 +232,7 @@
background-color: #3366CC;
}
.button-black, .button-black:focus, .button-black:hover{
- border : 1px solid #00000;
+ border : 1px solid #000000;
color :white;
background-image: -webkit-linear-gradient(bottom, #000000, #808080);
background-image: -moz-linear-gradient(bottom, #000000, #808080);
@@ -434,7 +434,7 @@
padding-left: 5px;
border-bottom: 2px solid yellow;
}
-}
+
.separator-bg-green{
color : white;
background : green;
@@ -671,4 +671,7 @@
color: #000;
}
-
+li a[href="#/about"] {
+ display: none;
+ visibility: hidden;
+}