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 @@ -1,5 +1,17 @@ + + + + + + + + + + + + @@ -41,8 +53,8 @@ - - + + 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 @@ -100,8 +100,8 @@ var line, promotionsfactor; if (index !== -1) { if (this.$.checkboxButtonReturn.checked) { - var initialQty = inEvent.lines[index].quantity; - inEvent.lines[index].quantity = this.$.quantity.getValue(); + var initialQty = inEvent.lines[index].remainingQuantity; + inEvent.lines[index].remainingQuantity = this.$.quantity.getValue(); var qty = this.$.quantity.getValue(); enyo.forEach(model.get('order').get('lines').models, function (l) { if (l.get('originalOrderLineId')) { @@ -131,12 +131,16 @@ }, { name: 'product', classes: 'span4', - style: 'line-height: 40px; font-size: 17px;' + style: 'line-height: 40px; font-size: 17px; width: 150px;' }, { - name: 'maxQuantity', + name: 'totalQuantity', classes: 'span2', style: 'line-height: 40px; font-size: 17px; width: 70px;' }, { + name: 'remainingQuantity', + classes: 'span2', + style: 'line-height: 40px; font-size: 17px; width:85px;' + }, { name: 'qtyminus', kind: 'OB.UI.SmallButton', style: 'width: 40px', @@ -147,7 +151,7 @@ kind: 'enyo.Input', type: 'text', classes: 'input span1', - style: 'margin-right: 2px; text-align: center;', + style: 'margin-right: 2px; text-align: center; width: 50px;', name: 'quantity', isFirstFocus: true, selectOnFocus: true, @@ -163,7 +167,7 @@ }, { name: 'price', classes: 'span2', - style: 'line-height: 40px; font-size: 17px;' + style: 'line-height: 40px; font-size: 17px; width: 100px;' }, { style: 'clear: both;' }], @@ -234,12 +238,13 @@ this.inherited(arguments); this.$.product.setContent(this.newAttribute.name); - this.$.maxQuantity.setContent(this.newAttribute.quantity); + this.$.remainingQuantity.setContent(this.newAttribute.remainingQuantity); + this.$.totalQuantity.setContent(this.newAttribute.quantity); this.$.quantity.setDisabled(true); this.$.qtyplus.setDisabled(true); this.$.qtyminus.setDisabled(true); - this.$.quantity.setValue(this.newAttribute.quantity); - this.$.quantity.setAttribute('max', this.newAttribute.quantity); + this.$.quantity.setValue(this.newAttribute.remainingQuantity); + this.$.quantity.setAttribute('max', this.newAttribute.remainingQuantity); this.$.quantity.setAttribute('min', OB.DEC.One); this.$.price.setContent(this.newAttribute.priceIncludesTax ? this.newAttribute.unitPrice : this.newAttribute.baseNetUnitPrice); if (this.newAttribute.promotions.length > 0) { @@ -250,7 +255,7 @@ return; } this.createComponent({ - style: 'display: block; color:gray; font-size:13px; line-height: 20px;', + style: 'display: block; color:gray; font-size:13px; line-height: 20px; width: 150px;', components: [{ content: '-- ' + d.name, attributes: { @@ -323,6 +328,8 @@ enyo.kind({ name: 'OB.UI.ModalReturnReceipt', kind: 'OB.UI.ModalAction', + classes: 'modal-dialog', + style: 'width: 650px;', correctQty: true, handlers: { onApplyChanges: 'applyChanges', @@ -374,7 +381,7 @@ OB.Dal.get(OB.Model.Product, line.id, function (prod) { prod.set('ignorePromotions', true); prod.set('standardPrice', line.priceIncludesTax ? line.unitPrice : line.baseNetUnitPrice); - me.args.args.context.model.get('order').createLine(prod, -line.quantity, null, { + me.args.args.context.model.get('order').createLine(prod, -line.remainingQuantity, null, { 'originalOrderLineId': line.lineId, 'originalDocumentNo': me.args.args.order.documentNo, 'skipApplyPromotions': true, @@ -452,6 +459,7 @@ splitline.shiplineNo = sline.shipmentlineNo; splitline.shipment = sline.shipment; splitline.shipmentlineId = sline.shipLineId; + splitline.remainingQuantity = sline.remainingQty; // delete confusing properties delete splitline.linegrossamount; delete splitline.warehouse; @@ -467,8 +475,8 @@ splitpromo[attr] = p[attr]; } } - splitpromo.amt = OB.DEC.mul(p.amt, (splitline.quantity / line.quantity)); - splitpromo.actualAmt = OB.DEC.mul(p.actualAmt, (splitline.quantity / line.quantity)); + splitpromo.amt = OB.DEC.mul(p.amt, (splitline.remainingQuantity / line.remainingQuantity)); + splitpromo.actualAmt = OB.DEC.mul(p.actualAmt, (splitline.remainingQuantity / line.remainingQuantity)); splitline.promotions.push(splitpromo); } }); @@ -492,7 +500,8 @@ }, executeOnShow: function () { var me = this, - newArray = []; + newArray = [], + lineNum = 0; this.$.bodyContent.$.attributes.destroyComponents(); this.$.header.destroyComponents(); this.$.header.createComponent({ @@ -519,22 +528,27 @@ content: OB.I18N.getLabel('OBRETUR_LblProductName'), name: 'productNameLbl', classes: 'span4', - style: 'line-height: 40px; font-size: 17px;' + style: 'line-height: 40px; font-size: 17px; width: 150px;' }, { - name: 'maxQtyLbl', - content: OB.I18N.getLabel('OBRETUR_LblMaxQty'), + name: 'totalQtyLbl', + content: OB.I18N.getLabel('OBRETUR_LblTotalQty'), classes: 'span2', style: 'line-height: 40px; font-size: 17px; width: 70px;' }, { + name: 'remainingQtyLbl', + content: OB.I18N.getLabel('OBRETUR_LblRemainingQty'), + classes: 'span2', + style: 'line-height: 40px; font-size: 17px; width: 85px;' + }, { content: OB.I18N.getLabel('OBRETUR_LblQty'), name: 'qtyLbl', classes: 'span3', - style: 'line-height: 40px; font-size: 17px;' + style: 'line-height: 40px; font-size: 17px; width: 155px;' }, { content: OB.I18N.getLabel('OBRETUR_LblPrice'), name: 'priceLbl', classes: 'span2', - style: 'line-height: 40px; font-size: 17px;' + style: 'line-height: 40px; font-size: 17px; width: 110px;' }, { style: 'clear: both;' }] @@ -543,22 +557,23 @@ this.$.header.$.checkboxButtonAll.unCheck(); } newArray = _.filter(this.args.args.order.receiptLines, function (line) { - return line.quantity > 0; + return line.remainingQuantity > 0; }); newArray = this.splitShipmentLines(newArray); this.args.args.order.receiptLines = newArray; this.numberOfLines = 0; this.selectedLines = 0; this.allSelected = false; + enyo.forEach(this.args.args.order.receiptLines, function (line) { + lineNum++; var isSelectableLine = true; _.each(this.lineShouldBeIncludedFunctions, function (f) { isSelectableLine = isSelectableLine && f.isSelectableLine(line); }); var lineEnyoObject = this.$.bodyContent.$.attributes.createComponent({ kind: 'OB.UI.EditOrderLine', - name: 'line_' + line.compname, - id: 'OB.UI.id.Returns.Line.' + line.compname, + name: 'line' + lineNum, newAttribute: line }); if (!isSelectableLine) {