details: https://code.openbravo.com/erp/devel/pi/rev/79b0d2a02b4f changeset: 13907:79b0d2a02b4f user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Sep 16 13:05:55 2011 +0200 summary: Backout changeset a775ba12f12c (formatting only) as preparation of more backouts
details: https://code.openbravo.com/erp/devel/pi/rev/912178a2e9d8 changeset: 13908:912178a2e9d8 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Sep 16 13:07:10 2011 +0200 summary: Partial backout of cset 354aa0b865ad. details: https://code.openbravo.com/erp/devel/pi/rev/99501c6c3f26 changeset: 13909:99501c6c3f26 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Sep 16 13:12:31 2011 +0200 summary: Partial backout of cset f5c1f04bb7ac (part1) details: https://code.openbravo.com/erp/devel/pi/rev/1bb9b92ae229 changeset: 13910:1bb9b92ae229 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Sep 16 13:30:07 2011 +0200 summary: Partial backout of cset f5c1f04bb7ac (part2) details: https://code.openbravo.com/erp/devel/pi/rev/38ac082e328d changeset: 13911:38ac082e328d user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Sep 22 15:00:12 2011 +0200 summary: Fixes issue 0018519, 18441 details: https://code.openbravo.com/erp/devel/pi/rev/3093237e1219 changeset: 13912:3093237e1219 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Sep 22 18:13:24 2011 +0200 summary: Fixes consistency try: Build #486 details: https://code.openbravo.com/erp/devel/pi/rev/f9d44f213f7b changeset: 13913:f9d44f213f7b user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon Sep 26 18:48:37 2011 +0200 summary: Fixes issue 0018618 details: https://code.openbravo.com/erp/devel/pi/rev/7af9fb66a907 changeset: 13914:7af9fb66a907 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Fri Sep 30 10:09:32 2011 +0200 summary: Merge pi-eduardo to pi details: https://code.openbravo.com/erp/devel/pi/rev/bd7abb657185 changeset: 13915:bd7abb657185 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Fri Sep 30 13:28:49 2011 +0200 summary: Merge with tip of pi (rev id:804dae13b1c7) diffstat: .hgignore | 1 + .hgsigs | 3 + .hgtags | 3 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 16 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html | 244 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 59 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml | 8 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html | 231 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 66 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml | 8 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ImportBankFile.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 32 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 48 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 16 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml | 13 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 19 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml | 11 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_MENU_PARAMETERS.xml | 25 + modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml | 10 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 2 + modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl | 3 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 17 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 8 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 14 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js | 17 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-onchange-registry.js | 98 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 238 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 55 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 33 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quickrun-widget.js | 11 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 193 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js | 34 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js | 83 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js | 44 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 30 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 20 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/personalization/iconSelectedView.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css | 13 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 2 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.css | 2 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.css | 42 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js | 13 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tab-styles.css | 1 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java | 4 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java | 12 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TextUIDefinition.java | 2 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/widgetinform/WidgetInFormUIDefinition.java | 8 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 10 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 70 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 7 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js | 12 + modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 799 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 2 + referencedata/sampledata/F_B_International_Group.xml | 713 +- referencedata/sampledata/QA_Testing.xml | 34545 +++++++++- src-db/database/model/excludeFilter.xml | 4 - src-db/database/model/functions/AD_DELETE_CLIENT.xml | 218 - src-db/database/model/functions/AD_DELETE_CLIENT0.xml | 33 - src-db/database/model/functions/C_GETTAX.xml | 17 +- src-db/database/model/postscript-Oracle.sql | 163 - src-db/database/model/postscript-PostgreSql.sql | 161 - src-db/database/model/tables/AD_FIELD.xml | 4 + src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml | 42 + src-db/database/model/triggers/AD_FIELD_MOD_TRG.xml | 1 + src-db/database/model/triggers/FIN_FINACC_TRANSACTION_TRG.xml | 78 + src-db/database/model/triggers/FIN_PAYMENT_TRG.xml | 81 + src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml | 2 +- src-db/database/sourcedata/AD_COLUMN.xml | 438 +- src-db/database/sourcedata/AD_ELEMENT.xml | 12 + src-db/database/sourcedata/AD_FIELD.xml | 373 + src-db/database/sourcedata/AD_FORM.xml | 12 - src-db/database/sourcedata/AD_MENU.xml | 13 - src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 - src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 - src-db/database/sourcedata/AD_TREENODE.xml | 11 - src-db/database/sourcedata/AD_VAL_RULE.xml | 2 +- src-wad/src/org/openbravo/wad/ProcessRelation_data.xsql | 3 - src/org/openbravo/authentication/AuthenticationManager.java | 242 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 13 +- src/org/openbravo/base/secureApp/LoginUtils.java | 3 + src/org/openbravo/dal/xml/BaseXMLEntityConverter.java | 5 +- src/org/openbravo/dal/xml/EntityResolver.java | 33 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 26 +- src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod.java | 76 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 630 +- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 12 + src/org/openbravo/erpCommon/ad_forms/DocFINBankStatement.java | 1 + src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 323 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 231 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 233 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 279 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql | 39 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINFinAccTransaction.java | 45 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINReconciliation.java | 15 +- src/org/openbravo/erpCommon/ad_forms/Fact.java | 137 +- src/org/openbravo/erpCommon/ad_forms/FactLine.java | 143 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 2 +- src/org/openbravo/erpCommon/ad_process/DeleteClient_data.xsql | 37 - src/org/openbravo/erpCommon/ad_process/PaymentMonitor.java | 69 +- src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 5 + src/org/openbravo/erpCommon/utility/Register.java | 91 - src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.html | 5 +- src/org/openbravo/service/system/SystemService.java | 4 +- 123 files changed, 39986 insertions(+), 2519 deletions(-) diffs (truncated from 47973 to 300 lines): diff -r a9a6faa73a9f -r bd7abb657185 .hgignore --- a/.hgignore Thu Sep 15 18:00:18 2011 +0200 +++ b/.hgignore Fri Sep 30 13:28:49 2011 +0200 @@ -38,6 +38,7 @@ *.bak *.swp + Thumbs.db sources diff -r a9a6faa73a9f -r bd7abb657185 .hgsigs --- a/.hgsigs Thu Sep 15 18:00:18 2011 +0200 +++ b/.hgsigs Fri Sep 30 13:28:49 2011 +0200 @@ -38,3 +38,6 @@ e1095f432296d2d007a16592ce903c611e32a8ca 0 iEYEABECAAYFAk4fNVoACgkQCX/oGf+2qkM/vACeMJuEyh0KlU/iUOd+GOJu+23MMasAni7f8YASwyBpy8Rhq6hseH9jl+QP 298c364b00dfafd8d14f39e4c46582666b63b792 0 iEYEABECAAYFAk5FBE8ACgkQCX/oGf+2qkMLLwCg5owJffX+FRvdAhcx5lu98a+bczMAoOrxERXMnWJcjrPiRsHe9uK2rbEB 73cf94540eee261735546af235c022b6629c60b4 0 iEYEABECAAYFAk5km6QACgkQCX/oGf+2qkMg+QCfSxJaCXo3RB98Em77DE2wTgMdIrsAn3lvr6yVFui+ZIn81ELLNg6+hjTY +de6ba33247c6a6fe40c8091880ca88371e62f9e5 0 iEYEABECAAYFAk5uEmIACgkQCX/oGf+2qkMqYwCeOiBUc3Bbsscvh17YA3xEium84OsAoNuBTpQKw5uNm0oE7YgIYfxislr9 +1337fbe9577f700323ed7dca2830832d4c767c24 0 iEYEABECAAYFAk58b5AACgkQCX/oGf+2qkOhuwCfcZb9pTthMp2BXE6xcKVquD27R7MAnidzwSvbx4rJK2XvWht0B35hELV4 +36fbd0e92534c9261754d500e9ef0d1a45744b59 0 iEYEABECAAYFAk6B2kgACgkQCX/oGf+2qkPXrwCghp9G3HStth7Hc4vevflmiJsaL/sAoLKnTFUyu4ZX8mlLusps5zAiWNjT diff -r a9a6faa73a9f -r bd7abb657185 .hgtags --- a/.hgtags Thu Sep 15 18:00:18 2011 +0200 +++ b/.hgtags Fri Sep 30 13:28:49 2011 +0200 @@ -49,3 +49,6 @@ c7557e3684a44b84a633889ad597e689715bc57f 3.0MP1 e303b38f24e9a12a4b8fdf0b2408055a2ab040d7 3.0MP2 7ab6e81dcecb181d85885103d32f2f6ccac8b0a1 3.0MP2.1 +d08117cade69fcc9ac91619661a6b5071db6af16 3.0MP2.2 +74d95de540d0f428ab9c53303fa45ac6c192885c 3.0MP2.3 +c7a189353e46e28e320809a2e8aaaaac8c6f67e2 3.0MP3 diff -r a9a6faa73a9f -r bd7abb657185 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Thu Sep 15 18:00:18 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Fri Sep 30 13:28:49 2011 +0200 @@ -56,6 +56,7 @@ v_reversalinvoice_id VARCHAR2(32); v_delete_paymentplan BOOLEAN := FALSE; v_Financial_Account_ID FIN_FINANCIAL_ACCOUNT.FIN_FINANCIAL_ACCOUNT_ID%TYPE; +v_Financial_Account_Org VARCHAR2(32); v_CreatePayment CHAR(1):='N'; v_CreateFinTransaction CHAR(1):='N'; v_PaymentDocType_ID FIN_PAYMENT.C_DOCTYPE_ID%TYPE; @@ -532,11 +533,16 @@ WHERE C_BPARTNER_ID = v_BPartner_ID; -- Automatic creation of payment and financial transaction - SELECT CASE WHEN v_IsSOTrx='Y' THEN FIN_FINANCIAL_ACCOUNT_ID ELSE PO_FINANCIAL_ACCOUNT_ID END - INTO v_Financial_Account_ID - FROM C_BPARTNER - WHERE C_BPARTNER_ID = v_BPartner_ID; - IF(v_Financial_Account_ID IS NOT NULL) THEN + SELECT CASE WHEN v_IsSOTrx='Y' THEN c_bpartner.FIN_FINANCIAL_ACCOUNT_ID ELSE C_BPARTNER.PO_FINANCIAL_ACCOUNT_ID END, + CASE WHEN v_IsSOTrx='Y' THEN facustomer.ad_org_id ELSE favendor.ad_org_id END + INTO v_Financial_Account_ID, v_Financial_Account_Org + FROM c_bpartner LEFT JOIN FIN_FINANCIAL_ACCOUNT facustomer ON (c_bpartner.fin_financial_account_id = facustomer.fin_financial_account_id) + LEFT JOIN FIN_FINANCIAL_ACCOUNT favendor ON (c_bpartner.po_financial_account_id = favendor.fin_financial_account_id) + WHERE c_bpartner.c_bpartner_id = v_BPartner_ID; + + -- Organization of the financial account must be in the natural organization tree of the invoice org. + IF (v_Financial_Account_ID IS NOT NULL AND + (AD_ISORGINCLUDED(v_Financial_Account_Org, v_Org_ID, v_Client_ID) <> -1 OR AD_ISORGINCLUDED(v_Org_ID, v_Financial_Account_Org, v_Client_ID) <> -1)) THEN SELECT MIN(em_aprm_payment_desc) INTO v_payment_desc FROM ad_orginfo WHERE ad_org_id = v_Org_ID diff -r a9a6faa73a9f -r bd7abb657185 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Thu Sep 15 18:00:18 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Fri Sep 30 13:28:49 2011 +0200 @@ -5061,7 +5061,7 @@ <!--830694907A3F8D5BE040007F01000893--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--830694907A3F8D5BE040007F01000893--> <AD_TAB_ID><![CDATA[170]]></AD_TAB_ID> <!--830694907A3F8D5BE040007F01000893--> <AD_COLUMN_ID><![CDATA[828EE0AE803F5FA1E040007F010067C7]]></AD_COLUMN_ID> -<!--830694907A3F8D5BE040007F01000893--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--830694907A3F8D5BE040007F01000893--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> <!--830694907A3F8D5BE040007F01000893--> <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH> <!--830694907A3F8D5BE040007F01000893--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--830694907A3F8D5BE040007F01000893--> <SEQNO><![CDATA[80]]></SEQNO> diff -r a9a6faa73a9f -r bd7abb657185 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Sep 15 18:00:18 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Sep 30 13:28:49 2011 +0200 @@ -2409,6 +2409,28 @@ <!--AC02A8EF9F4F4FF6A8011C70A0F8553C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--AC02A8EF9F4F4FF6A8011C70A0F8553C--></AD_TEXTINTERFACES> +<!--AD4B47A653568779E040007F010055A7--><AD_TEXTINTERFACES> +<!--AD4B47A653568779E040007F010055A7--> <AD_TEXTINTERFACES_ID><![CDATA[AD4B47A653568779E040007F010055A7]]></AD_TEXTINTERFACES_ID> +<!--AD4B47A653568779E040007F010055A7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--AD4B47A653568779E040007F010055A7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--AD4B47A653568779E040007F010055A7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--AD4B47A653568779E040007F010055A7--> <TEXT><![CDATA[Accounting Dimensions]]></TEXT> +<!--AD4B47A653568779E040007F010055A7--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--AD4B47A653568779E040007F010055A7--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--AD4B47A653568779E040007F010055A7--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--AD4B47A653568779E040007F010055A7--></AD_TEXTINTERFACES> + +<!--AD4B47A653588779E040007F010055A7--><AD_TEXTINTERFACES> +<!--AD4B47A653588779E040007F010055A7--> <AD_TEXTINTERFACES_ID><![CDATA[AD4B47A653588779E040007F010055A7]]></AD_TEXTINTERFACES_ID> +<!--AD4B47A653588779E040007F010055A7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--AD4B47A653588779E040007F010055A7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--AD4B47A653588779E040007F010055A7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--AD4B47A653588779E040007F010055A7--> <TEXT><![CDATA[Accounting Dimensions]]></TEXT> +<!--AD4B47A653588779E040007F010055A7--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> +<!--AD4B47A653588779E040007F010055A7--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--AD4B47A653588779E040007F010055A7--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--AD4B47A653588779E040007F010055A7--></AD_TEXTINTERFACES> + <!--AF139B1C12C0477AB902B9DF23D53779--><AD_TEXTINTERFACES> <!--AF139B1C12C0477AB902B9DF23D53779--> <AD_TEXTINTERFACES_ID><![CDATA[AF139B1C12C0477AB902B9DF23D53779]]></AD_TEXTINTERFACES_ID> <!--AF139B1C12C0477AB902B9DF23D53779--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r a9a6faa73a9f -r bd7abb657185 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 Thu Sep 15 18:00:18 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Fri Sep 30 13:28:49 2011 +0200 @@ -109,14 +109,14 @@ OB.APRM.AOOI_ddt !== document.getElementById('paramDueDateTo').value || OB.APRM.AOOI_cu !== document.getElementById('paramCurrencyId').value) { - OB.APRM.AOOI_bp = document.getElementById('C_BPartner_ID').value; + OB.APRM.AOOI_bp = document.getElementById('C_BPartner_ID').value; OB.APRM.AOOI_dt = document.getElementById('paramDocumentType').value; OB.APRM.AOOI_pm = document.getElementById('paramAlternativePaymentMethod').checked; OB.APRM.AOOI_ddf = document.getElementById('paramDueDateFrom').value; OB.APRM.AOOI_ddt = document.getElementById('paramDueDateTo').value; OB.APRM.AOOI_cu = document.getElementById('paramCurrencyId').value; - try { + try { var url = '../org.openbravo.advpaymentmngt.ad_actionbutton/AddOrderOrInvoice.html'; var paramXMLReq = null; return submitXmlHttpRequest(callBackGrid, document.frmMain, 'GRIDLIST', url, false, null, paramXMLReq); @@ -131,42 +131,71 @@ var table = document.getElementById('sectionGLItemGrid'), glitemCount = OB.APRM.APFT_GLItems.length, glitemAmount = 0, - rowCount, row, cellGLItemDesc, cellGLITemReceivedInAmt, cellGLITemPaidOutAmt, cellRemoveButton, i, textNode; + glitemDescLength = 20, glitemDescCont = "...", + cellCount, row, cellGLItemDesc, cellGLITemReceivedInAmt, cellGLITemPaidOutAmt, cellRemoveButton, i, textNode, glAcctDimsDesc, acctDim, cellGLItemDim; table.innerHTML = ''; if (glitemCount === 0) { OB.APRM.HasGLItems = false; + frm.inpGLSumAmount.value = '0'; + updateTotal(); return; } OB.APRM.HasGLItems = true; for (i = 0; i < glitemCount; i++) { - rowCount = table.rows.length; - row = table.insertRow(rowCount); + row = table.insertRow(table.rows.length); row.className = 'DataGrid_Body_Row DataGrid_Body_Row_'+i%2; + cellCount = 0; - cellGLItemDesc = row.insertCell(0); + cellGLItemDesc = row.insertCell(cellCount); textNode = document.createTextNode(OB.APRM.APFT_GLItems[i].glitemDesc); cellGLItemDesc.appendChild(textNode); cellGLItemDesc.className = 'DataGrid_Body_Cell'; + cellCount++; - cellGLITemReceivedInAmt = row.insertCell(1); + // Accounting Dimensions + glAcctDimsDesc = ["cBpartnerDimDesc", "cActivityDimDesc", "mProductDimDesc", "cCampaignDimDesc", "cProjectDimDesc", "cSalesregionDimDesc"]; + for (acctDim = 0; acctDim < glAcctDimsDesc.length; acctDim++) { + if (OB.APRM.APFT_GLItems[i][glAcctDimsDesc[acctDim]]) { + cellGLItemDim = row.insertCell(cellCount); + if (OB.APRM.APFT_GLItems[i][glAcctDimsDesc[acctDim]].length > glitemDescLength + glitemDescCont.length) { + textNode = document.createTextNode(OB.APRM.APFT_GLItems[i][glAcctDimsDesc[acctDim]].slice(0, glitemDescLength) + glitemDescCont); + } else { + textNode = document.createTextNode(OB.APRM.APFT_GLItems[i][glAcctDimsDesc[acctDim]]); + } + cellGLItemDim.appendChild(textNode); + cellGLItemDim.className = 'DataGrid_Body_Cell'; + cellCount++; + } else if (OB.APRM.APFT_GLItems[i][glAcctDimsDesc[acctDim].replace("Desc", "Displayed")]) { + // The Acct. Dimen is displayed and the user has left it empty + cellGLItemDim = row.insertCell(cellCount); + textNode = document.createTextNode(""); + cellGLItemDim.appendChild(textNode); + cellGLItemDim.className = 'DataGrid_Body_Cell'; + cellCount++; + } + } + + cellGLITemReceivedInAmt = row.insertCell(cellCount); textNode = document.createTextNode(applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemReceivedInAmt)); cellGLITemReceivedInAmt.appendChild(textNode); cellGLITemReceivedInAmt.className = 'DataGrid_Body_Cell_Amount'; + cellCount++; - cellGLITemPaidOutAmt = row.insertCell(2); + cellGLITemPaidOutAmt = row.insertCell(cellCount); textNode = document.createTextNode(applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemPaidOutAmt)); cellGLITemPaidOutAmt.appendChild(textNode); cellGLITemPaidOutAmt.className = 'DataGrid_Body_Cell_Amount'; + cellCount++; 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 = row.insertCell(cellCount); cellRemoveButton.innerHTML = '<div><button type="button" id="buttonRemoveGLItem"' - + ' class="ButtonLink_focus" onclick="removeGLItem(' + i + ', ' + glitemAmount + ');return false;"' + + ' class="ButtonLink_focus" onclick="removeGLItem(' + i + ', ' + applyFormatOBMaskedToJS(glitemAmount) + ');return false;"' + ' onfocus="buttonEvent(\'onfocus\', this); window.status=\'OK\'; return true;"' + ' onblur="buttonEvent(\'onblur\', this);"' + ' onkeyup="buttonEvent(\'onkeyup\', this);"' @@ -224,6 +253,24 @@ id: OB.APRM.APFT_GLItemsId, glitemId: frm.inpcGlitemId.value, glitemDesc: sc_C_Glitem_ID.selectorField.getDisplayValue(), + cBpartnerDim: frm.inpCBPartnerId_dim && frm.inpCBPartnerId_dim.value, + cBpartnerDimDesc: sc_C_BPartner_ID_dim.selectorField.getDisplayValue(), + cBpartnerDimDisplayed: frm.strElement_BP.value, + cActivityDim: frm.inpCActivityId && frm.inpCActivityId.value, + cActivityDimDesc: sc_C_Activity_ID.selectorField.getDisplayValue(), + cActivityDimDisplayed: frm.strElement_AY.value, + mProductDim: frm.inpMProductId && frm.inpMProductId.value, + mProductDimDesc: sc_M_Product_ID.selectorField.getDisplayValue(), + mProductDimDisplayed: frm.strElement_PR.value, + cCampaignDim: frm.inpCampaignId && frm.inpCampaignId.value, + cCampaignDimDesc: sc_C_Campaign_ID.selectorField.getDisplayValue(), + cCampaignDimDisplayed: frm.strElement_MC.value, + cProjectDim: frm.inpCProjectId && frm.inpCProjectId.value, + cProjectDimDesc: sc_C_Project_ID.selectorField.getDisplayValue(), + cProjectDimDisplayed: frm.strElement_PJ.value, + cSalesregionDim: frm.inpCSalesRegionId && frm.inpCSalesRegionId.value, + cSalesregionDimDesc: sc_C_SalesRegion_ID.selectorField.getDisplayValue(), + cSalesregionDimDisplayed: frm.strElement_SR.value, glitemReceivedInAmt: OB.Utilities.Number.OBMaskedToJS(frm.inpGLItemReceivedInAmount.value, getGlobalDecSeparator(), getGlobalGroupSeparator()), @@ -234,6 +281,7 @@ loadGLItemList(); } function removeGLItem(key, removedAmount) { + var removedAmount = applyFormatJSToOBMasked(removedAmount); if (!isTrue('isReceipt')){ if ( compare(document.frmMain.inpActualPayment.value, '>', removedAmount) ) { document.frmMain.inpActualPayment.value = subtract(document.frmMain.inpActualPayment.value, removedAmount); @@ -253,8 +301,8 @@ updateConvertedAmounts(); } function displayMulticurrencyControls() { - var invCurrency = document.getElementById('paramCurrencyId').value - var accountCurrency = document.getElementById('paramFinancialAccountCurrencyId').value + var invCurrency = document.getElementById('paramCurrencyId').value; + var accountCurrency = document.getElementById('paramFinancialAccountCurrencyId').value; var display = ( invCurrency && accountCurrency && invCurrency != accountCurrency ); @@ -360,6 +408,7 @@ } else { displayLogicElement('bpartnerfilterRow', !hasBPartner); } + autoDisplayLogicDimensions(toGLItem); resizeAreaCreateFrom(); if (toGLItem) { @@ -367,6 +416,59 @@ } return true; } +function autoDisplayLogicDimensions(isDisplayed) { + var displayLogicDimension = function (dimension, isDisplayed) { + displayLogicElement(dimension + '_dim_label', isDisplayed); + displayLogicElement(dimension + '_dim_inp', isDisplayed); + displayLogicElement(dimension + '_th', isDisplayed) + } + var displayTitle = false; + if (document.frmMain.strElement_BP.value === 'Y' && isDisplayed) { + displayLogicDimension('c_bpartner_id', true); + displayTitle = true; + } else { + displayLogicDimension('c_bpartner_id', false); + } + if (document.frmMain.strElement_AY.value === 'Y' && isDisplayed) { + displayLogicDimension('c_activity_id', true); + displayTitle = true; + } else { + displayLogicDimension('c_activity_id', false); + } + + if (document.frmMain.strElement_PR.value === 'Y' && isDisplayed) { + displayLogicDimension('m_product_id', true); + displayTitle = true; + } else { + displayLogicDimension('m_product_id', false); + } + if (document.frmMain.strElement_MC.value === 'Y' && isDisplayed) { + displayLogicDimension('c_campaign_id', true); + displayTitle = true; + } else { + displayLogicDimension('c_campaign_id', false); + } + + if (document.frmMain.strElement_PJ.value === 'Y' && isDisplayed) { + displayLogicDimension('c_project_id', true); + displayTitle = true; ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2dcopy2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
