details: https://code.openbravo.com/erp/devel/pi/rev/24c312ba2766 changeset: 13265:24c312ba2766 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Jul 26 11:40:27 2011 +0200 summary: Related to issue 17894.Modified FIN_Utilities.js to manage mix of GL Items and invoices.
details: https://code.openbravo.com/erp/devel/pi/rev/e251f7b1d594 changeset: 13266:e251f7b1d594 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Jul 26 11:42:56 2011 +0200 summary: Related to issue 17894.Added ability to mix gl items and invoices on payment in/out windows. details: https://code.openbravo.com/erp/devel/pi/rev/bc4bd502bc4d changeset: 13267:bc4bd502bc4d user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Jul 26 12:30:41 2011 +0200 summary: Fixed issue 17894.Added ability to mix gl items and invoices on Add Payment From Transaction. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 132 ++- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html | 458 +++++---- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 136 +-- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html | 404 +++++++- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 42 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 56 +- 6 files changed, 819 insertions(+), 409 deletions(-) diffs (truncated from 1772 to 300 lines): diff -r 48422fb8bbf4 -r bc4bd502bc4d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Jul 26 12:05:33 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Jul 26 12:30:41 2011 +0200 @@ -2200,17 +2200,6 @@ <!--A16D40CBB17E473799C90DD16E9EC7F0--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--A16D40CBB17E473799C90DD16E9EC7F0--></AD_TEXTINTERFACES> -<!--A2C53159E26643FCBC39501FD7AF2A23--><AD_TEXTINTERFACES> -<!--A2C53159E26643FCBC39501FD7AF2A23--> <AD_TEXTINTERFACES_ID><![CDATA[A2C53159E26643FCBC39501FD7AF2A23]]></AD_TEXTINTERFACES_ID> -<!--A2C53159E26643FCBC39501FD7AF2A23--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--A2C53159E26643FCBC39501FD7AF2A23--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--A2C53159E26643FCBC39501FD7AF2A23--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--A2C53159E26643FCBC39501FD7AF2A23--> <TEXT><![CDATA[Select additional purchase invoices or purchase orders that you want to add to this payment out]]></TEXT> -<!--A2C53159E26643FCBC39501FD7AF2A23--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> -<!--A2C53159E26643FCBC39501FD7AF2A23--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--A2C53159E26643FCBC39501FD7AF2A23--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--A2C53159E26643FCBC39501FD7AF2A23--></AD_TEXTINTERFACES> - <!--A2E3CEC67D004E7C9BADAB2FD4719E8F--><AD_TEXTINTERFACES> <!--A2E3CEC67D004E7C9BADAB2FD4719E8F--> <AD_TEXTINTERFACES_ID><![CDATA[A2E3CEC67D004E7C9BADAB2FD4719E8F]]></AD_TEXTINTERFACES_ID> <!--A2E3CEC67D004E7C9BADAB2FD4719E8F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2277,6 +2266,116 @@ <!--A8C9A7A0B28D4C94B22CD692E33136CC--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--A8C9A7A0B28D4C94B22CD692E33136CC--></AD_TEXTINTERFACES> +<!--A8F5EE29EF31BBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF31BBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF31BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF31BBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF31BBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF31BBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF31BBCAE040007F01002D53--> <TEXT><![CDATA[Select additional purchase invoices, purchase orders or gl items that you want to add to this payment out]]></TEXT> +<!--A8F5EE29EF31BBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--A8F5EE29EF31BBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF31BBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF31BBCAE040007F01002D53--></AD_TEXTINTERFACES> + +<!--A8F5EE29EF34BBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF34BBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF34BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF34BBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF34BBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF34BBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF34BBCAE040007F01002D53--> <TEXT><![CDATA[Select additional sales invoices, sales orders or gl items that you want to add to this payment in]]></TEXT> +<!--A8F5EE29EF34BBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--A8F5EE29EF34BBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF34BBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF34BBCAE040007F01002D53--></AD_TEXTINTERFACES> + +<!--A8F5EE29EF37BBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF37BBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF37BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF37BBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF37BBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF37BBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF37BBCAE040007F01002D53--> <TEXT><![CDATA[GL Items]]></TEXT> +<!--A8F5EE29EF37BBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--A8F5EE29EF37BBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF37BBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF37BBCAE040007F01002D53--></AD_TEXTINTERFACES> + +<!--A8F5EE29EF3ABBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF3ABBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF3ABBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF3ABBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF3ABBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF3ABBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF3ABBCAE040007F01002D53--> <TEXT><![CDATA[GL Item]]></TEXT> +<!--A8F5EE29EF3ABBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--A8F5EE29EF3ABBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF3ABBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF3ABBCAE040007F01002D53--></AD_TEXTINTERFACES> + +<!--A8F5EE29EF3DBBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF3DBBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF3DBBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF3DBBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF3DBBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF3DBBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF3DBBCAE040007F01002D53--> <TEXT><![CDATA[Received In]]></TEXT> +<!--A8F5EE29EF3DBBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--A8F5EE29EF3DBBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF3DBBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF3DBBCAE040007F01002D53--></AD_TEXTINTERFACES> + +<!--A8F5EE29EF40BBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF40BBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF40BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF40BBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF40BBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF40BBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF40BBCAE040007F01002D53--> <TEXT><![CDATA[Paid Out]]></TEXT> +<!--A8F5EE29EF40BBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--A8F5EE29EF40BBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF40BBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF40BBCAE040007F01002D53--></AD_TEXTINTERFACES> + +<!--A8F5EE29EF43BBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF43BBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF43BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF43BBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF43BBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF43BBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF43BBCAE040007F01002D53--> <TEXT><![CDATA[Amount on Invoices and/or Orders]]></TEXT> +<!--A8F5EE29EF43BBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--A8F5EE29EF43BBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF43BBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF43BBCAE040007F01002D53--></AD_TEXTINTERFACES> + +<!--A8F5EE29EF46BBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF46BBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF46BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF46BBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF46BBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF46BBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF46BBCAE040007F01002D53--> <TEXT><![CDATA[Amount on GL Items]]></TEXT> +<!--A8F5EE29EF46BBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--A8F5EE29EF46BBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF46BBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF46BBCAE040007F01002D53--></AD_TEXTINTERFACES> + +<!--A8F5EE29EF49BBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF49BBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF49BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF49BBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF49BBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF49BBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF49BBCAE040007F01002D53--> <TEXT><![CDATA[Amount on Invoices and/or Orders]]></TEXT> +<!--A8F5EE29EF49BBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> +<!--A8F5EE29EF49BBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF49BBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF49BBCAE040007F01002D53--></AD_TEXTINTERFACES> + +<!--A8F5EE29EF4CBBCAE040007F01002D53--><AD_TEXTINTERFACES> +<!--A8F5EE29EF4CBBCAE040007F01002D53--> <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF4CBBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID> +<!--A8F5EE29EF4CBBCAE040007F01002D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F5EE29EF4CBBCAE040007F01002D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F5EE29EF4CBBCAE040007F01002D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F5EE29EF4CBBCAE040007F01002D53--> <TEXT><![CDATA[Amount on GL Items]]></TEXT> +<!--A8F5EE29EF4CBBCAE040007F01002D53--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> +<!--A8F5EE29EF4CBBCAE040007F01002D53--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--A8F5EE29EF4CBBCAE040007F01002D53--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A8F5EE29EF4CBBCAE040007F01002D53--></AD_TEXTINTERFACES> + <!--AAE3622DC9124C86B629E0B30D580767--><AD_TEXTINTERFACES> <!--AAE3622DC9124C86B629E0B30D580767--> <AD_TEXTINTERFACES_ID><![CDATA[AAE3622DC9124C86B629E0B30D580767]]></AD_TEXTINTERFACES_ID> <!--AAE3622DC9124C86B629E0B30D580767--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2640,17 +2739,6 @@ <!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7--></AD_TEXTINTERFACES> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--><AD_TEXTINTERFACES> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--> <AD_TEXTINTERFACES_ID><![CDATA[D6E32F7A21F948C8AF9DFBA82A25FE2A]]></AD_TEXTINTERFACES_ID> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--> <TEXT><![CDATA[Select additional sales invoices or sales orders that you want to add to this payment in]]></TEXT> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--></AD_TEXTINTERFACES> - <!--D8B42F3BC554476C8FF5C79AE2445CED--><AD_TEXTINTERFACES> <!--D8B42F3BC554476C8FF5C79AE2445CED--> <AD_TEXTINTERFACES_ID><![CDATA[D8B42F3BC554476C8FF5C79AE2445CED]]></AD_TEXTINTERFACES_ID> <!--D8B42F3BC554476C8FF5C79AE2445CED--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 48422fb8bbf4 -r bc4bd502bc4d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Tue Jul 26 12:05:33 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Tue Jul 26 12:30:41 2011 +0200 @@ -51,6 +51,10 @@ window.onunload = reloadOpener; // reloads opener on closing </script> <script language="JavaScript" type="text/javascript"> + OB.APRM = OB.APRM || {}; + OB.APRM.APFT_GLItems = []; + OB.APRM.APFT_GLItemsId = 0; + OB.APRM.HasGLItems = false; var hasBPartner = null; </script> <script language="JavaScript" type="text/javascript"> @@ -104,84 +108,92 @@ alert(e); } } -function callBackGLItemGrid(paramXMLParticular, XMLHttpRequestObj) { - var strText = ''; - if (getReadyStateHandler(XMLHttpRequestObj)) { - try { - if (XMLHttpRequestObj.responseText) { - strText = XMLHttpRequestObj.responseText; - var aux = strText.substring(29, strText.length-8); - var tableBody = document.getElementById('sectionGLItemGrid'); - var browserName = getBrowserInfo('name'); - if (browserName.toUpperCase().indexOf('INTERNET EXPLORER') !== -1) { - var temp = document.createElement('span'); - temp.id = 'temp'; - temp.style.display = 'none'; - var newRows = '<table><tbody id=\"sectionGLItemGrid\">'+ aux; - temp.innerHTML = newRows; - tableBody.parentNode.replaceChild(temp.firstChild.firstChild, tableBody); - temp.parentNode.removeChild(temp); - } - tableBody.innerHTML = aux; - - updateGLItemTotal(); - } else { - document.getElementById('sectionGLItemGrid').innerHTML = ''; - } - } catch (e) { +</script> +<script language="JavaScript" type="text/javascript"> +function loadGLItemList() { + var table = document.getElementById('sectionGLItemGrid'), + glitemCount = OB.APRM.APFT_GLItems.length, + glitemAmount = 0, + rowCount, row, cellGLItemDesc, cellGLITemReceivedInAmt, cellGLITemPaidOutAmt, cellRemoveButton, i, textNode; + + table.innerHTML = ''; + if (glitemCount === 0) { + OB.APRM.HasGLItems = false; + return; + } + OB.APRM.HasGLItems = true; + for (i = 0; i < glitemCount; i++) { + rowCount = table.rows.length; + row = table.insertRow(rowCount); + row.className = 'DataGrid_Body_Row DataGrid_Body_Row_'+i%2; + + cellGLItemDesc = row.insertCell(0); + textNode = document.createTextNode(OB.APRM.APFT_GLItems[i].glitemDesc); + cellGLItemDesc.appendChild(textNode); + cellGLItemDesc.className = 'DataGrid_Body_Cell'; + + cellGLITemReceivedInAmt = row.insertCell(1); + textNode = document.createTextNode(applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemReceivedInAmt)); + cellGLITemReceivedInAmt.appendChild(textNode); + cellGLITemReceivedInAmt.className = 'DataGrid_Body_Cell_Amount'; + + cellGLITemPaidOutAmt = row.insertCell(2); + textNode = document.createTextNode(applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemPaidOutAmt)); + cellGLITemPaidOutAmt.appendChild(textNode); + cellGLITemPaidOutAmt.className = 'DataGrid_Body_Cell_Amount'; + + if (isTrue('isReceipt')) { + glitemAmount = subtract(applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemReceivedInAmt), applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemPaidOutAmt)); + } else { + glitemAmount = subtract(applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemPaidOutAmt), applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemReceivedInAmt)); } + cellRemoveButton = row.insertCell(3); + cellRemoveButton.innerHTML = '<div><button type="button" id="buttonRemoveGLItem"' + + ' class="ButtonLink_focus" onclick="removeGLItem(' + i + ', ' + glitemAmount + ');return false;"' + + ' onfocus="buttonEvent(\'onfocus\', this); window.status=\'OK\'; return true;"' + + ' onblur="buttonEvent(\'onblur\', this);"' + + ' onkeyup="buttonEvent(\'onkeyup\', this);"' + + ' onkeydown="buttonEvent(\'onkeydown\', this);"' + + ' onkeypress="buttonEvent(\'onkeypress\', this);"' + + ' onmouseup="buttonEvent(\'onmouseup\', this);"' + + ' onmousedown="buttonEvent(\'onmousedown\', this);"' + + ' onmouseover="buttonEvent(\'onmouseover\', this); window.status=\'OK\'; return true;"' + + ' onmouseout="buttonEvent(\'onmouseout\', this);">' + + ' <table class="Button"><tr><td>' + + ' <img alt="Remove" title="Remove" src="../web/org.openbravo.advpaymentmngt/images/GLItemGridCancel-xButt.png" id="imgButtonRemove" border="0"/></td>' + + ' </tr></table></button></div>'; } - return true; -} -function loadGLItemList() { - try { - var url = '../org.openbravo.advpaymentmngt.ad_actionbutton/AddOrderOrInvoice.html'; - var paramXMLReq = null; - return submitXmlHttpRequest(callBackGLItemGrid, document.frmMain, 'GLITEMGRIDLIST', url, false, null, paramXMLReq); - } catch (e) { - alert(e); - } -} -function callBackGLItem(paramXMLParticular, XMLHttpRequestObj) { - var strText = ''; - if (getReadyStateHandler(XMLHttpRequestObj)) { - try { - if (XMLHttpRequestObj.responseText) { - strText = XMLHttpRequestObj.responseText; - if (strText !== '' && strText !== '\r\n') { - setValues_MessageBox('messageBoxID', 'WARNING', '', strText); - } else { - initialize_MessageBox('messageBoxID'); - } - if (paramXMLParticular !== null) { - closePage(); - return true; - } - loadGLItemList(); - } else { - initialize_MessageBox('messageBoxID'); - } - } catch (e) { - } - } - return true; + updateTotal(); } function addGLItem() { - if (frm.inpGLItemAmount.value === null || frm.inpGLItemAmount.value === '') { - setWindowElementFocus(frm.inpGLItemAmount); + var amount = 0, glamount = 0, expectedAmt = 0; + if (frm.inpGLItemReceivedInAmount.value === null || frm.inpGLItemReceivedInAmount.value === '') { + setWindowElementFocus(frm.inpGLItemReceivedInAmount); + showJSMessage(7); + return false; + } else if (frm.inpGLItemPaidOutAmount.value === null || frm.inpGLItemPaidOutAmount.value === '') { + setWindowElementFocus(frm.inpGLItemPaidOutAmount); ------------------------------------------------------------------------------ Magic Quadrant for Content-Aware Data Loss Prevention Research study explores the data loss prevention market. Includes in-depth analysis on the changes within the DLP market, and the criteria used to evaluate the strengths and weaknesses of these DLP solutions. http://www.accelacomm.com/jaw/sfnl/114/51385063/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
