0041059: Cashup Invoice is not working properly when having a ticket mixing pick and carry lines with lines of any other delivery mode

Description

When a cashup is processed, invoices are issued for the immediate invoice rule tickets. If the ticket contains both a line using pick and carry and a line using any other delivery mode, that ticket is not considered when doing the cashup. Then that order is never invoiced

Steps To Reproduce

Using webPOS
1) create a tcket
2) add a pick and carry line
3) Add a line for any product using pickup in store
4) pay the ticket
5) do a cashup
6) chaeck the previous created ticket is not invoice while it should

Proposed Solution

Modify the Cashup process to consider these tickets. Se attached diff

Tags

No tags attached.

Attached Files

cashup.diff [^] (4,128 bytes) 2019-06-10 13:12 [Show Content] [Hide Content]

diff -r de0c54bc638c -r c0ac58c3a03a src/org/openbravo/retail/posterminal/OrderGroupingProcessor_data.xsql
--- a/src/org/openbravo/retail/posterminal/OrderGroupingProcessor_data.xsql	Tue Jun 04 16:01:33 2019 -0400
+++ b/src/org/openbravo/retail/posterminal/OrderGroupingProcessor_data.xsql	Thu Jun 06 09:47:41 2019 +0200
@@ -38,10 +38,12 @@
         and o.ad_org_id = org.ad_org_id
         and o.c_doctype_id = dt.c_doctype_id
         and o.c_bpartner_id = bp.c_bpartner_id
+        and o.em_obpos_islayaway = 'N'
+        and o.invoicerule = 'I'
         and o.em_obpos_app_cashup_id = ?
         and o.c_doctype_id in (org.em_obpos_c_doctype_id, org.em_obpos_c_doctyperet_id)
         and not exists (select 1 from c_orderline ol2 where 
-        (ol2.qtyinvoiced <> 0 or (ol2.qtyordered = 0 and ol2.em_obpos_isdeleted = 'N') or ol2.qtydelivered <> ol2.qtyordered) 
+        (ol2.qtyinvoiced <> 0 or (ol2.qtyordered = 0 and ol2.em_obpos_isdeleted = 'N')) 
         and ol2.c_order_id = o.c_order_id)
         and o.em_obpos_notinvoiceoncashup = 'N'
         and (bp.c_paymentterm_id is null or bp.fin_paymentmethod_id is null)
@@ -73,7 +75,9 @@
         and o.c_bpartner_id = bp.c_bpartner_id
         and o.em_obpos_app_cashup_id = ?
         and o.c_doctype_id in (org.em_obpos_c_doctype_id, org.em_obpos_c_doctyperet_id)
-        and not exists (select 1 from c_orderline ol2 where (ol2.qtyinvoiced <> 0 or (ol2.qtyordered = 0 and ol2.em_obpos_isdeleted = 'N') or ol2.qtydelivered <> ol2.qtyordered) and ol2.c_order_id = o.c_order_id)
+        and o.em_obpos_islayaway = 'N'
+        and o.invoicerule = 'I'
+        and not exists (select 1 from c_orderline ol2 where (ol2.qtyinvoiced <> 0 or (ol2.qtyordered = 0 and ol2.em_obpos_isdeleted = 'N')) and ol2.c_order_id = o.c_order_id)
         and o.em_obpos_notinvoiceoncashup = 'N'
         group by  o.ad_client_id, o.ad_org_id, o.ad_orgtrx_id, dt.c_doctypeinvoice_id, dt.c_doctypeinvoice_id,
         o.c_bpartner_id, coalesce(o.billto_id, o.c_bpartner_location_id), o.c_currency_id, bp.paymentrule,
@@ -114,9 +118,11 @@
         and o.ad_org_id = org.ad_org_id
         and o.c_doctype_id = dt.c_doctype_id
         and o.c_bpartner_id = bp.c_bpartner_id
+        and o.em_obpos_islayaway = 'N'
+        and o.invoicerule = 'I'
         and o.em_obpos_app_cashup_id = ?
         and o.c_doctype_id in (org.em_obpos_c_doctype_id, org.em_obpos_c_doctyperet_id)
-        and not exists (select 1 from c_orderline ol2 where (ol2.qtyinvoiced <> 0 or (ol2.qtyordered = 0 and ol2.em_obpos_isdeleted = 'N') or ol2.qtydelivered <> ol2.qtyordered) and ol2.c_order_id = o.c_order_id)
+        and not exists (select 1 from c_orderline ol2 where (ol2.qtyinvoiced <> 0 or (ol2.qtyordered = 0 and ol2.em_obpos_isdeleted = 'N')) and ol2.c_order_id = o.c_order_id)
         and o.em_obpos_notinvoiceoncashup = 'N'
         group by  o.ad_client_id, o.ad_org_id, o.ad_orgtrx_id, dt.c_doctypeinvoice_id, dt.c_doctypeinvoice_id,
         o.c_bpartner_id, coalesce(o.billto_id, o.c_bpartner_location_id), o.c_currency_id, bp.paymentrule,
@@ -164,7 +170,8 @@
         and o.ad_org_id = org.ad_org_id
         and 1=1
         and o.em_obpos_app_cashup_id = ?
-        and ol.qtydelivered = ol.qtyordered
+        and o.em_obpos_islayaway = 'N'
+        and o.invoicerule = 'I'
         and (ol.qtyordered <> 0 and ol.em_obpos_isdeleted = 'N')
         and o.c_doctype_id in (org.em_obpos_c_doctype_id, org.em_obpos_c_doctyperet_id)
         and not exists (select 1 from c_orderline ol2 where ol2.qtyinvoiced <> 0 and ol2.c_order_id = o.c_order_id)
@@ -215,7 +222,8 @@
         and o.ad_org_id = org.ad_org_id
         and o.c_doctype_id = dt.c_doctype_id
         and o.em_obpos_app_cashup_id = ?
-        and ol.qtydelivered = ol.qtyordered
+        and o.em_obpos_islayaway = 'N'
+        and o.invoicerule = 'I'
         and (ol.qtyordered <> 0 and ol.em_obpos_isdeleted = 'N')
         and o.c_doctype_id in (org.em_obpos_c_doctype_id, org.em_obpos_c_doctyperet_id)
         and not exists (select 1 from c_orderline ol2 where ol2.qtyinvoiced <> 0 and ol2.c_order_id = o.c_order_id)

Relationships [ Relation Graph ] [ Dependency Graph ]

Notes
(0112557) hgbot (developer) 2019-06-10 18:38	Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: 72e3b7f375ab78af5f2d092e1930ea2ee685cdfe Author: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> Date: Mon Jun 10 18:38:05 2019 +0200 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/72e3b7f375ab78af5f2d092e1930ea2ee685cdfe [^] Fixes issue 41059 Cashup Invoice is not working properly when having a ticket mixing pick and carry lines with lines of any other delivery mode --- M src/org/openbravo/retail/posterminal/OrderGroupingProcessor_data.xsql ---

Issue History
Date Modified	Username	Field	Change
2019-06-10 13:10	eduardo_Argal	New Issue
2019-06-10 13:10	eduardo_Argal	Assigned To	=> Retail
2019-06-10 13:10	eduardo_Argal	OBNetwork customer	=> No
2019-06-10 13:10	eduardo_Argal	Triggers an Emergency Pack	=> No
2019-06-10 13:12	eduardo_Argal	File Added: cashup.diff
2019-06-10 18:38	hgbot	Checkin
2019-06-10 18:38	hgbot	Note Added: 0112557
2019-06-10 18:38	hgbot	Status	new => resolved
2019-06-10 18:38	hgbot	Resolution	open => fixed
2019-06-10 18:38	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/72e3b7f375ab78af5f2d092e1930ea2ee685cdfe [^]
2019-06-13 14:41	shuehner	Assigned To	Retail => eduardo_Argal
2019-06-25 19:30	marvintm	Review Assigned To	=> marvintm
2019-06-25 19:30	marvintm	Status	resolved => closed
2019-06-25 19:30	marvintm	Fixed in Version	=> RR19Q3