0036076: to able to apply a discount by hours ("time from" and "time to")

--- a/src-db/database/model/tables/M_OFFER.xml +++ a/src-db/database/model/tables/M_OFFER.xml @@ -121,6 +121,14 @@ <default><![CDATA[Y]]></default> <onCreateDefault><![CDATA['Y']]></onCreateDefault> </column> + <column name="START_TIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="FINISHES_TIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="M_OFFER_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <data> <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[100]]></AD_COLUMN_ID> @@ -262165,6 +262165,42 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[41A04F8D547446C4B576553F7E2923C2]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Finishes_Time]]></NAME> + <COLUMNNAME><![CDATA[Finishes_Time]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[24]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[440]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[571984A637328AA9E040007F01011B27]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[48]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> + <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> + <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> + <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> + <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> + <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[41F88DE1D95E4BDB8EEEEE8C78EA72AA]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -368669,6 +368705,42 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[DB0C61A62C834860A266DB8D4ED1C51E]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Start_Time]]></NAME> + <COLUMNNAME><![CDATA[Start_Time]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[24]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[430]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[571984A637378AA9E040007F01011B27]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[47]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> + <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> + <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> + <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> + <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> + <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[DB141BB0EEE7482CB93C3B53A9DEF96C]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -375086,7 +375158,7 @@  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> - <POSITION><![CDATA[43]]></POSITION> + <POSITION><![CDATA[30]]></POSITION>  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <data> <AD_FIELD>  <AD_FIELD_ID><![CDATA[100]]></AD_FIELD_ID> @@ -232382,6 +232382,33 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> +<AD_FIELD> + <AD_FIELD_ID><![CDATA[6EEE68410C664A3C9B707B721A8779F4]]></AD_FIELD_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Start Time]]></NAME> + <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> + <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> + <AD_COLUMN_ID><![CDATA[DB0C61A62C834860A266DB8D4ED1C51E]]></AD_COLUMN_ID> + <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> + <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> + <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> + <ISREADONLY><![CDATA[N]]></ISREADONLY> + <SEQNO><![CDATA[72]]></SEQNO> + <ISSAMELINE><![CDATA[N]]></ISSAMELINE> + <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> + <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <GRID_SEQNO><![CDATA[72]]></GRID_SEQNO> + <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> + <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> + <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> + <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +</AD_FIELD> + <AD_FIELD>  <AD_FIELD_ID><![CDATA[6F00EDF18AAB411DB92CAA824DA5153D]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -310753,6 +310780,33 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> +<AD_FIELD> + <AD_FIELD_ID><![CDATA[F65DF8ED04CF4883A7307FABD1213AF0]]></AD_FIELD_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Finish Time]]></NAME> + <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> + <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> + <AD_COLUMN_ID><![CDATA[41A04F8D547446C4B576553F7E2923C2]]></AD_COLUMN_ID> + <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> + <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> + <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> + <ISREADONLY><![CDATA[N]]></ISREADONLY> + <SEQNO><![CDATA[74]]></SEQNO> + <ISSAMELINE><![CDATA[N]]></ISSAMELINE> + <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> + <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <GRID_SEQNO><![CDATA[74]]></GRID_SEQNO> + <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> + <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> + <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> + <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +</AD_FIELD> + <AD_FIELD>  <AD_FIELD_ID><![CDATA[F665B3375D394ACD841413C3DF3AF5FD]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> --- a/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml +++ a/src-db/database/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,9 @@ BEGIN if (p_type = 'O') then select o.c_bpartner_id, o.m_priceList_id, o.dateordered, - 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 +68,9 @@ 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, 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_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 +105,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(created,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time ) + and ( coalesce(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 +141,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(created,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time ) + and ( coalesce(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 +214,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(created,to_timestamp('00:00:00', 'HH24-MM-SS.MS')::timestamp without time zone)::time ) + and ( coalesce(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/src-db/database/model/tables/M_OFFER.xml +++ a/src-db/database/model/tables/M_OFFER.xml @@ -121,6 +121,14 @@ <default><![CDATA[Y]]></default> <onCreateDefault><![CDATA['Y']]></onCreateDefault> </column> + <column name="START_TIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="FINISHES_TIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="M_OFFER_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> --- a/src-db/database/sourcedata/AD_FIELD.xml +++ a/src-db/database/sourcedata/AD_FIELD.xml @@ -232382,6 +232382,33 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> +<AD_FIELD> + <AD_FIELD_ID><![CDATA[6EEE68410C664A3C9B707B721A8779F4]]></AD_FIELD_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Start Time]]></NAME> + <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> + <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> + <AD_COLUMN_ID><![CDATA[DB0C61A62C834860A266DB8D4ED1C51E]]></AD_COLUMN_ID> + <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> + <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> + <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> + <ISREADONLY><![CDATA[N]]></ISREADONLY> + <SEQNO><![CDATA[72]]></SEQNO> + <ISSAMELINE><![CDATA[N]]></ISSAMELINE> + <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> + <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <GRID_SEQNO><![CDATA[72]]></GRID_SEQNO> + <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> + <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> + <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> + <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +</AD_FIELD> + <AD_FIELD>  <AD_FIELD_ID><![CDATA[6F00EDF18AAB411DB92CAA824DA5153D]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -310753,6 +310780,33 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> +<AD_FIELD> + <AD_FIELD_ID><![CDATA[F65DF8ED04CF4883A7307FABD1213AF0]]></AD_FIELD_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Finish Time]]></NAME> + <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> + <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> + <AD_COLUMN_ID><![CDATA[41A04F8D547446C4B576553F7E2923C2]]></AD_COLUMN_ID> + <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> + <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> + <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH> + <ISREADONLY><![CDATA[N]]></ISREADONLY> + <SEQNO><![CDATA[74]]></SEQNO> + <ISSAMELINE><![CDATA[N]]></ISSAMELINE> + <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> + <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <GRID_SEQNO><![CDATA[74]]></GRID_SEQNO> + <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> + <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> + <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> + <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +</AD_FIELD> + <AD_FIELD>  <AD_FIELD_ID><![CDATA[F665B3375D394ACD841413C3DF3AF5FD]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ a/src-db/database/sourcedata/AD_COLUMN.xml @@ -262165,6 +262165,42 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[41A04F8D547446C4B576553F7E2923C2]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Finishes_Time]]></NAME> + <COLUMNNAME><![CDATA[Finishes_Time]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[24]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[440]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[571984A637328AA9E040007F01011B27]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[48]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> + <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> + <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> + <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> + <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> + <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[41F88DE1D95E4BDB8EEEEE8C78EA72AA]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -368669,6 +368705,42 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[DB0C61A62C834860A266DB8D4ED1C51E]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Start_Time]]></NAME> + <COLUMNNAME><![CDATA[Start_Time]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[24]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[430]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[571984A637378AA9E040007F01011B27]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> + <POSITION><![CDATA[47]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> + <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> + <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> + <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> + <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> + <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[DB141BB0EEE7482CB93C3B53A9DEF96C]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -375086,7 +375158,7 @@  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> - <POSITION><![CDATA[43]]></POSITION> + <POSITION><![CDATA[30]]></POSITION>  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> --- 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 " //

Issue History
Date Modified	Username	Field	Change
2017-05-23 17:51	malsasua	New Issue
2017-05-23 17:51	malsasua	Assigned To	=> Retail
2017-05-23 17:51	malsasua	OBNetwork customer	=> Yes
2017-05-23 17:51	malsasua	Support ticket	=> 46896
2017-05-23 17:51	malsasua	Triggers an Emergency Pack	=> No
2017-05-23 17:52	malsasua	Description Updated	View Revisions
2017-05-23 17:53	malsasua	File Added: disc_core.diff
2017-05-23 17:53	malsasua	File Added: disc_webpos.diff
2017-05-23 18:07	heccam	Issue Monitored: heccam
2017-09-14 09:44	malsasua	File Added: disc_core1.diff
2017-09-14 09:45	malsasua	Note Added: 0099028

Notes
(0099028) malsasua (viewer) 2017-09-14 09:45	Attached a new version of patch

Relationships [ Relation Graph ] [ Dependency Graph ]