diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationServiceImpl.java b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationServiceImpl.java index 8548ed2..101fdea 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationServiceImpl.java +++ b/modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationServiceImpl.java @@ -65,10 +65,9 @@ public class QvmOperationServiceImpl implements QvmOperationService { throw new AxelorException( company, TraceBackRepository.CATEGORY_CONFIGURATION_ERROR, - I18n.get("IExceptionMessage.PURCHASE_ORDER_1"), + I18n.get("Calibration Sequence is not defined"), company.getName()); } - System.out.println("seq before : " + seq); return seq; } @@ -78,10 +77,9 @@ public class QvmOperationServiceImpl implements QvmOperationService { throw new AxelorException( company, TraceBackRepository.CATEGORY_CONFIGURATION_ERROR, - I18n.get("IExceptionMessage.PURCHASE_ORDER_1"), + I18n.get("Qualification Sequence is not defined"), company.getName()); } - System.out.println("seq before : " + seq); return seq; } @@ -91,10 +89,9 @@ public class QvmOperationServiceImpl implements QvmOperationService { throw new AxelorException( company, TraceBackRepository.CATEGORY_CONFIGURATION_ERROR, - I18n.get("IExceptionMessage.PURCHASE_ORDER_1"), + I18n.get("Operation Sequence is not defined"), company.getName()); } - System.out.println("seq before : " + seq); return seq; } diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Machine.xml b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Machine.xml index 30bffa6..c59d234 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Machine.xml +++ b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Machine.xml @@ -7,11 +7,16 @@ - + - - + + + + + diff --git a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperation.xml b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperation.xml index 22ab80a..5f667cd 100644 --- a/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperation.xml +++ b/modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperation.xml @@ -41,25 +41,37 @@ - orderByState - + + + + + + - + + + + + - - + + + + + + + -