diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -90,24 +90,12 @@
-
+
-
-
-
-
-
-
- A supervisor needs to approve the return]]>
-
-
-
-
-
diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -11,4 +11,15 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -11,4 +11,15 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/org.openbravo.retail.returns/js/modalReturnLines.js b/web/org.openbravo.retail.returns/js/modalReturnLines.js
--- a/web/org.openbravo.retail.returns/js/modalReturnLines.js
+++ b/web/org.openbravo.retail.returns/js/modalReturnLines.js
@@ -447,7 +447,7 @@
});
},
finishOrder = _.after(me.args.args.order.receiptLines.length, finishOrderCreation),
- createOrderLines = function () {
+ createOrderLines = function (ignoreReturnApproval) {
_.each(me.args.args.order.receiptLines, function (line) {
if (!line.exceedsQuantity) {
var createLineFunction = function (prod) {
@@ -458,6 +458,7 @@
}
prod.set('ignorePromotions', true);
prod.set('standardPrice', line.priceIncludesTax ? line.unitPrice : line.baseNetUnitPrice);
+ prod.set('ignoreReturnApproval', ignoreReturnApproval);
order.addProductToOrder(prod, qty, null, {
'originalOrderLineId': line.lineId,
'originalDocumentNo': me.args.args.order.documentNo,
@@ -504,8 +505,11 @@
},
approvalNeeded = false,
currentDate = new Date(),
+ approvalList = [],
servicesToApprove = '',
- servicesToApproveArr = [];
+ servicesToApproveArr = [],
+ overdueServicesToApprove = '',
+ overdueServicesToApproveArr = [];
me.nameLocation = bpLoc.get('name');
bp.set('locationModel', bpLoc);
@@ -525,33 +529,42 @@
currentDate.setMilliseconds(0);
for (i = 0; i < me.args.args.order.receiptLines.length; i++) {
var line = me.args.args.order.receiptLines[i];
- if (!line.notReturnable) {
- if (line.productType === 'S' && (line.overdueReturnDays < 0 || ((currentDate.getTime() - line.overdueReturnDays * 86400000) > (new Date(me.args.args.order.orderDate)).getTime()))) {
- servicesToApprove += '
· ' + line.name;
- servicesToApproveArr.push(' * ' + line.name);
- if (!approvalNeeded) {
- approvalNeeded = true;
- }
+ if (line.productType === 'S' && !line.notReturnable) {
+ servicesToApprove += '
· ' + line.name;
+ servicesToApproveArr.push(' * ' + line.name)
+ approvalNeeded = true;
+ if (line.overdueReturnDays < 0 || ((currentDate.getTime() - line.overdueReturnDays * 86400000) > (new Date(me.args.args.order.orderDate)).getTime())) {
+ overdueServicesToApprove += '
· ' + line.name;
+ overdueServicesToApproveArr.push(' * ' + line.name);
}
- } else {
- OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBPOS_UnreturnableProduct'), OB.I18N.getLabel('OBPOS_UnreturnableProductMessage', [line.name]));
- return;
}
}
+
if (approvalNeeded) {
+ if (!OB.MobileApp.model.hasPermission('OBPOS_approval.returnService', true)) {
+ approvalList.push({
+ approval: 'OBPOS_approval.returnService',
+ message: 'OBPOS_approval.returnService',
+ params: [servicesToApprove]
+ });
+ }
+ if (!OB.MobileApp.model.hasPermission('OBRETUR_approval.overdueService', true) && overdueServicesToApprove.length > 0) {
+ approvalList.push({
+ approval: 'OBRETUR_approval.overdueService',
+ message: 'OBRETUR_returnService_OutOfDate_warning',
+ params: [overdueServicesToApprove]
+ })
+ }
+
OB.UTIL.showLoading(false);
OB.UTIL.Approval.requestApproval(
- OB.MobileApp.view.$.containerWindow.getRoot().model, [{
- approval: 'OBPOS_approval.returnService',
- message: 'OBRETUR_approval.returnService_OutOfDate',
- params: [servicesToApprove]
- }], function (approved, supervisor, approvalType) {
+ OB.MobileApp.view.$.containerWindow.getRoot().model, approvalList, function (approved, supervisor) {
if (approved) {
- if (supervisor.id === OB.POS.terminal.terminal.usermodel.id) {
- OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_LblWarning'), OB.I18N.getLabel('OBRETUR_returnService_OutOfDate_warning', [servicesToApproveArr]));
+ if (supervisor.id === OB.POS.terminal.terminal.usermodel.id && overdueServicesToApprove.length > 0) {
+ OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBMOBC_LblWarning'), OB.I18N.getLabel('OBRETUR_returnService_OutOfDate_warning', [overdueServicesToApproveArr]));
}
OB.UTIL.showLoading(true);
- createOrderLines();
+ createOrderLines(true);
}
});
} else {