details: https://code.openbravo.com/erp/devel/pi/rev/7ad03320bc04 changeset: 34175:7ad03320bc04 user: Nono Carballo <nonofce <at> gmail.com> date: Mon Oct 10 15:03:19 2016 -0400 summary: Fixes issue 34097: The Add Payment button is visible in cases it should not be
Display logic of field "Add Payment" in "Sales Order" and "Purchase Order" windows has been updated. Also the auxiliary input "showAddPayment" has been defined for "Header" tab on "Sales Order" and "Purchase Order" windows. details: https://code.openbravo.com/erp/devel/pi/rev/07e8ea54f119 changeset: 34176:07e8ea54f119 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Jun 06 16:13:55 2018 +0200 summary: Related to Issue 34097. Added GrandTotal column to the Stored in Session values. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 4 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 38 ++++++++++ src-db/database/sourcedata/AD_COLUMN.xml | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) diffs (88 lines): diff -r 9cd5f090b379 -r 07e8ea54f119 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Wed Jun 06 17:46:08 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Wed Jun 06 16:13:55 2018 +0200 @@ -374,7 +374,7 @@ <!--04CFE3A53162449380A253DE0B814AEF--> <AD_COLUMN_ID><![CDATA[F8F6A13C5682DC4DE040007F01000363]]></AD_COLUMN_ID> <!--04CFE3A53162449380A253DE0B814AEF--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--04CFE3A53162449380A253DE0B814AEF--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--04CFE3A53162449380A253DE0B814AEF--> <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='')]]></DISPLAYLOGIC> +<!--04CFE3A53162449380A253DE0B814AEF--> <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='') & @GrandTotal@!0]]></DISPLAYLOGIC> <!--04CFE3A53162449380A253DE0B814AEF--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--04CFE3A53162449380A253DE0B814AEF--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--04CFE3A53162449380A253DE0B814AEF--> <SEQNO><![CDATA[335]]></SEQNO> @@ -21974,7 +21974,7 @@ <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <AD_COLUMN_ID><![CDATA[F8F6A13C5682DC4DE040007F01000363]]></AD_COLUMN_ID> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='')]]></DISPLAYLOGIC> +<!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='') & @GrandTotal@!0]]></DISPLAYLOGIC> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--F4A594CF81DA4C0DB3A81BBFF0305C12--> <SEQNO><![CDATA[415]]></SEQNO> diff -r 9cd5f090b379 -r 07e8ea54f119 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Wed Jun 06 17:46:08 2018 +0200 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Wed Jun 06 16:13:55 2018 +0200 @@ -1538,6 +1538,25 @@ <!--34E27119A7B74205B025002E9CD5074F--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--34E27119A7B74205B025002E9CD5074F--></AD_AUXILIARINPUT> +<!--34E955EADE8843BD9A0342895CB8AAF0--><AD_AUXILIARINPUT> +<!--34E955EADE8843BD9A0342895CB8AAF0--> <AD_AUXILIARINPUT_ID><![CDATA[34E955EADE8843BD9A0342895CB8AAF0]]></AD_AUXILIARINPUT_ID> +<!--34E955EADE8843BD9A0342895CB8AAF0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--34E955EADE8843BD9A0342895CB8AAF0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--34E955EADE8843BD9A0342895CB8AAF0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--34E955EADE8843BD9A0342895CB8AAF0--> <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID> +<!--34E955EADE8843BD9A0342895CB8AAF0--> <NAME><![CDATA[showAddPayment]]></NAME> +<!--34E955EADE8843BD9A0342895CB8AAF0--> <CODE><![CDATA[@SQL=select case when sum(fpsd.amount)=co.GrandTotal then 'N' else 'Y' end + from fin_payment_scheduledetail fpsd + join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id + join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id + join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_order + join c_order co on co.c_order_id=ps.c_order_id + WHERE ps.c_order_id =@c_order_id@ + and to_number(aprm_seqnumberpaymentstatus(fp.status)) >= 40 + group by co.GrandTotal]]></CODE> +<!--34E955EADE8843BD9A0342895CB8AAF0--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--34E955EADE8843BD9A0342895CB8AAF0--></AD_AUXILIARINPUT> + <!--35586436B2FB4809B66D519BC02230F4--><AD_AUXILIARINPUT> <!--35586436B2FB4809B66D519BC02230F4--> <AD_AUXILIARINPUT_ID><![CDATA[35586436B2FB4809B66D519BC02230F4]]></AD_AUXILIARINPUT_ID> <!--35586436B2FB4809B66D519BC02230F4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -3371,6 +3390,25 @@ <!--A5153957017944A08E6A504455417843--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--A5153957017944A08E6A504455417843--></AD_AUXILIARINPUT> +<!--A53F5DC798974EBD9707C988B0C72D63--><AD_AUXILIARINPUT> +<!--A53F5DC798974EBD9707C988B0C72D63--> <AD_AUXILIARINPUT_ID><![CDATA[A53F5DC798974EBD9707C988B0C72D63]]></AD_AUXILIARINPUT_ID> +<!--A53F5DC798974EBD9707C988B0C72D63--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A53F5DC798974EBD9707C988B0C72D63--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A53F5DC798974EBD9707C988B0C72D63--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A53F5DC798974EBD9707C988B0C72D63--> <AD_TAB_ID><![CDATA[294]]></AD_TAB_ID> +<!--A53F5DC798974EBD9707C988B0C72D63--> <NAME><![CDATA[showAddPayment]]></NAME> +<!--A53F5DC798974EBD9707C988B0C72D63--> <CODE><![CDATA[@SQL=select case when sum(fpsd.amount)=co.GrandTotal then 'N' else 'Y' end + from fin_payment_scheduledetail fpsd + join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id + join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id + join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_order + join c_order co on co.c_order_id=ps.c_order_id + WHERE ps.c_order_id =@c_order_id@ + and to_number(aprm_seqnumberpaymentstatus(fp.status)) >= 40 + group by co.GrandTotal]]></CODE> +<!--A53F5DC798974EBD9707C988B0C72D63--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--A53F5DC798974EBD9707C988B0C72D63--></AD_AUXILIARINPUT> + <!--A6000327591C4D82A8F20A0311167B94--><AD_AUXILIARINPUT> <!--A6000327591C4D82A8F20A0311167B94--> <AD_AUXILIARINPUT_ID><![CDATA[A6000327591C4D82A8F20A0311167B94]]></AD_AUXILIARINPUT_ID> <!--A6000327591C4D82A8F20A0311167B94--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 9cd5f090b379 -r 07e8ea54f119 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Jun 06 17:46:08 2018 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Jun 06 16:13:55 2018 +0200 @@ -32989,7 +32989,7 @@ <!--2201--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--2201--> <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN> <!--2201--> <AD_ELEMENT_ID><![CDATA[316]]></AD_ELEMENT_ID> -<!--2201--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--2201--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> <!--2201--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--2201--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--2201--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> ------------------------------------------------------------------------------ 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 Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
