0027660: Give the possibility to not invoice an order on cashup

diff --git a/src-db/database/model/modifiedTables/C_ORDER.xml b/src-db/database/model/modifiedTables/C_ORDER.xml --- a/src-db/database/model/modifiedTables/C_ORDER.xml +++ b/src-db/database/model/modifiedTables/C_ORDER.xml @@ -21,6 +21,10 @@ <default/> <onCreateDefault/> </column> + <column name="EM_OBPOS_NOTINVOICEONCASHUP" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> <foreign-key foreignTable="OBPOS_APPLICATIONS" name="EM_OBPOS_APP_ID"> <reference local="EM_OBPOS_APPLICATIONS_ID" foreign="OBPOS_APPLICATIONS_ID"/> </foreign-key> diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -4936,6 +4936,41 @@  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[AE12B7BEB2AA47A3BE1163F106EE15AE]]></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[EM_OBPOS_NotInvoiceOnCashUp]]></NAME> + <DESCRIPTION><![CDATA[Check to not invoice the ticket on the cash up process]]></DESCRIPTION> + <HELP><![CDATA[Check to not invoice the ticket on the cash up process]]></HELP> + <COLUMNNAME><![CDATA[EM_OBPOS_NotInvoiceOnCashUp]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> + <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[720]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[556BDBE9BE7A4B44A18C7587D5B88FE0]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> + <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> + <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[AE5EE92CC3A84488B956C01CCBF37127]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -400,6 +400,20 @@  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> </AD_ELEMENT> +<AD_ELEMENT> + <AD_ELEMENT_ID><![CDATA[556BDBE9BE7A4B44A18C7587D5B88FE0]]></AD_ELEMENT_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <COLUMNNAME><![CDATA[EM_OBPOS_NotInvoiceOnCashUp]]></COLUMNNAME> + <NAME><![CDATA[Not invoice on cash up]]></NAME> + <PRINTNAME><![CDATA[Not invoice on cash up]]></PRINTNAME> + <DESCRIPTION><![CDATA[Check to not invoice the ticket on the cash up process]]></DESCRIPTION> + <HELP><![CDATA[Check to not invoice the ticket on the cash up process]]></HELP> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +</AD_ELEMENT> + <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[568B0F1D11AC4E2D807DD3F84B00D1F4]]></AD_ELEMENT_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java b/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java --- a/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java +++ b/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java @@ -68,6 +68,7 @@ + "', '" + posTerminal.getObposTerminaltype().getDocumentTypeForReturns().getId() + "') and not exists (select 1 from OrderLine as ord where invoicedQuantity<>0 and ord.salesOrder = line.salesOrder)" + + " and line.salesOrder.oBPOSNotInvoiceOnCashUp = false" + " order by line.businessPartner.id, line.salesOrder.id"; OBQuery<OrderLine> query = OBDal.getInstance().createQuery(OrderLine.class, hqlWhereClause);

diff --git a/src-db/database/model/modifiedTables/C_ORDER.xml b/src-db/database/model/modifiedTables/C_ORDER.xml --- a/src-db/database/model/modifiedTables/C_ORDER.xml +++ b/src-db/database/model/modifiedTables/C_ORDER.xml @@ -21,6 +21,10 @@ <default/> <onCreateDefault/> </column> + <column name="EM_OBPOS_NOTINVOICEONCASHUP" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[N]]></default> + <onCreateDefault/> + </column> <foreign-key foreignTable="OBPOS_APPLICATIONS" name="EM_OBPOS_APP_ID"> <reference local="EM_OBPOS_APPLICATIONS_ID" foreign="OBPOS_APPLICATIONS_ID"/> </foreign-key> diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -5827,6 +5827,41 @@  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[AE12B7BEB2AA47A3BE1163F106EE15AE]]></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[EM_OBPOS_NotInvoiceOnCashUp]]></NAME> + <DESCRIPTION><![CDATA[Check to not invoice the ticket on the cash up process]]></DESCRIPTION> + <HELP><![CDATA[Check to not invoice the ticket on the cash up process]]></HELP> + <COLUMNNAME><![CDATA[EM_OBPOS_NotInvoiceOnCashUp]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> + <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[720]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[556BDBE9BE7A4B44A18C7587D5B88FE0]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> + <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> + <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[AE5EE92CC3A84488B956C01CCBF37127]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -497,6 +497,20 @@  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> </AD_ELEMENT> +<AD_ELEMENT> + <AD_ELEMENT_ID><![CDATA[556BDBE9BE7A4B44A18C7587D5B88FE0]]></AD_ELEMENT_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <COLUMNNAME><![CDATA[EM_OBPOS_NotInvoiceOnCashUp]]></COLUMNNAME> + <NAME><![CDATA[Not invoice on cash up]]></NAME> + <PRINTNAME><![CDATA[Not invoice on cash up]]></PRINTNAME> + <DESCRIPTION><![CDATA[Check to not invoice the ticket on the cash up process]]></DESCRIPTION> + <HELP><![CDATA[Check to not invoice the ticket on the cash up process]]></HELP> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +</AD_ELEMENT> + <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[568B0F1D11AC4E2D807DD3F84B00D1F4]]></AD_ELEMENT_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java b/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java --- a/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java +++ b/src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java @@ -74,6 +74,7 @@ + "', '" + posTerminal.getObposTerminaltype().getDocumentTypeForReturns().getId() + "') and not exists (select 1 from OrderLine as ord where invoicedQuantity<>0 and ord.salesOrder = line.salesOrder)" + + " and line.salesOrder.oBPOSNotInvoiceOnCashUp = false" + " order by line.businessPartner.id, line.salesOrder.id"; OBQuery<OrderLine> query = OBDal.getInstance().createQuery(OrderLine.class, hqlWhereClause);

Issue History
Date Modified	Username	Field	Change
2014-09-23 12:45	guillermogil	New Issue
2014-09-23 12:45	guillermogil	Assigned To	=> guillermogil
2014-09-23 12:45	guillermogil	Triggers an Emergency Pack	=> No
2014-09-23 13:32	guillermogil	Description Updated	View Revisions
2014-09-23 14:47	guillermogil	File Added: notInvoiceOnCashUp.diff
2014-09-23 14:48	guillermogil	Issue Monitored: marvintm
2014-09-23 14:49	guillermogil	Note Added: 0070281
2014-09-23 14:49	guillermogil	Review Assigned To	=> marvintm
2014-10-27 15:04	guillermogil	Assigned To	guillermogil => marvintm
2015-01-08 13:19	guillermogil	File Added: notInvoiceOnCashUpPI.diff
2015-01-08 13:19	guillermogil	Note Added: 0073363
2015-01-08 16:36	guillermogil	Assigned To	marvintm => guillermogil
2015-01-09 14:36	hgbot	Checkin
2015-01-09 14:36	hgbot	Note Added: 0073399
2015-01-09 14:36	hgbot	Status	new => resolved
2015-01-09 14:36	hgbot	Resolution	open => fixed
2015-01-09 14:36	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/4bd9b08dd700c8e7bf423e9dd67524be57e15b2a [^]
2015-01-16 11:28	marvintm	Status	resolved => closed
2015-01-16 11:28	marvintm	Fixed in Version	=> RR15Q1
2015-01-30 10:36	mtaal	Fixed in Version	RR15Q1 => RR15Q2

Notes
(0070281) guillermogil (manager) 2014-09-23 14:49	You can find attached a diff with the proposed solution.

(0073363) guillermogil (manager) 2015-01-08 13:19	You can find attached a diff with the proposed solution for PI.

(0073399) hgbot (developer) 2015-01-09 14:36	Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: 4bd9b08dd700c8e7bf423e9dd67524be57e15b2a Author: Guillermo Gil <guillermo.gil <at> openbravo.com> Date: Thu Jan 08 17:03:24 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/4bd9b08dd700c8e7bf423e9dd67524be57e15b2a [^] Fixed issue 27660: Give the possibility to not invoice an order on cashup Added a new field on sales orderthat will raise a flag to not invoice that order on the cashup process --- M src-db/database/model/modifiedTables/C_ORDER.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_ELEMENT.xml M src/org/openbravo/retail/posterminal/OrderGroupingProcessor.java ---

Relationships [ Relation Graph ] [ Dependency Graph ]