diff -r 87dcf1f61d9d src-db/database/model/modifiedTables/C_ORDER.xml
--- a/src-db/database/model/modifiedTables/C_ORDER.xml Wed Jun 03 09:25:48 2015 +0200
+++ b/src-db/database/model/modifiedTables/C_ORDER.xml Thu Jun 04 16:14:02 2015 +0200
@@ -29,6 +29,10 @@
+
+
+
+
@@ -44,5 +48,6 @@
+
diff -r 87dcf1f61d9d src-db/database/model/modifiedTables/C_ORDERLINE.xml
--- a/src-db/database/model/modifiedTables/C_ORDERLINE.xml Wed Jun 03 09:25:48 2015 +0200
+++ b/src-db/database/model/modifiedTables/C_ORDERLINE.xml Thu Jun 04 16:14:02 2015 +0200
@@ -1,6 +1,14 @@
+
+
+
+
+
+
+
+
@@ -9,5 +17,6 @@
+
diff -r 87dcf1f61d9d src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Jun 03 09:25:48 2015 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Jun 04 16:14:02 2015 +0200
@@ -63,7 +63,7 @@
-
+
@@ -1490,6 +1490,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3308,7 +3342,7 @@
-
+
@@ -4117,7 +4151,7 @@
-
+
@@ -4484,6 +4518,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5646,7 +5713,7 @@
-
+
@@ -6742,6 +6809,7 @@
+
@@ -8193,7 +8261,7 @@
-
+
@@ -9020,6 +9088,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 87dcf1f61d9d src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Jun 03 09:25:48 2015 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Thu Jun 04 16:14:02 2015 +0200
@@ -645,6 +645,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -933,6 +945,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 87dcf1f61d9d src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Wed Jun 03 09:25:48 2015 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Jun 04 16:14:02 2015 +0200
@@ -1756,6 +1756,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4139,6 +4166,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4340,6 +4393,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 87dcf1f61d9d src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Wed Jun 03 09:25:48 2015 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jun 04 16:14:02 2015 +0200
@@ -1146,7 +1146,7 @@
-
+
@@ -1818,7 +1818,7 @@
-
+
diff -r 87dcf1f61d9d src-db/database/sourcedata/AD_PREFERENCE.xml
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml Wed Jun 03 09:25:48 2015 +0200
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml Thu Jun 04 16:14:02 2015 +0200
@@ -77,6 +77,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff -r 87dcf1f61d9d src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml Wed Jun 03 09:25:48 2015 +0200
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml Thu Jun 04 16:14:02 2015 +0200
@@ -112,6 +112,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff -r 87dcf1f61d9d src-test/org/openbravo/retail/posterminal/OBBaseRetailTest.java
--- a/src-test/org/openbravo/retail/posterminal/OBBaseRetailTest.java Wed Jun 03 09:25:48 2015 +0200
+++ b/src-test/org/openbravo/retail/posterminal/OBBaseRetailTest.java Thu Jun 04 16:14:02 2015 +0200
@@ -22,7 +22,6 @@
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.client.kernel.RequestContext;
import org.openbravo.dal.core.OBContext;
-import org.openbravo.test.base.OBBaseTest;
/**
* Base unit test for retail
diff -r 87dcf1f61d9d src-test/org/openbravo/retail/posterminal/POSOrderCashupPerformanceTest.java
--- a/src-test/org/openbravo/retail/posterminal/POSOrderCashupPerformanceTest.java Wed Jun 03 09:25:48 2015 +0200
+++ b/src-test/org/openbravo/retail/posterminal/POSOrderCashupPerformanceTest.java Thu Jun 04 16:14:02 2015 +0200
@@ -23,6 +23,12 @@
import org.openbravo.model.common.invoice.Invoice;
import org.openbravo.model.common.order.Order;
import org.openbravo.model.materialmgmt.transaction.ShipmentInOut;
+import org.openbravo.retail.posterminal.CashCloseProcessor;
+import org.openbravo.retail.posterminal.OBBaseRetailTest;
+import org.openbravo.retail.posterminal.OBPOSAppCashup;
+import org.openbravo.retail.posterminal.OBPOSApplications;
+import org.openbravo.retail.posterminal.OrderLoader;
+import org.openbravo.retail.posterminal.ProcessCashClose;
/**
* A testcase of testing performance of order loading and cashups.
diff -r 87dcf1f61d9d src-test/org/openbravo/retail/posterminal/deleteTickets/DeleteTickets.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/retail/posterminal/deleteTickets/DeleteTickets.java Thu Jun 04 16:14:02 2015 +0200
@@ -0,0 +1,162 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2014 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+package org.openbravo.retail.posterminal.deleteTickets;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import javax.enterprise.inject.Instance;
+
+import org.apache.commons.io.IOUtils;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.data.UtilSql;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.utility.SequenceIdData;
+import org.openbravo.model.common.invoice.Invoice;
+import org.openbravo.model.common.order.Order;
+import org.openbravo.model.materialmgmt.transaction.ShipmentInOut;
+import org.openbravo.retail.posterminal.OBBaseRetailTest;
+import org.openbravo.retail.posterminal.OrderLoader;
+import org.openbravo.retail.posterminal.ProcessCashClose;
+
+/**
+ * A testcase of testing performance of order loading and cashups.
+ *
+ * This testcase uses several json files (see same package). The json has been captured/printed in
+ * the saveRecord methods of the {@link OrderLoader} and the {@link ProcessCashClose}. The json was
+ * manually changed by replacing the order id and cashup id in the json files with the variables:
+ * $orderId and $cashupId. Note the order json has both an order id as well as a cashup id.
+ *
+ * @author mtaal
+ */
+public class DeleteTickets extends OBBaseRetailTest {
+
+ @Test
+ public void orderLoaderCreatingDelTickets() throws Exception {
+
+ String standardOrder = IOUtils.toString(this.getClass()
+ .getResourceAsStream("del_order_wt.json"));
+ String standarOrderWDiscounts = IOUtils.toString(this.getClass().getResourceAsStream(
+ "del_order_wt_wdis.json"));
+ String standardOrderWTaxes = IOUtils.toString(this.getClass().getResourceAsStream(
+ "del_order_wout.json"));
+ String standarOrderWDiscountsWTaxes = IOUtils.toString(this.getClass().getResourceAsStream(
+ "del_order_wout_wdis.json"));
+
+ // warmup
+ loadOneOrder(standardOrder);
+ loadOneOrder(standarOrderWDiscounts);
+ loadOneOrder(standardOrderWTaxes);
+ loadOneOrder(standarOrderWDiscountsWTaxes);
+
+ // Get documentno's of the orders
+ ArrayList documentno = new ArrayList();
+ documentno.add(getDocumentno(standardOrder));
+ documentno.add(getDocumentno(standardOrder));
+ documentno.add(getDocumentno(standardOrder));
+ documentno.add(getDocumentno(standardOrder));
+
+ final String sql = "select o.em_obpos_isdeleted headerDeleted, "
+ + "ol.em_obpos_isdeleted lineDeleted, ol.em_obpos_qtydeleted, "
+ + "o.grandtotal, o.totallines, o.docstatus, amtoffer "
+ + "from c_order o, c_orderline ol left join (select sum(amtoffer) amtoffer,olo.c_orderline_id "
+ + "from c_orderline_offer olo group by olo.c_orderline_id) as offer on ol.c_orderline_id = offer.c_orderline_id "
+ + "where o.c_order_id = ol.c_order_id "
+ + "and documentno = 'DocumentToBeReplaced' order by o.created desc limit 1";
+
+ ConnectionProvider connectionProvider = getConnectionProvider();
+ PreparedStatement st;
+ ResultSet result;
+ String query;
+ HashMap queryResult = null;
+ for (String document : documentno) {
+ query = sql.replace("DocumentToBeReplaced", document);
+ st = connectionProvider.getPreparedStatement(query);
+ result = st.executeQuery();
+ if (result.next()) {
+ queryResult = getResult(result);
+ }
+ verifyResult(queryResult);
+ result.close();
+ }
+
+ }
+
+ private void verifyResult(HashMap queryResult) {
+ Assert.assertEquals("Y", queryResult.get("headerDeleted"));
+ Assert.assertEquals("Y", queryResult.get("lineDeleted"));
+ Assert.assertEquals("1", queryResult.get("em_obpos_qtydeleted"));
+ Assert.assertEquals("0", queryResult.get("grandtotal"));
+ Assert.assertEquals("0", queryResult.get("totallines"));
+ Assert.assertEquals("CL", queryResult.get("docstatus"));
+ if (!queryResult.get("amtoffer").isEmpty()) {
+ Assert.assertEquals("0", queryResult.get("amtoffer"));
+ }
+ }
+
+ private HashMap getResult(ResultSet result) {
+ HashMap arrayResult = new HashMap();
+ try {
+ arrayResult.put("headerDeleted", UtilSql.getValue(result, "headerDeleted"));
+ arrayResult.put("lineDeleted", UtilSql.getValue(result, "lineDeleted"));
+ arrayResult.put("em_obpos_qtydeleted", UtilSql.getValue(result, "em_obpos_qtydeleted"));
+ arrayResult.put("grandtotal", UtilSql.getValue(result, "grandtotal"));
+ arrayResult.put("totallines", UtilSql.getValue(result, "totallines"));
+ arrayResult.put("docstatus", UtilSql.getValue(result, "docstatus"));
+ arrayResult.put("amtoffer", UtilSql.getValue(result, "amtoffer"));
+ } catch (SQLException e) {
+ }
+ return arrayResult;
+ }
+
+ private String getDocumentno(String order) {
+ JSONObject orderJS = null;
+ String result = null;
+ try {
+ orderJS = new JSONObject(order);
+ result = ((String) orderJS.get("documentNo")).replace("\\", "");
+ } catch (JSONException e) {
+
+ }
+ return result;
+ }
+
+ private String getUUID() {
+ return SequenceIdData.getUUID();
+ }
+
+ private void loadOneOrder(String orderJson) throws Exception {
+ OBContext.setAdminMode(true);
+ try {
+ String orderJsonToLoad = orderJson.replace("$orderId", getUUID());
+ getOrderLoader().saveRecord(new JSONObject(orderJsonToLoad));
+ OBDal.getInstance().commitAndClose();
+ } finally {
+ OBContext.restorePreviousMode();
+ }
+ }
+
+ protected OrderLoader getOrderLoader() {
+ // override execute hooks as we Weld test environment needs to be updated to support
+ // dependency injected hooks
+ return new OrderLoader() {
+ protected void executeHooks(Instance hooks, JSONObject jsonorder,
+ Order order, ShipmentInOut shipment, Invoice invoice) throws Exception {
+ }
+ };
+ }
+}
diff -r 87dcf1f61d9d src-test/org/openbravo/retail/posterminal/deleteTickets/del_order_wout.json
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/retail/posterminal/deleteTickets/del_order_wout.json Thu Jun 04 16:14:02 2015 +0200
@@ -0,0 +1,1 @@
+{"hasbeenpaid":"Y","isbeingprocessed":"N","id":"5B1EEC0957CA3C2DE6F414BE83650019","client":"39363B0921BB4293B48383844325E84C","organization":"B5DE96143D6642228E3B9DEC69886A47","createdBy":"B8D524AE26F245A0B8FA4407CCB78ED7","updatedBy":"B8D524AE26F245A0B8FA4407CCB78ED7","documentType":"1D252C36D16F4EF0A32CE4FC24F14759","orderType":0,"generateInvoice":false,"isQuotation":false,"oldId":null,"priceList":"8A22922DD19F4EB2984F3E487558F88F","priceIncludesTax":false,"currency":"102","currency$_identifier":"EUR","session":"30D39C32CDB65E584A5738CE52CDA22D","warehouse":"0B3E1D8D0FCB44FB81EA1A3FF158B086","salesRepresentative":"B8D524AE26F245A0B8FA4407CCB78ED7","salesRepresentative$_identifier":"Posets Store User","posTerminal":"7AEE148E334346C6A1783822A1306BB3","posTerminal$_identifier":"PS POS Terminal","orderDate":"2015-05-29T11:00:17.179Z","creationDate":"2015-05-29T11:00:38.093Z","documentnoPrefix":"PS1","quotationnoPrefix":-1,"documentnoSuffix":12,"quotationnoSuffix":-1,"documentNo":"PS1\/0000012","bp":{"id":"4CB3519D76E4404A9D2BE36A5D8AC3EE","organization":"B5DE96143D6642228E3B9DEC69886A47","searchKey":"PS\/C0001","_identifier":"PS Customer","name":"PS Customer","firstName":"PS Customer","lastName":null,"description":null,"taxID":null,"taxCategory":null,"paymentMethod":"45A202BF44884F05B8A1BF741E2063B6","paymentTerms":"D8955F8808A54C63BBF478A6843D834D","priceList ":"undefined","invoiceTerms":"I","locId":"9D9B26422C6546929FBA69F7742D231C","locName":"Plaza Mayor 1","postalCode":null,"cityName":"Cádiz","countryName":"Spain","contactId":"2567059790B54460AD7D8AFED2E23A71","phone":null,"email":null,"businessPartnerCategory":"B1DD8B371643421C987EF1D5B358D5E9","businessPartnerCategory_name":"Customer","creditLimit":0,"creditUsed":0,"taxExempt":false,"customerBlocking":false,"salesOrderBlocking":true,"undefined":"PS Customer###Plaza Mayor 1###","_idx":3},"lines":[{"product":{"id":"AC79520FEB4743B3AAA379BF70B9B7DA","searchkey":"WVG\/B0017","uPCEAN":"2112345000046","uOM":"100","uOMsymbol":"Ud ","productCategory":"0C20B3F7AB234915B2239FCD8BE10CD1","taxCategory":"FF80818123B7FC160123B804AB88000B","description":"Disposable body warmers.","obposScale":false,"groupProduct":true,"stocked":true,"showstock":false,"isGeneric":false,"generic_product_id":null,"brand":"C7B171B9289C4677829A13D7FAACE4F6","characteristicDescription":"Object: First-Aid, Price: < 20€, Use: High Mountaineering & Expeditions, Hiking & Trekking, Weight: Under 1Kg","showchdesc":true,"bestseller":false,"ispack":false,"listPrice":3.6,"standardPrice":3.6,"priceLimit":3.6,"cost":0,"algorithm":"S","_identifier":"Adhesive body warmers","undefined":"WVG\/B0017###2112345000046###Adhesive body warmers###","_idx":0,"originalStandardPrice":3.6},"productidentifier":null,"uOM":"100","qty":1,"price":3.6,"priceList":3.6,"gross":4.36,"net":3.6,"description":"","id":"98530149E65E265C58892029605C4E94","priceIncludesTax":false,"warehouse":{"id":"0B3E1D8D0FCB44FB81EA1A3FF158B086","warehousename":"Posets Store Warehouse"},"promotions":[],"grossListPrice":3.6,"promotionCandidates":null,"promotionMessages":[],"noDiscountCandidates":true,"linerate":1.21,"tax":"5235D8E99A2749EFA17A5C92A52AEFC6","pricenet":3.6,"fullgross":{"ind":1,"form":0,"mant":[4,3,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"exp":-21},"discountedGross":4.36,"discountedNet":3.6,"taxAmount":0.76,"discountedNetPrice":{"ind":1,"form":0,"mant":[3,6],"exp":-1},"taxLines":{"5235D8E99A2749EFA17A5C92A52AEFC6":{"name":"Entregas IVA 21%","rate":21,"net":3.6,"amount":0.76}},"obposQtyDeleted":1,"obposIsDeleted":true}],"payments":[],"payment":0,"change":0,"qty":1,"gross":4.36,"net":3.6,"taxes":{"5235D8E99A2749EFA17A5C92A52AEFC6":{"name":"Entregas IVA 21%","rate":21,"net":3.6,"amount":0.76}},"description":"","print":true,"sendEmail":false,"isPaid":false,"paidOnCredit":false,"isLayaway":false,"isEditable":true,"openDrawer":false,"totalamount":null,"approvals":[],"isNewReceipt":false,"cloningReceipt":false,"obposIsDeleted":true,"timezoneOffset":-120,"created":1432897238093,"obposCreatedabsolute":"2015-05-29 13:00:38.093","obposAppCashup":"FB789FDD77F1C762D5DA0035F85D5521"}
\ No newline at end of file
diff -r 87dcf1f61d9d src-test/org/openbravo/retail/posterminal/deleteTickets/del_order_wout_wdis.json
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/retail/posterminal/deleteTickets/del_order_wout_wdis.json Thu Jun 04 16:14:02 2015 +0200
@@ -0,0 +1,1 @@
+{"hasbeenpaid":"Y","isbeingprocessed":"N","id":"817A4A6FE07004CC505E766D60906AE1","client":"39363B0921BB4293B48383844325E84C","organization":"B5DE96143D6642228E3B9DEC69886A47","createdBy":"B8D524AE26F245A0B8FA4407CCB78ED7","updatedBy":"B8D524AE26F245A0B8FA4407CCB78ED7","documentType":"1D252C36D16F4EF0A32CE4FC24F14759","orderType":0,"generateInvoice":false,"isQuotation":false,"oldId":null,"priceList":"8A22922DD19F4EB2984F3E487558F88F","priceIncludesTax":false,"currency":"102","currency$_identifier":"EUR","session":"30D39C32CDB65E584A5738CE52CDA22D","warehouse":"0B3E1D8D0FCB44FB81EA1A3FF158B086","salesRepresentative":"B8D524AE26F245A0B8FA4407CCB78ED7","salesRepresentative$_identifier":"Posets Store User","posTerminal":"7AEE148E334346C6A1783822A1306BB3","posTerminal$_identifier":"PS POS Terminal","orderDate":"2015-05-29T11:00:38.167Z","creationDate":"2015-05-29T11:01:11.399Z","documentnoPrefix":"PS1","quotationnoPrefix":-1,"documentnoSuffix":13,"quotationnoSuffix":-1,"documentNo":"PS1\/0000013","bp":{"id":"4CB3519D76E4404A9D2BE36A5D8AC3EE","organization":"B5DE96143D6642228E3B9DEC69886A47","searchKey":"PS\/C0001","_identifier":"PS Customer","name":"PS Customer","firstName":"PS Customer","lastName":null,"description":null,"taxID":null,"taxCategory":null,"paymentMethod":"45A202BF44884F05B8A1BF741E2063B6","paymentTerms":"D8955F8808A54C63BBF478A6843D834D","priceList ":"undefined","invoiceTerms":"I","locId":"9D9B26422C6546929FBA69F7742D231C","locName":"Plaza Mayor 1","postalCode":null,"cityName":"Cádiz","countryName":"Spain","contactId":"2567059790B54460AD7D8AFED2E23A71","phone":null,"email":null,"businessPartnerCategory":"B1DD8B371643421C987EF1D5B358D5E9","businessPartnerCategory_name":"Customer","creditLimit":0,"creditUsed":0,"taxExempt":false,"customerBlocking":false,"salesOrderBlocking":true,"undefined":"PS Customer###Plaza Mayor 1###","_idx":3},"lines":[{"product":{"id":"AC79520FEB4743B3AAA379BF70B9B7DA","searchkey":"WVG\/B0017","uPCEAN":"2112345000046","uOM":"100","uOMsymbol":"Ud ","productCategory":"0C20B3F7AB234915B2239FCD8BE10CD1","taxCategory":"FF80818123B7FC160123B804AB88000B","description":"Disposable body warmers.","obposScale":false,"groupProduct":true,"stocked":true,"showstock":false,"isGeneric":false,"generic_product_id":null,"brand":"C7B171B9289C4677829A13D7FAACE4F6","characteristicDescription":"Object: First-Aid, Price: < 20€, Use: High Mountaineering & Expeditions, Hiking & Trekking, Weight: Under 1Kg","showchdesc":true,"bestseller":false,"ispack":false,"listPrice":3.6,"standardPrice":3.6,"priceLimit":3.6,"cost":0,"algorithm":"S","_identifier":"Adhesive body warmers","undefined":"WVG\/B0017###2112345000046###Adhesive body warmers###","_idx":0,"originalStandardPrice":3.6},"productidentifier":null,"uOM":"100","qty":1,"price":3.6,"priceList":3.6,"gross":4.36,"net":3.6,"description":"","id":"105078C92D1FF39BFE77780A35DBF1CF","priceIncludesTax":false,"warehouse":{"id":"0B3E1D8D0FCB44FB81EA1A3FF158B086","warehousename":"Posets Store Warehouse"},"promotions":[{"identifier":"disc_5_ var_perc - 5 %","name":"disc_5_ var_perc","ruleId":"08C2C89DB15443478B659A8645828F63","amt":0.18,"fullAmt":0.18,"discountType":"20E4EC27397344309A2185097392D964","priority":null,"manual":true,"userAmt":5,"lastApplied":true,"obdiscQtyoffer":1,"qtyOffer":1,"displayedTotalAmount":0.18,"percentage":5,"applyNext":true,"qtyOfferReserved":0,"_idx":-1,"pendingQtyOffer":1}],"grossListPrice":3.6,"promotionCandidates":null,"promotionMessages":[],"linerate":1.21,"tax":"5235D8E99A2749EFA17A5C92A52AEFC6","pricenet":3.6,"fullgross":{"ind":1,"form":0,"mant":[4,3,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"exp":-21},"discountedGross":4.14,"discountedNet":3.42,"taxAmount":0.72,"discountedNetPrice":{"ind":1,"form":0,"mant":[3,4,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"exp":-20},"taxLines":{"5235D8E99A2749EFA17A5C92A52AEFC6":{"name":"Entregas IVA 21%","rate":21,"net":3.42,"amount":0.72}},"discountedLinePrice":3.42,"obposQtyDeleted":1,"obposIsDeleted":true}],"payments":[],"payment":0,"change":0,"qty":1,"gross":4.14,"net":3.42,"taxes":{"5235D8E99A2749EFA17A5C92A52AEFC6":{"name":"Entregas IVA 21%","rate":21,"net":3.42,"amount":0.72}},"description":"","print":true,"sendEmail":false,"isPaid":false,"paidOnCredit":false,"isLayaway":false,"isEditable":true,"openDrawer":false,"totalamount":null,"approvals":[],"isNewReceipt":false,"cloningReceipt":false,"obposIsDeleted":true,"timezoneOffset":-120,"created":1432897271399,"obposCreatedabsolute":"2015-05-29 13:01:11.399","obposAppCashup":"FB789FDD77F1C762D5DA0035F85D5521"}
\ No newline at end of file
diff -r 87dcf1f61d9d src-test/org/openbravo/retail/posterminal/deleteTickets/del_order_wt.json
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/retail/posterminal/deleteTickets/del_order_wt.json Thu Jun 04 16:14:02 2015 +0200
@@ -0,0 +1,1 @@
+{"hasbeenpaid":"Y","isbeingprocessed":"N","id":"3CA875E75E99B87658C84DFE20AD5C99","client":"39363B0921BB4293B48383844325E84C","organization":"D270A5AC50874F8BA67A88EE977F8E3B","createdBy":"3073EDF96A3C42CC86C7069E379522D2","updatedBy":"3073EDF96A3C42CC86C7069E379522D2","documentType":"511A9371A0F74195AA3F6D66C722729D","orderType":0,"generateInvoice":false,"isQuotation":false,"oldId":null,"priceList":"496CF965DF9744D2A41248392D1DE407","priceIncludesTax":true,"currency":"102","currency$_identifier":"EUR","session":"64A4A19F0E53FC501A1F74B490AE8891","warehouse":"CE7AB151695342FF879938F837F12E6E","salesRepresentative":"3073EDF96A3C42CC86C7069E379522D2","salesRepresentative$_identifier":"Vall Blanca Store User","posTerminal":"9104513C2D0741D4850AE8493998A7C8","posTerminal$_identifier":"VBS POS Terminal","orderDate":"2015-05-29T10:57:41.158Z","creationDate":"2015-05-29T10:57:53.987Z","documentnoPrefix":"VBS1","quotationnoPrefix":-1,"documentnoSuffix":168,"quotationnoSuffix":-1,"documentNo":"VBS1\/0000168","bp":{"id":"ABD91C9D3BC94175B876FBBE9CACA008","organization":"D270A5AC50874F8BA67A88EE977F8E3B","searchKey":"VBS\/C0001","_identifier":"VBS Customer","name":"VBS Customer","firstName":"VBS Customer","lastName":null,"description":null,"taxID":null,"taxCategory":null,"paymentMethod":"45A202BF44884F05B8A1BF741E2063B6","paymentTerms":"D8955F8808A54C63BBF478A6843D834D","priceList ":"undefined","invoiceTerms":"I","locId":"2AA7EADDF7EC405899262DDA3E572436","locName":"Pau Claris 138 1-1","postalCode":"08009","cityName":"Barcelona","countryName":"Spain","contactId":"032576220FC44B0DA80145B3265E4D9A","phone":null,"email":null,"businessPartnerCategory":"B1DD8B371643421C987EF1D5B358D5E9","businessPartnerCategory_name":"Customer","creditLimit":0,"creditUsed":0,"taxExempt":false,"customerBlocking":false,"salesOrderBlocking":true,"undefined":"VBS Customer###Pau Claris 138 1-1###","_idx":4},"lines":[{"product":{"id":"934E7D7587EC4C7A9E9FF58F0382D450","searchkey":"WVG\/M0019","uPCEAN":null,"uOM":"100","uOMsymbol":"Ud ","productCategory":"A847E22D540249C1A47BBD8788C7465A","taxCategory":"FF80818123B7FC160123B804AB88000B","description":"Avalanche transceiver.","obposScale":false,"groupProduct":true,"stocked":true,"showstock":false,"isGeneric":false,"generic_product_id":null,"brand":"BC122628815941E99BB0EE7342F4B9BE","characteristicDescription":"Price: 100€ - 200€, Use: High Mountaineering & Expeditions, Ski Touring, Range: 40m, Battery Life: 250h max, Object: Avalanche Safety","showchdesc":true,"bestseller":true,"ispack":false,"listPrice":150.5,"standardPrice":150.5,"priceLimit":150.5,"cost":0,"algorithm":"S","_identifier":"Avalanche transceiver","undefined":"WVG\/M0019###Avalanche transceiver###","_idx":5,"originalStandardPrice":150.5},"productidentifier":null,"uOM":"100","qty":1,"price":150.5,"priceList":150.5,"gross":150.5,"net":124.38,"description":"","id":"3B4CA34550589992C544E87B771FDB7C","priceIncludesTax":true,"warehouse":{"id":"A154EC30A296479BB078B0AFFD74CA22","warehousename":"Vall Blanca Store Warehouse"},"promotions":[],"grossListPrice":150.5,"promotionCandidates":[],"promotionMessages":[],"noDiscountCandidates":true,"linerate":1.21,"tax":"5235D8E99A2749EFA17A5C92A52AEFC6","taxAmount":26.12,"pricenet":124.38,"discountedNet":124.38,"taxLines":{"5235D8E99A2749EFA17A5C92A52AEFC6":{"name":"Entregas IVA 21%","rate":21,"net":124.38,"amount":26.12}},"obposQtyDeleted":1,"obposIsDeleted":true}],"payments":[],"payment":0,"change":0,"qty":1,"gross":150.5,"net":124.38,"taxes":{"5235D8E99A2749EFA17A5C92A52AEFC6":{"name":"Entregas IVA 21%","rate":21,"net":124.38,"amount":26.12}},"description":"","print":true,"sendEmail":false,"isPaid":false,"paidOnCredit":false,"isLayaway":false,"isEditable":true,"openDrawer":false,"totalamount":null,"approvals":[{"approvalType":"OBPOS_approval.deleteLine","userContact":"3073EDF96A3C42CC86C7069E379522D2","created":1432897068205}],"isNewReceipt":false,"cloningReceipt":false,"obposIsDeleted":true,"timezoneOffset":-120,"created":1432897073987,"obposCreatedabsolute":"2015-05-29 12:57:53.987","obposAppCashup":"B5DE06E7FF4BB52EA64F0DC10CECD68F"}
\ No newline at end of file
diff -r 87dcf1f61d9d src-test/org/openbravo/retail/posterminal/deleteTickets/del_order_wt_wdis.json
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/retail/posterminal/deleteTickets/del_order_wt_wdis.json Thu Jun 04 16:14:02 2015 +0200
@@ -0,0 +1,1 @@
+{"hasbeenpaid":"Y","isbeingprocessed":"N","id":"0445938F1EC177CDC788285AB6E116E0","client":"39363B0921BB4293B48383844325E84C","organization":"D270A5AC50874F8BA67A88EE977F8E3B","createdBy":"3073EDF96A3C42CC86C7069E379522D2","updatedBy":"3073EDF96A3C42CC86C7069E379522D2","documentType":"511A9371A0F74195AA3F6D66C722729D","orderType":0,"generateInvoice":false,"isQuotation":false,"oldId":null,"priceList":"496CF965DF9744D2A41248392D1DE407","priceIncludesTax":true,"currency":"102","currency$_identifier":"EUR","session":"64A4A19F0E53FC501A1F74B490AE8891","warehouse":"CE7AB151695342FF879938F837F12E6E","salesRepresentative":"3073EDF96A3C42CC86C7069E379522D2","salesRepresentative$_identifier":"Vall Blanca Store User","posTerminal":"9104513C2D0741D4850AE8493998A7C8","posTerminal$_identifier":"VBS POS Terminal","orderDate":"2015-05-29T10:57:54.059Z","creationDate":"2015-05-29T10:59:04.426Z","documentnoPrefix":"VBS1","quotationnoPrefix":-1,"documentnoSuffix":169,"quotationnoSuffix":-1,"documentNo":"VBS1\/0000169","bp":{"id":"ABD91C9D3BC94175B876FBBE9CACA008","organization":"D270A5AC50874F8BA67A88EE977F8E3B","searchKey":"VBS\/C0001","_identifier":"VBS Customer","name":"VBS Customer","firstName":"VBS Customer","lastName":null,"description":null,"taxID":null,"taxCategory":null,"paymentMethod":"45A202BF44884F05B8A1BF741E2063B6","paymentTerms":"D8955F8808A54C63BBF478A6843D834D","priceList ":"undefined","invoiceTerms":"I","locId":"2AA7EADDF7EC405899262DDA3E572436","locName":"Pau Claris 138 1-1","postalCode":"08009","cityName":"Barcelona","countryName":"Spain","contactId":"032576220FC44B0DA80145B3265E4D9A","phone":null,"email":null,"businessPartnerCategory":"B1DD8B371643421C987EF1D5B358D5E9","businessPartnerCategory_name":"Customer","creditLimit":0,"creditUsed":0,"taxExempt":false,"customerBlocking":false,"salesOrderBlocking":true,"undefined":"VBS Customer###Pau Claris 138 1-1###","_idx":4},"lines":[{"product":{"id":"934E7D7587EC4C7A9E9FF58F0382D450","searchkey":"WVG\/M0019","uPCEAN":null,"uOM":"100","uOMsymbol":"Ud ","productCategory":"A847E22D540249C1A47BBD8788C7465A","taxCategory":"FF80818123B7FC160123B804AB88000B","description":"Avalanche transceiver.","obposScale":false,"groupProduct":true,"stocked":true,"showstock":false,"isGeneric":false,"generic_product_id":null,"brand":"BC122628815941E99BB0EE7342F4B9BE","characteristicDescription":"Price: 100€ - 200€, Use: High Mountaineering & Expeditions, Ski Touring, Range: 40m, Battery Life: 250h max, Object: Avalanche Safety","showchdesc":true,"bestseller":true,"ispack":false,"listPrice":150.5,"standardPrice":150.5,"priceLimit":150.5,"cost":0,"algorithm":"S","_identifier":"Avalanche transceiver","undefined":"WVG\/M0019###Avalanche transceiver###","_idx":5,"originalStandardPrice":150.5},"productidentifier":null,"uOM":"100","qty":2,"price":150.5,"priceList":150.5,"gross":301,"net":248.76,"description":"","id":"58A11294E81D4D1A16CD797C6AD0BB08","priceIncludesTax":true,"warehouse":{"id":"A154EC30A296479BB078B0AFFD74CA22","warehousename":"Vall Blanca Store Warehouse"},"promotions":[{"identifier":"disc_5_ var_perc - 5 %","name":"disc_5_ var_perc","ruleId":"08C2C89DB15443478B659A8645828F63","amt":15.04,"fullAmt":15.04,"discountType":"20E4EC27397344309A2185097392D964","priority":null,"manual":true,"userAmt":5,"lastApplied":true,"obdiscQtyoffer":2,"qtyOffer":2,"displayedTotalAmount":15.04,"percentage":5,"applyNext":true,"qtyOfferReserved":0,"_idx":-1,"pendingQtyOffer":2}],"grossListPrice":150.5,"promotionCandidates":null,"promotionMessages":[],"linerate":1.21,"tax":"5235D8E99A2749EFA17A5C92A52AEFC6","taxAmount":52.24,"pricenet":124.38,"discountedNet":236.33,"taxLines":{"5235D8E99A2749EFA17A5C92A52AEFC6":{"name":"Entregas IVA 21%","rate":21,"net":236.33,"amount":49.63}},"discountedLinePrice":142.98,"obposQtyDeleted":2,"obposIsDeleted":true}],"payments":[],"payment":0,"change":0,"qty":2,"gross":285.96,"net":236.33,"taxes":{"5235D8E99A2749EFA17A5C92A52AEFC6":{"name":"Entregas IVA 21%","rate":21,"net":236.33,"amount":49.63}},"description":"","print":true,"sendEmail":false,"isPaid":false,"paidOnCredit":false,"isLayaway":false,"isEditable":true,"openDrawer":false,"totalamount":null,"approvals":[],"isNewReceipt":false,"cloningReceipt":false,"obposIsDeleted":true,"timezoneOffset":-120,"created":1432897144426,"obposCreatedabsolute":"2015-05-29 12:59:04.426","obposAppCashup":"B5DE06E7FF4BB52EA64F0DC10CECD68F"}
\ No newline at end of file
diff -r 87dcf1f61d9d src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java Wed Jun 03 09:25:48 2015 +0200
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java Thu Jun 04 16:14:02 2015 +0200
@@ -138,6 +138,7 @@
@Override
public JSONObject saveRecord(JSONObject jsonorder) throws Exception {
+ boolean isDeleted = false;
documentNoHandlers.set(new ArrayList());
try {
executeHooks(orderPreProcesses, jsonorder, null, null, null);
@@ -181,11 +182,14 @@
}
t1 = System.currentTimeMillis();
+ // Getting if the order is deleted or not
+ isDeleted = jsonorder.has("obposIsDeleted") && jsonorder.getBoolean("obposIsDeleted");
// An invoice will be automatically created if:
// - The order is not a layaway and is not completely paid (ie. it's paid on credit)
// - Or, the order is a normal order or a fully paid layaway, and has the "generateInvoice"
// flag
wasPaidOnCredit = !isQuotation
+ && !isDeleted
&& !notpaidLayaway
&& Math.abs(jsonorder.getDouble("payment")) < Math.abs(new Double(jsonorder
.getDouble("gross")));
@@ -197,7 +201,8 @@
|| (!isQuotation && !notpaidLayaway && (jsonorder.has("generateInvoice") && jsonorder
.getBoolean("generateInvoice")));
}
- createShipment = !isQuotation && !notpaidLayaway;
+
+ createShipment = !isQuotation && !notpaidLayaway && !isDeleted;
if (jsonorder.has("generateShipment")) {
createShipment &= jsonorder.getBoolean("generateShipment");
createInvoice &= jsonorder.getBoolean("generateShipment");
@@ -313,7 +318,7 @@
long t4 = System.currentTimeMillis();
- if (!isQuotation) {
+ if (!isQuotation && !isDeleted) {
// Payment
JSONObject paymentResponse = handlePayments(jsonorder, order, invoice, wasPaidOnCredit);
if (paymentResponse != null) {
@@ -1031,9 +1036,12 @@
orderline.setActive(true);
orderline.setSalesOrder(order);
+ if (jsonOrderLine.has("obposIsDeleted") && jsonOrderLine.getBoolean("obposIsDeleted")) {
+ orderline.setObposQtyDeleted(orderline.getOrderedQuantity());
+ orderline.setOrderedQuantity(BigDecimal.ZERO);
+ }
orderline.setLineNetAmount(BigDecimal.valueOf(jsonOrderLine.getDouble("net")).setScale(
stdPrecision, RoundingMode.HALF_UP));
-
if (createShipment) {
// shipment is created, so all is delivered
orderline.setDeliveredQuantity(orderline.getOrderedQuantity());
@@ -1127,6 +1135,10 @@
order.setSalesTransaction(true);
if (jsonorder.getBoolean("isQuotation")) {
order.setDocumentStatus("UE");
+ } else if (jsonorder.has("obposIsDeleted") && jsonorder.getBoolean("obposIsDeleted")) {
+ order.setDocumentStatus("CL");
+ order.setGrandTotalAmount(BigDecimal.ZERO);
+ order.setSummedLineAmount(BigDecimal.ZERO);
} else {
order.setDocumentStatus("CO");
}
diff -r 87dcf1f61d9d web/org.openbravo.retail.posterminal/js/closecash/view/tabpendingreceipts.js
--- a/web/org.openbravo.retail.posterminal/js/closecash/view/tabpendingreceipts.js Wed Jun 03 09:25:48 2015 +0200
+++ b/web/org.openbravo.retail.posterminal/js/closecash/view/tabpendingreceipts.js Thu Jun 04 16:14:02 2015 +0200
@@ -163,13 +163,34 @@
OB.UTIL.Approval.requestApproval(
this.model, 'OBPOS_approval.cashupremovereceipts', function (approved, supervisor, approvalType) {
if (approved) {
- // approved so remove the entry
- OB.Dal.remove(model, function () {
- me.collection.remove(model);
- }, OB.UTIL.showError);
+ if (OB.MobileApp.model.hasPermission('OBPOS_remove_ticket', true)) {
+ me.markOrderAsDeleted(model);
+ } else {
+ // approved so remove the entry
+ OB.Dal.remove(model, function () {
+ me.collection.remove(model);
+ }, OB.UTIL.showError);
+ }
}
});
},
+ markOrderAsDeleted: function (model) {
+ var me = this;
+ var creationDate = model.get('creationDate') || new Date();
+ model.set('creationDate', creationDate);
+ model.set('timezoneOffset', creationDate.getTimezoneOffset());
+ model.set('created', creationDate.getTime());
+ model.set('obposCreatedabsolute', OB.I18N.formatDateISO(creationDate));
+ model.set('obposIsDeleted', true);
+ for (i = 0; i < model.get('lines').length; i++) {
+ model.get('lines').at(i).set('obposIsDeleted', true);
+ }
+ model.calculateGross();
+ model.set('hasbeenpaid', 'Y');
+ model.save();
+ OB.MobileApp.model.updateDocumentSequenceWhenOrderSaved(model.get('documentnoSuffix'), model.get('quotationnoSuffix'));
+ me.collection.remove(model);
+ },
voidAllPendingReceipts: function (inSender, inEvent) {
var me = this;
OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBPOS_ConfirmDeletion'), OB.I18N.getLabel('OBPOS_cannotBeUndone'), [{
@@ -186,9 +207,13 @@
var me = this;
function removeOneModel(collection, model) {
- OB.Dal.remove(model, function () {
- collection.remove(model);
- }, OB.UTIL.showError);
+ if (OB.MobileApp.model.hasPermission('OBPOS_remove_ticket', true)) {
+ me.markOrderAsDeleted(model);
+ } else {
+ OB.Dal.remove(model, function () {
+ collection.remove(model);
+ }, OB.UTIL.showError);
+ }
}
OB.UTIL.Approval.requestApproval(
diff -r 87dcf1f61d9d web/org.openbravo.retail.posterminal/js/login/model/login-model.js
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js Wed Jun 03 09:25:48 2015 +0200
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js Thu Jun 04 16:14:02 2015 +0200
@@ -712,20 +712,60 @@
if (OB.POS.hwserver !== undefined) {
OB.POS.hwserver.print(new OB.DS.HWResource(OB.OBPOSPointOfSale.Print.GoodByeTemplate), {});
}
- this.cleanSessionInfo();
+ if (!OB.MobileApp.model.attributes.permissions || !OB.MobileApp.model.hasPermission('OBPOS_remove_ticket', true)) {
+ this.cleanSessionInfo();
+ }
},
postCloseSession: function (session) {
- //All pending to be paid orders will be removed on logout
- OB.Dal.removeAll(OB.Model.Order, {
- 'session': session.get('id'),
- 'hasbeenpaid': 'N'
- }, function () {
- OB.MobileApp.model.triggerLogout();
- }, function () {
+ var criteria = {},
+ model;
+ var me = this;
+
+ function success(collection) {
+ var j;
+ if (collection.length > 0) {
+ for (j = 0; j < collection.length; j++) {
+ model = collection.models[j];
+ var creationDate = new Date();
+ model.set('creationDate', creationDate);
+ model.set('timezoneOffset', creationDate.getTimezoneOffset());
+ model.set('created', creationDate.getTime());
+ model.set('obposCreatedabsolute', OB.I18N.formatDateISO(creationDate));
+ model.set('obposIsDeleted', true);
+ for (i = 0; i < model.get('lines').length; i++) {
+ model.get('lines').at(i).set('obposIsDeleted', true);
+ }
+ model.calculateGross();
+ model.set('hasbeenpaid', 'Y');
+ model.save(function () {
+ me.cleanSessionInfo();
+ OB.MobileApp.model.triggerLogout();
+ });
+ }
+ } else {
+ me.cleanSessionInfo();
+ OB.MobileApp.model.triggerLogout();
+ }
+ }
+
+ function error() {
OB.error("postCloseSession", arguments);
OB.MobileApp.model.triggerLogout();
- });
+ }
+ //All pending to be paid orders will be removed on logout
+ if (OB.MobileApp.model.hasPermission('OBPOS_remove_ticket', true)) {
+ criteria.session = session.get('id');
+ criteria.hasbeenpaid = 'N';
+ OB.Dal.find(OB.Model.Order, criteria, success, error);
+ } else {
+ OB.Dal.removeAll(OB.Model.Order, {
+ 'session': session.get('id'),
+ 'hasbeenpaid': 'N'
+ }, function () {
+ OB.MobileApp.model.triggerLogout();
+ }, error);
+ }
this.set('currentView', {
name: 'order',
params: null
diff -r 87dcf1f61d9d web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js Wed Jun 03 09:25:48 2015 +0200
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js Thu Jun 04 16:14:02 2015 +0200
@@ -311,7 +311,7 @@
}
},
- save: function () {
+ save: function (callback) {
var undoCopy;
if (this.attributes.json) {
@@ -320,8 +320,11 @@
undoCopy = this.get('undo');
this.unset('undo');
this.set('json', JSON.stringify(this.toJSON()));
+ if (callback == undefined || !callback instanceof Function) {
+ callback = function () {};
+ }
if (!OB.MobileApp.model.get('preventOrderSave')) {
- OB.Dal.save(this, function () {}, function () {
+ OB.Dal.save(this, callback, function () {
OB.error(arguments);
});
}
diff -r 87dcf1f61d9d web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js Wed Jun 03 09:25:48 2015 +0200
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js Thu Jun 04 16:14:02 2015 +0200
@@ -361,11 +361,28 @@
deleteCurrentOrder: function (inSender, inEvent) {
function removeOrder(context) {
var isPaidQuotation = (context.model.get('order').has('isQuotation') && context.model.get('order').get('isQuotation') && context.model.get('order').has('hasbeenpaid') && context.model.get('order').get('hasbeenpaid') === 'Y');
- if (context.model.get('order').get('id') && !isPaidQuotation) {
- context.model.get('orderList').saveCurrent();
- OB.Dal.remove(context.model.get('orderList').current, null, null);
+ var receipt = context.model.get('order');
+ if (receipt.get('id') && !isPaidQuotation && receipt.get('lines') && receipt.get('lines').length > 0) {
+ if (OB.MobileApp.model.hasPermission('OBPOS_remove_ticket', true)) {
+ receipt.set('obposIsDeleted', true);
+ for (i = 0; i < receipt.get('lines').length; i++) {
+ receipt.get('lines').at(i).set('obposIsDeleted', true);
+ }
+ receipt.calculateGross();
+ receipt.save();
+ receipt.trigger('closed', {
+ callback: function () {
+ context.model.get('orderList').deleteCurrent();
+ context.model.get('orderList').synchronizeCurrentOrder();
+ }
+ });
+ } else {
+ context.model.get('orderList').saveCurrent();
+ OB.Dal.remove(context.model.get('orderList').current, null, null);
+ }
+ } else {
+ context.model.get('orderList').deleteCurrent();
}
- context.model.get('orderList').deleteCurrent();
}
if (inEvent && inEvent.notSavedOrder === true) {
diff -r 87dcf1f61d9d web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js Wed Jun 03 09:25:48 2015 +0200
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js Thu Jun 04 16:14:02 2015 +0200
@@ -128,16 +128,23 @@
if (me.hasClass('paidticket')) {
me.doDeleteOrder();
} else {
- OB.UTIL.Approval.requestApproval(
- this.model, 'OBPOS_approval.removereceipts', function (approved, supervisor, approvalType) {
- if (approved) {
- me.doShowPopup({
- popup: 'modalConfirmReceiptDelete'
- });
- }
- });
+ if (OB.MobileApp.model.hasPermission('OBPOS_approval.removereceipts', true)) {
+ //Show the pop up to delete or not
+ me.doShowPopup({
+ popup: 'modalConfirmReceiptDelete'
+ });
+ } else {
+ OB.UTIL.Approval.requestApproval(
+ this.model, 'OBPOS_approval.removereceipts', function (approved, supervisor, approvalType) {
+ if (approved) {
+ //Delete the order without the popup
+ me.doDeleteOrder({
+ notSavedOrder: true
+ });
+ }
+ });
+ }
}
-
},
init: function (model) {
this.model = model;
diff -r 87dcf1f61d9d web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
--- a/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js Wed Jun 03 09:25:48 2015 +0200
+++ b/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js Thu Jun 04 16:14:02 2015 +0200
@@ -47,8 +47,9 @@
function updateCashUpInfo(cashUp, receipt, j, callback, tx) {
var cashuptaxes, order, orderType, gross, i, taxOrderType, taxAmount, auxPay;
- if (j < receipt.length) {
+ if (j < receipt.length && !receipt[j].has('obposIsDeleted')) {
order = receipt[j];
+
orderType = order.get('orderType');
if (cashUp.length !== 0) {
_.each(order.get('lines').models, function (line) {