Notes |
|
|
Uploaded cashvat-pos-19q2.diff, it is the same code as the patch, but merged with 19q2. |
|
|
|
|
|
(0112867)
|
hgbot
|
2019-06-18 17:01
|
|
Repository: erp/devel/pi
Changeset: d9535ca2cfdf8fd967420dddf9ec16f683e0df79
Author: Gorka Gil <gorka.gil <at> openbravo.com>
Date: Wed Jun 05 17:14:50 2019 +0200
URL: http://code.openbravo.com/erp/devel/pi/rev/d9535ca2cfdf8fd967420dddf9ec16f683e0df79 [^]
Related to issue 33973: implement cashvat in webpos
Added two fields:
- "paid amount at invoicing" to invoice header (info for user)
- "is paid at invoincing" to payment detail (for cashvat engine)
FIN_AddPayment.saveGLItem method overloaded to allow to choose if do flush or not
Info about new column ISPAIDATINVOICING:
The FIN_Payment_Detail table has a new nullable column called ISPAIDATINVOICING, which
must be filled by the POS when paying an invoice in the moment of creating this invoice.
It is null to avoid performance penalty when updating existing instances.
From an accounting cash vat POV, both the prepayment (which is the amount paid in the order) and the
amount paid at invoice creation represents the same concept. The correspondent amount must be accounted
in the FINAL Tax account.
Therefore the CashVATUtil.calculatePrepaidPercentageForCashVATTax() method has been modified to take
into account both amounts.
This method is based on the C_INVOICETAX_CASHVAT_V view, so it has been modified too to return the
ISPAIDATINVOICING value that is consumed by the method.
DocLineCashVATReady_PaymentTransactionReconciliation.setInvoiceTaxCashVAT_V() now excludes the payment
details set as ISPAIDATINVOICING, so the payment/transaction/reconcilation accountings do not include
the transitory VAT account.
---
M modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_DETAIL_CHECK_TRG.xml
M modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
M src-db/database/model/tables/C_INVOICE.xml
M src-db/database/model/tables/FIN_PAYMENT_DETAIL.xml
M src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml
M src-db/database/sourcedata/AD_COLUMN.xml
M src-db/database/sourcedata/AD_ELEMENT.xml
M src-db/database/sourcedata/AD_FIELD.xml
M src/org/openbravo/erpCommon/ad_forms/DocLineCashVATReady_PaymentTransactionReconciliation.java
M src/org/openbravo/erpCommon/utility/CashVATUtil.java
---
|
|
|
(0112868)
|
hgbot
|
2019-06-18 17:01
|
|
Repository: erp/pmods/org.openbravo.retail.posterminal
Changeset: 92f5d7eff1a8bbb06597f9f895102c93b92ee661
Author: Gorka Gil <gorka.gil <at> openbravo.com>
Date: Wed Jun 05 18:09:04 2019 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/92f5d7eff1a8bbb06597f9f895102c93b92ee661 [^]
Fixed issue 33973: implement cashvat in webpos
Fill the fields paidAmtAtInvoicing (c_invoice) and isPaidAtInvoicing (fin_paymentdetail),
used in the backend to calculate the cashvat, and to which gl item correspond the payment
When having prepaiments (order with payments and after created the invoice) call to
CashVATUtil.createInvoiceTaxCashVAT api to fill the cahsvat table. This is done when the invoice
is created in the pos or in the cashup.
Needed to add to createPSInvoice missing updates of hibernate objects, so the later call
to createCashVat works.
When the organization is set as cashvat send it to the webpos in the terminal info.
Added also to the ticket json a field cashvat when the organization/terminal works with cashvat
When returning a ticket it should mantain the cashvat value of the original ticket, if
Example: if an organization change to cashvat, when returning a ticket from before the
change it should return as not cashvat
The taxes available when cashvat should be only cashvat ones and exemption ones.
If not cashvat, it should not be available any cashvat tax.
---
M src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java
M src/org/openbravo/retail/posterminal/OrderGroupingProcessor_data.xsql
M src/org/openbravo/retail/posterminal/OrderLoader.java
M src/org/openbravo/retail/posterminal/PaidReceiptProperties.java
M src/org/openbravo/retail/posterminal/term/Terminal.java
M src/org/openbravo/retail/posterminal/utility/InvoiceUtils.java
M web/org.openbravo.retail.posterminal/js/data/dataordertaxes.js
M web/org.openbravo.retail.posterminal/js/model/order.js
---
|
|
|
(0112869)
|
hgbot
|
2019-06-18 17:01
|
|
|
|
(0112871)
|
hgbot
|
2019-06-18 17:39
|
|
|
|
|
|
|
(0112893)
|
hgbot
|
2019-06-19 14:46
|
|
Repository: erp/pmods/org.openbravo.retail.testsampledata
Changeset: 022202ebf6aee3448b23996245bdeb41bf09134a
Author: Gorka Gil <gorka.gil <at> openbravo.com>
Date: Wed Jun 19 14:45:42 2019 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.testsampledata/rev/022202ebf6aee3448b23996245bdeb41bf09134a [^]
Related to issue 33973: Fix sampledata
---
M referencedata/sampledata/Retail_Test/AD_SEQUENCE.xml
M referencedata/sampledata/Retail_Test/AD_WINDOW_ACCESS.xml
M referencedata/sampledata/Retail_Test/C_ACCTSCHEMA_TABLE.xml
M referencedata/sampledata/Retail_Test/OBRETCO_PRODUCTCATEGORY.xml
M referencedata/sampledata/Retail_Test/OBUIAPP_PROCESS_ACCESS.xml
---
|
|
|
|
|
|
|
|
|
(0112904)
|
hgbot
|
2019-06-19 17:19
|
|
Repository: erp/pmods/org.openbravo.retail.testsampledata
Changeset: b439bdfdb24ee24cadbbf8e05d5f556b4aecee20
Author: Gorka Gil <gorka.gil <at> openbravo.com>
Date: Wed Jun 19 16:39:21 2019 +0200
URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.testsampledata/rev/b439bdfdb24ee24cadbbf8e05d5f556b4aecee20 [^]
Related to issue 33973: Backed out changeset 022202ebf6ae, sampledata changes make install.source to fail
---
M referencedata/sampledata/Retail_Test/AD_SEQUENCE.xml
M referencedata/sampledata/Retail_Test/AD_WINDOW_ACCESS.xml
M referencedata/sampledata/Retail_Test/C_ACCTSCHEMA_TABLE.xml
M referencedata/sampledata/Retail_Test/OBRETCO_PRODUCTCATEGORY.xml
M referencedata/sampledata/Retail_Test/OBUIAPP_PROCESS_ACCESS.xml
---
|
|