--- a/src-db/database/model/tables/M_OFFER.xml
+++ a/src-db/database/model/tables/M_OFFER.xml
@@ -121,6 +121,14 @@
+
+
+
+
+
+
+
+
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ a/src-db/database/sourcedata/AD_FIELD.xml
@@ -232382,6 +232382,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -310753,6 +310780,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ a/src-db/database/sourcedata/AD_COLUMN.xml
@@ -262165,6 +262165,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -368669,6 +368705,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -375086,7 +375158,7 @@
-
+
--- a/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml
+++ a/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml
@@ -27,6 +27,7 @@
* Contributor(s): ______________________________________.
************************************************************************/
v_date DATE;
+ v_created DATE;
v_partner VARCHAR2(32);
v_priceList VARCHAR2(32);
v_method VARCHAR(200);
@@ -48,9 +49,11 @@
BEGIN
if (p_type = 'O') then
select o.c_bpartner_id, o.m_priceList_id, o.dateordered,
- c.priceprecision, c.stdPrecision, pl.isTaxIncluded
- into v_partner, v_priceList, v_date,
- v_precision, v_stdPrecision, v_taxIncluded
+-- c.priceprecision, c.stdPrecision, pl.isTaxIncluded
+ c.priceprecision, c.stdPrecision, pl.isTaxIncluded, o.created
+ into v_partner, v_priceList, v_date,
+-- v_precision, v_stdPrecision, v_taxIncluded
+ v_precision, v_stdPrecision, v_taxIncluded, v_created
from C_Order o, c_currency c, m_priceList pl
where C_Order_ID = p_doc_id
and c.C_Currency_ID = o.C_Currency_ID
@@ -67,9 +70,11 @@
end if;
select o.c_bpartner_id, o.m_priceList_id, o.dateinvoiced,
- c.priceprecision, c.stdPrecision, pl.isTaxIncluded
+-- c.priceprecision, c.stdPrecision, pl.isTaxIncluded
+ c.priceprecision, c.stdPrecision, pl.isTaxIncluded, o.created
into v_partner, v_priceList, v_date,
- v_precision, v_stdPrecision, v_taxIncluded
+-- v_precision, v_stdPrecision, v_taxIncluded
+ v_precision, v_stdPrecision, v_taxIncluded, v_created
from C_Invoice o, c_currency c, m_priceList pl
where C_Invoice_ID = p_doc_id
and c.C_Currency_ID = o.C_Currency_ID
@@ -104,6 +109,8 @@
from m_offer
where isactive = 'Y'
and v_date between DateFrom and coalesce(DateTo, TO_DATE('31-12-9999', 'DD-MM-YYYY'))
+ and ( coalesce(start_time,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time <= coalesce(v_created,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time )
+ and ( coalesce(v_created,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time <= coalesce(finishes_time,to_timestamp('23:59:59.99', 'HH24-MM-SS.MS')::timestamp without time zone)::time )
and AD_Client_ID = Cur_Order.AD_Client_ID
and M_Offer_Type_ID = '5D4BAF6BB86D4D2C9ED3D5A6FC051579';
end if;
@@ -138,6 +145,8 @@
from m_offer
where isactive = 'Y'
and v_date between DateFrom and coalesce(DateTo, TO_DATE('31-12-9999', 'DD-MM-YYYY'))
+ and (coalesce(start_time,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time <= coalesce(v_created,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time )
+ and ( coalesce(v_created,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time <= coalesce(finishes_time,to_timestamp('23:59:59.99', 'HH24-MM-SS.MS')::timestamp without time zone)::time )
and AD_Client_ID = Cur_Order.AD_Client_ID
and M_Offer_Type_ID = '5D4BAF6BB86D4D2C9ED3D5A6FC051579';
end if;
@@ -209,6 +218,8 @@
(SELECT M_OFFER_ID, t.PL_Order_Implementor
FROM M_OFFER, M_Offer_Type t
WHERE v_date BETWEEN DATEFROM AND COALESCE(DATETO, TO_DATE('31-12-9999', 'DD-MM-YYYY'))
+ and (coalesce(start_time,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time <= coalesce(v_created,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time )
+ and ( coalesce(v_created,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time <= coalesce(finishes_time,to_timestamp('23:59:59.99', 'HH24-MM-SS.MS')::timestamp without time zone)::time )
AND M_OFFER.AD_Client_ID = Cur_Order.AD_Client_ID
AND M_OFFER.IsActive = 'Y'
AND t.M_Offer_Type_ID = M_Offer.M_Offer_Type_ID
--- a/modules/org.openbravo.retail.posterminal/web/org.openbravo.retail.posterminal/js/model/executor.js
+++ b/modules/org.openbravo.retail.posterminal/web/org.openbravo.retail.posterminal/js/model/executor.js
@@ -193,6 +193,21 @@
},
createActions: function (evt) {
+ var dateordered = new Date(evt.get('receipt').get('orderDate')).toISOString();
+ var created ="";
+ var qryHours = "";
+ try {
+ var hourIni = dateordered.indexOf("T");
+ var hourEnd = dateordered.indexOf("Z");
+ if ((hourIni>0) && (hourEnd>0)) {
+ created = dateordered.substring(hourIni+1,hourIni+9);
+ qryHours = " AND ( strftime('%s',coalesce(start_time, '00:00:00' )) <= strftime('%s',coalesce('"+created+"','00:00:00' )) ";
+ qryHours += " AND strftime('%s',coalesce('"+created+"','00:00:00')) <= strftime('%s',coalesce(finishes_time,'23:59:59.99' )) ) ";
+ }
+ }
+ catch (ex) {
+ qryHours = ""
+ }
var line = evt.get('line'),
receipt = evt.get('receipt'),
bpId = receipt.get('bp').id,
@@ -201,6 +216,7 @@
me = this,
criteria, t0 = new Date().getTime(),
whereClause = OB.Model.Discounts.computeStandardFilter(receipt) //
+ + qryHours
+ " AND M_OFFER_TYPE_ID NOT IN (" + OB.Model.Discounts.getManualPromotions() + ")" //
+ " AND ((EM_OBDISC_ROLE_SELECTION = 'Y' AND NOT EXISTS (SELECT 1 FROM OBDISC_OFFER_ROLE WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID " + " AND AD_ROLE_ID = '" + OB.MobileApp.model.get('context').role.id + "')) OR (EM_OBDISC_ROLE_SELECTION = 'N' " //
+ " AND EXISTS (SELECT 1 FROM OBDISC_OFFER_ROLE WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID " //