details: https://code.openbravo.com/erp/devel/pi/rev/43e5679d96fd
changeset: 33611:43e5679d96fd
user: Atul Gaware <atul.gaware <at> openbravo.com>
date: Fri Feb 23 14:26:31 2018 +0530
summary: Fixes Issue 37996: Sales Order with Immediate Invoice terms
does not appear in Create Invoices From Order and Create
Lines From process
In C_Invoice_Candidate_V view, OBEQUALS condition for
qtyordered and qtyinvoiced is set as = 'N' which was
wrongly set as <> 'N'
diffstat:
src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (9 lines):
diff -r 77881ff51216 -r 43e5679d96fd
src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml
--- a/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml Tue Feb 27
11:04:56 2018 +0100
+++ b/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml Fri Feb 23
14:26:31 2018 +0530
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<database name="VIEW C_INVOICE_CANDIDATE_V">
- <view name="C_INVOICE_CANDIDATE_V"><![CDATA[SELECT o.ad_client_id,
o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered,
o.c_doctype_id, o.totallines AS amountlines, o.grandtotal AS amountlinesgross,
sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS
notinvoicedlines, round(sum(round((l.qtyordered - l.qtyinvoiced) *
l.priceactual, c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS
notinvoicedlinesgross, o.invoicerule AS term, sum(round((l.qtydelivered -
l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS pendinglines,
round(sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual,
c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS pendinglinesgross,
sum(abs(l.qtyordered)) AS qtyordered, sum(abs(l.qtydelivered)) AS qtydelivered
FROM c_order o JOIN c_doctype dt ON o.c_doctype_id = dt.c_doctype_id JOIN
c_bpartner bp ON o.c_bpartner_id = bp.c_bpartner_id JOIN c_currency c ON
o.c_currency_id = c.c_currency_id JOIN c_orderline l ON o.c_order_id =
l.c_order_id JOIN c_tax t ON t.c_tax_id = l.c_tax_id LEFT JOIN
c_invoiceschedule si ON bp.c_invoiceschedule_id = si.c_invoiceschedule_id WHERE
(o.docstatus IN ('CO', 'CL', 'IP')) AND dt.docbasetype = 'SOO' AND
(dt.docsubtypeso NOT IN ('ON', 'OB', 'WR')) AND (o.invoicerule = 'I' OR
o.invoicerule = 'O' OR o.invoicerule = 'D' OR o.invoicerule = 'S' AND
(si.invoicefrequency IS NULL OR si.invoicefrequency = 'D' OR
si.invoicefrequency = 'W' OR si.invoicefrequency = 'T' AND trunc(o.dateordered)
<= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >=
(trunc(o.dateordered, 'MM') + si.invoiceday - 1) OR trunc(o.dateordered) <=
(trunc(now(), 'MM') + si.invoicedaycutoff + 14) AND trunc(now()) >=
(trunc(o.dateordered, 'MM') + si.invoiceday + 14) OR si.invoicefrequency = 'M'
AND trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND
trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday - 1))) AND
(obequals(l.qtyordered, l.qtyinvoiced) <> 'N' OR obequals(l.qtydelivered,
l.qtyinvoiced) = 'N') GROUP BY o.ad_client_id, o.ad_org_id, o.c_bpartner_id,
o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines,
o.grandtotal, o.invoicerule, c.c_currency_id, c.stdprecision]]></view>
+ <view name="C_INVOICE_CANDIDATE_V"><![CDATA[SELECT o.ad_client_id,
o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered,
o.c_doctype_id, o.totallines AS amountlines, o.grandtotal AS amountlinesgross,
sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS
notinvoicedlines, round(sum(round((l.qtyordered - l.qtyinvoiced) *
l.priceactual, c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS
notinvoicedlinesgross, o.invoicerule AS term, sum(round((l.qtydelivered -
l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS pendinglines,
round(sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual,
c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS pendinglinesgross,
sum(abs(l.qtyordered)) AS qtyordered, sum(abs(l.qtydelivered)) AS qtydelivered
FROM c_order o JOIN c_doctype dt ON o.c_doctype_id = dt.c_doctype_id JOIN
c_bpartner bp ON o.c_bpartner_id = bp.c_bpartner_id JOIN c_currency c ON
o.c_currency_id = c.c_currency_id JOIN c_orderline l ON o.c_order_id =
l.c_order_id JOIN c_tax t ON t.c_tax_id = l.c_tax_id LEFT JOIN
c_invoiceschedule si ON bp.c_invoiceschedule_id = si.c_invoiceschedule_id WHERE
(o.docstatus IN ('CO', 'CL', 'IP')) AND dt.docbasetype = 'SOO' AND
(dt.docsubtypeso NOT IN ('ON', 'OB', 'WR')) AND (o.invoicerule = 'I' OR
o.invoicerule = 'O' OR o.invoicerule = 'D' OR o.invoicerule = 'S' AND
(si.invoicefrequency IS NULL OR si.invoicefrequency = 'D' OR
si.invoicefrequency = 'W' OR si.invoicefrequency = 'T' AND trunc(o.dateordered)
<= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >=
(trunc(o.dateordered, 'MM') + si.invoiceday - 1) OR trunc(o.dateordered) <=
(trunc(now(), 'MM') + si.invoicedaycutoff + 14) AND trunc(now()) >=
(trunc(o.dateordered, 'MM') + si.invoiceday + 14) OR si.invoicefrequency = 'M'
AND trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND
trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday - 1))) AND
(obequals(l.qtyordered, l.qtyinvoiced) = 'N' OR obequals(l.qtydelivered,
l.qtyinvoiced) = 'N') GROUP BY o.ad_client_id, o.ad_org_id, o.c_bpartner_id,
o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines,
o.grandtotal, o.invoicerule, c.c_currency_id, c.stdprecision]]></view>
</database>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
