diff --git a/src-db/database/model/tables/OBPOS_APP_PAYMENT.xml b/src-db/database/model/tables/OBPOS_APP_PAYMENT.xml --- a/src-db/database/model/tables/OBPOS_APP_PAYMENT.xml +++ b/src-db/database/model/tables/OBPOS_APP_PAYMENT.xml @@ -37,7 +37,7 @@ - + diff --git a/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml b/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml --- a/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml +++ b/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml @@ -81,7 +81,7 @@ - + @@ -149,6 +149,10 @@ + + + + @@ -195,6 +199,7 @@ + diff --git a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml new file mode 100644 --- /dev/null +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -1798,6 +1798,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2269,7 +2303,7 @@ - + @@ -7539,11 +7573,13 @@ + - + + diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -970,6 +970,18 @@ + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -13,7 +13,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -492,6 +492,7 @@ + @@ -772,6 +773,7 @@ + @@ -999,6 +1001,7 @@ + @@ -1846,7 +1849,7 @@ - + @@ -2465,7 +2468,7 @@ - + @@ -2754,6 +2757,7 @@ + @@ -3146,16 +3150,17 @@ + - + - + @@ -3878,6 +3883,7 @@ + @@ -4287,7 +4293,7 @@ - + @@ -4344,7 +4350,7 @@ - + @@ -4545,7 +4551,7 @@ - + @@ -4914,7 +4920,7 @@ - + @@ -5098,6 +5104,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5142,14 +5174,14 @@ - + - + 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 @@ -1224,6 +1224,18 @@ + + + + + + + + + + + + @@ -1909,6 +1921,18 @@ + + + + + + + + + + + + @@ -2654,6 +2678,18 @@ + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_VAL_RULE.xml b/src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml @@ -79,6 +79,17 @@ + + + + + + + + + + + diff --git a/src/org/openbravo/retail/posterminal/CashCloseProcessor.java b/src/org/openbravo/retail/posterminal/CashCloseProcessor.java --- a/src/org/openbravo/retail/posterminal/CashCloseProcessor.java +++ b/src/org/openbravo/retail/posterminal/CashCloseProcessor.java @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012 Openbravo S.L.U. + * Copyright (C) 2012-2015 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. @@ -73,7 +73,9 @@ } String paymentTypeId = cashCloseObj.getString("paymentTypeId"); OBPOSAppPayment paymentType = OBDal.getInstance().get(OBPOSAppPayment.class, paymentTypeId); - + if (paymentType.getFinancialAccount() == null) { + continue; + } FIN_Reconciliation reconciliation = createReconciliation(cashCloseObj, posTerminal, paymentType.getFinancialAccount(), cashUpDate); diff --git a/src/org/openbravo/retail/posterminal/InitialValidations.java b/src/org/openbravo/retail/posterminal/InitialValidations.java --- a/src/org/openbravo/retail/posterminal/InitialValidations.java +++ b/src/org/openbravo/retail/posterminal/InitialValidations.java @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012 Openbravo S.L.U. + * Copyright (C) 2012-2015 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. @@ -48,8 +48,8 @@ throw new JSONException("OBPOS_OrgDesynchronization"); } - String whereclausePM = " as e where e.obposApplications=:terminal and not exists " - + "(select 1 from FinancialMgmtFinAccPaymentMethod as pmacc where " + String whereclausePM = " as e where e.obposApplications=:terminal and e.financialAccount is not null " + + "and not exists (select 1 from FinancialMgmtFinAccPaymentMethod as pmacc where " + "pmacc.paymentMethod = e.paymentMethod.paymentMethod and pmacc.account = e.financialAccount" + ")"; OBQuery queryFinAccounts = OBDal.getInstance().createQuery( @@ -59,7 +59,7 @@ throw new JSONException("OBPOS_PayMethodNotConfiguredInAccount"); } - String whereclauseCMEV = " as e where e.obposApplications=:terminal and exists " + String whereclauseCMEV = " as e where e.obposApplications=:terminal and e.financialAccount is not null and exists " + "(select 1 from OBRETCO_CashManagementEvents as cmev where " + "cmev.financialAccount = e.financialAccount)"; OBQuery queryEventAccounts = OBDal.getInstance().createQuery( @@ -68,5 +68,14 @@ if (queryEventAccounts.list().size() > 0) { throw new JSONException("OBPOS_CMEVAccountIsUsedInPayMethod"); } + + String whereclauseLAC = " as e where e.obposApplications=:terminal and ((e.financialAccount is null " + + "and e.paymentMethod.leaveascredit = false) or (e.financialAccount is not null and e.paymentMethod.leaveascredit = true))"; + OBQuery queryLeaveAsCredit = OBDal.getInstance().createQuery( + OBPOSAppPayment.class, whereclauseLAC); + queryLeaveAsCredit.setNamedParameter("terminal", posTerminal); + if (queryLeaveAsCredit.list().size() > 0) { + throw new JSONException("OBPOS_LeaveAsCreditNotConfigured"); + } } } diff --git a/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java --- a/src/org/openbravo/retail/posterminal/OrderLoader.java +++ b/src/org/openbravo/retail/posterminal/OrderLoader.java @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012-2013 Openbravo S.L.U. + * Copyright (C) 2012-2015 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. @@ -177,9 +177,14 @@ && !isQuotation && Math.abs(jsonorder.getDouble("payment")) < Math.abs(new Double(jsonorder .getDouble("gross"))); - createInvoice = wasPaidOnCredit - || (!isQuotation && (!isLayaway && !partialpayLayaway || fullpayLayaway) && (jsonorder - .has("generateInvoice") && jsonorder.getBoolean("generateInvoice"))); + if (jsonorder.has("oBPOSNotInvoiceOnCashUp") + && jsonorder.getBoolean("oBPOSNotInvoiceOnCashUp")) { + createInvoice = false; + } else { + createInvoice = wasPaidOnCredit + || (!isQuotation && (!isLayaway && !partialpayLayaway || fullpayLayaway) && (jsonorder + .has("generateInvoice") && jsonorder.getBoolean("generateInvoice"))); + } createShipment = !isQuotation && (!isLayaway && !partialpayLayaway || fullpayLayaway); if (jsonorder.has("generateShipment")) { createShipment &= jsonorder.getBoolean("generateShipment"); @@ -1385,6 +1390,9 @@ paymentinst.process(payment, order, invoice, i == (payments.length() - 1) ? writeoffAmt : BigDecimal.ZERO); } else { + if (paymentType.getFinancialAccount() == null) { + continue; + } processPayments(paymentSchedule, paymentScheduleInvoice, order, invoice, paymentType, payment, i == (payments.length() - 1) ? writeoffAmt : BigDecimal.ZERO, jsonorder); } diff --git a/src/org/openbravo/retail/posterminal/ProcessCashClose.java b/src/org/openbravo/retail/posterminal/ProcessCashClose.java --- a/src/org/openbravo/retail/posterminal/ProcessCashClose.java +++ b/src/org/openbravo/retail/posterminal/ProcessCashClose.java @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012 Openbravo S.L.U. + * Copyright (C) 2012-2015 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. @@ -64,6 +64,9 @@ if (cashUp.isProcessed() && !cashUp.isProcessedbo()) { // check if there is a reconciliation in draft status for (OBPOSAppPayment payment : posTerminal.getOBPOSAppPaymentList()) { + if (payment.getFinancialAccount() == null) { + continue; + } final OBCriteria recconciliations = OBDal.getInstance().createCriteria( FIN_Reconciliation.class); recconciliations.add(Restrictions.eq(FIN_Reconciliation.PROPERTY_DOCUMENTSTATUS, "DR")); diff --git a/src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java b/src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java --- a/src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java +++ b/src/org/openbravo/retail/posterminal/ProcessVoidLayaway.java @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012 Openbravo S.L.U. + * Copyright (C) 2012-2015 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. @@ -144,6 +144,9 @@ paymentType = type; } } + if (paymentType.getFinancialAccount() == null) { + continue; + } FIN_FinancialAccount account = paymentType.getFinancialAccount(); FIN_PaymentScheduleDetail newPaymentScheduleDetail = OBProvider.getInstance().get( diff --git a/src/org/openbravo/retail/posterminal/ad_reports/CashUpReport.java b/src/org/openbravo/retail/posterminal/ad_reports/CashUpReport.java --- a/src/org/openbravo/retail/posterminal/ad_reports/CashUpReport.java +++ b/src/org/openbravo/retail/posterminal/ad_reports/CashUpReport.java @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2013 Openbravo SLU + * All portions are Copyright (C) 2013-2015 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -140,7 +140,10 @@ List recons = reconsQuery.list(); Date cashUpDate = cashup.getCashUpDate(); for (int i = 0; i < recons.size(); i++) { - + if (recons.get(i).getReconciliation().getAccount().getOBPOSAppPaymentList().get(0) + .getFinancialAccount() == null) { + continue; + } expected = BigDecimal.ZERO; if (i != 0) diff --git a/src/org/openbravo/retail/posterminal/event/PaymentMethodEventHandler.java b/src/org/openbravo/retail/posterminal/event/PaymentMethodEventHandler.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/retail/posterminal/event/PaymentMethodEventHandler.java @@ -0,0 +1,87 @@ +/* + ************************************************************************************ + * Copyright (C) 2015 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.event; + +import javax.enterprise.event.Observes; + +import org.apache.log4j.Logger; +import org.openbravo.base.exception.OBException; +import org.openbravo.base.model.Entity; +import org.openbravo.base.model.ModelProvider; +import org.openbravo.base.model.Property; +import org.openbravo.client.kernel.event.EntityNewEvent; +import org.openbravo.client.kernel.event.EntityPersistenceEventObserver; +import org.openbravo.client.kernel.event.EntityUpdateEvent; +import org.openbravo.dal.core.OBContext; +import org.openbravo.erpCommon.utility.Utility; +import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount; +import org.openbravo.retail.posterminal.OBPOSAppPayment; +import org.openbravo.retail.posterminal.TerminalTypePaymentMethod; +import org.openbravo.service.db.DalConnectionProvider; + +/** + * @author guillermogil + * + */ + +public class PaymentMethodEventHandler extends EntityPersistenceEventObserver { + private static Entity[] entities = { ModelProvider.getInstance().getEntity( + OBPOSAppPayment.ENTITY_NAME) }; + protected Logger logger = Logger.getLogger(this.getClass()); + + @Override + protected Entity[] getObservedEntities() { + return entities; + } + + public void onUpdate(@Observes EntityUpdateEvent event) { + if (!isValidEvent(event)) { + return; + } + + FIN_FinancialAccount financialAccount = (FIN_FinancialAccount) event.getTargetInstance().get( + "financialAccount"); + TerminalTypePaymentMethod paymentMethod = (TerminalTypePaymentMethod) event.getTargetInstance() + .get("paymentMethod"); + Boolean leaveascredit = paymentMethod.isLeaveascredit(); + if (leaveascredit && financialAccount != null) { + final Entity appPaymentEntity = ModelProvider.getInstance().getEntity( + OBPOSAppPayment.ENTITY_NAME); + final Property financialAccountProperty = appPaymentEntity.getProperty("financialAccount"); + event.setCurrentState(financialAccountProperty, null); + } else if (!leaveascredit && financialAccount == null) { + throw new OBException(Utility.messageBD(new DalConnectionProvider(false), + "OBPOS_FinAccLeaveCredit", OBContext.getOBContext().getLanguage().getLanguage())); + } + + } + + public void onSave(@Observes EntityNewEvent event) { + if (!isValidEvent(event)) { + return; + } + + FIN_FinancialAccount financialAccount = (FIN_FinancialAccount) event.getTargetInstance().get( + "financialAccount"); + TerminalTypePaymentMethod paymentMethod = (TerminalTypePaymentMethod) event.getTargetInstance() + .get("paymentMethod"); + Boolean leaveascredit = paymentMethod.isLeaveascredit(); + if (leaveascredit && financialAccount != null) { + final Entity appPaymentEntity = ModelProvider.getInstance().getEntity( + OBPOSAppPayment.ENTITY_NAME); + final Property financialAccountProperty = appPaymentEntity.getProperty("financialAccount"); + event.setCurrentState(financialAccountProperty, null); + } else if (!leaveascredit && financialAccount == null) { + throw new OBException(Utility.messageBD(new DalConnectionProvider(false), + "OBPOS_FinAccLeaveCredit", OBContext.getOBContext().getLanguage().getLanguage())); + } + + } +} \ No newline at end of file diff --git a/src/org/openbravo/retail/posterminal/event/PaymentMethodTypeEventHandler.java b/src/org/openbravo/retail/posterminal/event/PaymentMethodTypeEventHandler.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/retail/posterminal/event/PaymentMethodTypeEventHandler.java @@ -0,0 +1,96 @@ +/* + ************************************************************************************ + * Copyright (C) 2015 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.event; + +import javax.enterprise.event.Observes; + +import org.apache.log4j.Logger; +import org.openbravo.base.exception.OBException; +import org.openbravo.base.model.Entity; +import org.openbravo.base.model.ModelProvider; +import org.openbravo.client.kernel.event.EntityNewEvent; +import org.openbravo.client.kernel.event.EntityPersistenceEventObserver; +import org.openbravo.client.kernel.event.EntityUpdateEvent; +import org.openbravo.dal.core.OBContext; +import org.openbravo.erpCommon.utility.Utility; +import org.openbravo.retail.posterminal.TerminalTypePaymentMethod; +import org.openbravo.service.db.DalConnectionProvider; + +/** + * @author guillermogil + * + */ + +public class PaymentMethodTypeEventHandler extends EntityPersistenceEventObserver { + private static Entity[] entities = { ModelProvider.getInstance().getEntity( + TerminalTypePaymentMethod.ENTITY_NAME) }; + protected Logger logger = Logger.getLogger(this.getClass()); + + @Override + protected Entity[] getObservedEntities() { + return entities; + } + + public void onUpdate(@Observes + EntityUpdateEvent event) { + if (!isValidEvent(event)) { + return; + } + + Boolean leaveascredit = (Boolean) event.getTargetInstance().get("leaveascredit"); + Entity appPaymentTypeEntity = ModelProvider.getInstance().getEntity( + TerminalTypePaymentMethod.ENTITY_NAME); + if (leaveascredit) { + event.setCurrentState(appPaymentTypeEntity.getProperty("allowdrops"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("allowdeposits"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("allowvariableamount"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("allowdontmove"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("allowmoveeverything"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("automatemovementtoother"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("keepfixedamount"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("cashDifferences"), null); + event.setCurrentState(appPaymentTypeEntity.getProperty("glitemDropdep"), null); + } else { + if (event.getCurrentState(appPaymentTypeEntity.getProperty("cashDifferences")) == null) { + throw new OBException(Utility.messageBD(new DalConnectionProvider(false), + "OBPOS_CashDiffLeaveCredit", OBContext.getOBContext().getLanguage().getLanguage())); + } + } + + } + + public void onSave(@Observes + EntityNewEvent event) { + if (!isValidEvent(event)) { + return; + } + + Boolean leaveascredit = (Boolean) event.getTargetInstance().get("leaveascredit"); + Entity appPaymentTypeEntity = ModelProvider.getInstance().getEntity( + TerminalTypePaymentMethod.ENTITY_NAME); + if (leaveascredit) { + event.setCurrentState(appPaymentTypeEntity.getProperty("allowdrops"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("allowdeposits"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("allowvariableamount"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("allowdontmove"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("allowmoveeverything"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("automatemovementtoother"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("keepfixedamount"), false); + event.setCurrentState(appPaymentTypeEntity.getProperty("cashDifferences"), null); + event.setCurrentState(appPaymentTypeEntity.getProperty("glitemDropdep"), null); + } else { + if (event.getCurrentState(appPaymentTypeEntity.getProperty("cashDifferences")) == null) { + throw new OBException(Utility.messageBD(new DalConnectionProvider(false), + "OBPOS_CashDiffLeaveCredit", OBContext.getOBContext().getLanguage().getLanguage())); + } + } + + } +} \ No newline at end of file diff --git a/src/org/openbravo/retail/posterminal/term/Payments.java b/src/org/openbravo/retail/posterminal/term/Payments.java --- a/src/org/openbravo/retail/posterminal/term/Payments.java +++ b/src/org/openbravo/retail/posterminal/term/Payments.java @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012-2014 Openbravo S.L.U. + * Copyright (C) 2012-2015 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. @@ -39,13 +39,13 @@ JSONArray respArray = new JSONArray(); String posId = RequestContext.get().getSessionAttribute("POSTerminal").toString(); String hqlPayments = "select p as payment, p.paymentMethod as paymentMethod, " - + "c_currency_rate(p.financialAccount.currency, p.obposApplications.organization.currency, null, null, p.obposApplications.client.id, p.obposApplications.organization.id) as rate, c_currency_rate(p.obposApplications.organization.currency, p.financialAccount.currency, null, null, p.obposApplications.client.id, p.obposApplications.organization.id) as mulrate, " - + "p.financialAccount.currency.iSOCode as isocode, " - + "p.financialAccount.currency.symbol as symbol, p.financialAccount.currency.currencySymbolAtTheRight as currencySymbolAtTheRight, " - + "p.financialAccount.currentBalance as currentBalance, " - + "p.financialAccount.currency.obposPosprecision as obposPosprecision " - + "from OBPOS_App_Payment as p where p.obposApplications.id=? " - + "and p.$readableSimpleCriteria and p.$activeCriteria order by p.line, p.commercialName"; + + "c_currency_rate(coalesce(c, p.paymentMethod.currency), p.obposApplications.organization.currency, null, null, p.obposApplications.client.id, p.obposApplications.organization.id) as rate, c_currency_rate(p.obposApplications.organization.currency, coalesce(c, p.paymentMethod.currency), null, null, p.obposApplications.client.id, p.obposApplications.organization.id) as mulrate, " + + "coalesce(c.iSOCode, p.paymentMethod.currency.iSOCode) as isocode, " + + "coalesce(c.symbol, p.paymentMethod.currency.symbol) as symbol, coalesce(c.currencySymbolAtTheRight, p.paymentMethod.currency.currencySymbolAtTheRight) as currencySymbolAtTheRight, " + + "coalesce(f.currentBalance, 0) as currentBalance, " + + "coalesce(c.obposPosprecision, null) as obposPosprecision " + + "from OBPOS_App_Payment as p left join p.financialAccount as f left join f.currency as c " + + "where p.obposApplications.id=? and p.$readableSimpleCriteria and p.$activeCriteria order by p.line, p.commercialName"; SimpleQueryBuilder querybuilder = new SimpleQueryBuilder(hqlPayments, OBContext .getOBContext().getCurrentClient().getId(), OBContext.getOBContext() diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js --- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js @@ -442,6 +442,13 @@ })); } receipt.set('change', oldChange); + for (var i = 0; i < receipt.get('payments').length; i++) { + var payment = OB.MobileApp.model.paymentnames[receipt.get('payments').models[i].get('kind')]; + if (payment && payment.paymentMethod && payment.paymentMethod.leaveascredit) { + receipt.set('payment', OB.DEC.sub(receipt.get('payment'), receipt.get('payments').models[i].get('amount'))); + receipt.set('paidOnCredit', true); + } + } receipt.trigger('closed', { callback: function () { receipt.get('payments').reset(); @@ -464,6 +471,13 @@ } }); } else { + for (var i = 0; i < receipt.get('payments').length; i++) { + var payment = OB.MobileApp.model.paymentnames[receipt.get('payments').models[i].get('kind')]; + if (payment && payment.paymentMethod && payment.paymentMethod.leaveascredit) { + receipt.set('payment', OB.DEC.sub(receipt.get('payment'), receipt.get('payments').models[i].get('amount'))); + receipt.set('paidOnCredit', true); + } + } receipt.trigger('closed', { callback: function () { // receipt is cloned because the receipt is deleted when event "closed" is triggered @@ -720,4 +734,4 @@ callback(approved, supervisor, approvalType); } } -}); +}); \ No newline at end of file