details: https://code.openbravo.com/erp/devel/pi/rev/811a6d9a310e changeset: 22053:811a6d9a310e user: Atul Gaware <atul.gaware <at> openbravo.com> date: Tue Feb 18 18:18:17 2014 +0530 summary: Fixes Issue 25247 Org as acct dimension in adding trxns selecting g/l item
diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml | 12 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 46 +++++ modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html | 83 ++++++--- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java | 19 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.xml | 5 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 13 + src-db/database/sourcedata/AD_COLUMN.xml | 6 +- src-db/database/sourcedata/AD_FIELD.xml | 6 +- 10 files changed, 169 insertions(+), 41 deletions(-) diffs (truncated from 466 to 300 lines): diff -r 2356d30e0be7 -r 811a6d9a310e modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml Thu Feb 13 23:12:42 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml Tue Feb 18 18:18:17 2014 +0530 @@ -30,8 +30,7 @@ END IF; IF (UPDATING) THEN - IF(:OLD.PROCESSED='Y' AND ((COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0')) - OR(COALESCE(:OLD.C_CURRENCY_ID, '0') <> COALESCE(:NEW.C_CURRENCY_ID, '0')) + IF(:OLD.PROCESSED='Y' AND ((COALESCE(:OLD.C_CURRENCY_ID, '0') <> COALESCE(:NEW.C_CURRENCY_ID, '0')) OR(COALESCE(:OLD.FIN_FINANCIAL_ACCOUNT_ID, '0') <> COALESCE(:NEW.FIN_FINANCIAL_ACCOUNT_ID, '0')) OR(COALESCE(:OLD.LINE, 0) <> COALESCE(:NEW.LINE, 0)) OR(COALESCE(:OLD.FIN_PAYMENT_ID, '0') <> COALESCE(:NEW.FIN_PAYMENT_ID, '0')) @@ -42,6 +41,7 @@ RAISE_APPLICATION_ERROR(-20000, '@20501@'); END IF; IF((COALESCE(:OLD.DATEACCT, v_DateNull) <> COALESCE(:NEW.DATEACCT, v_DateNull)) + OR(COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0')) OR(COALESCE(:OLD.C_PROJECT_ID, '0') <> COALESCE(:NEW.C_PROJECT_ID, '0')) OR(COALESCE(:OLD.C_GLITEM_ID, '0') <> COALESCE(:NEW.C_GLITEM_ID, '0')) OR(COALESCE(:OLD.C_CAMPAIGN_ID, '0') <> COALESCE(:NEW.C_CAMPAIGN_ID, '0')) diff -r 2356d30e0be7 -r 811a6d9a310e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml Thu Feb 13 23:12:42 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml Tue Feb 18 18:18:17 2014 +0530 @@ -12,6 +12,18 @@ <!--0CC268ED2E8D4B0397A0DCBBFA2237DE--> <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> <!--0CC268ED2E8D4B0397A0DCBBFA2237DE--></AD_REFERENCE> +<!--1221BEA5C19F4FA89D3565CA8877A82E--><AD_REFERENCE> +<!--1221BEA5C19F4FA89D3565CA8877A82E--> <AD_REFERENCE_ID><![CDATA[1221BEA5C19F4FA89D3565CA8877A82E]]></AD_REFERENCE_ID> +<!--1221BEA5C19F4FA89D3565CA8877A82E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1221BEA5C19F4FA89D3565CA8877A82E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1221BEA5C19F4FA89D3565CA8877A82E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1221BEA5C19F4FA89D3565CA8877A82E--> <NAME><![CDATA[Organization Selector]]></NAME> +<!--1221BEA5C19F4FA89D3565CA8877A82E--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--1221BEA5C19F4FA89D3565CA8877A82E--> <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE> +<!--1221BEA5C19F4FA89D3565CA8877A82E--> <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID> +<!--1221BEA5C19F4FA89D3565CA8877A82E--> <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> +<!--1221BEA5C19F4FA89D3565CA8877A82E--></AD_REFERENCE> + <!--15CCD38B5F534E03BB3C344BCD1FBB1E--><AD_REFERENCE> <!--15CCD38B5F534E03BB3C344BCD1FBB1E--> <AD_REFERENCE_ID><![CDATA[15CCD38B5F534E03BB3C344BCD1FBB1E]]></AD_REFERENCE_ID> <!--15CCD38B5F534E03BB3C344BCD1FBB1E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 2356d30e0be7 -r 811a6d9a310e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Thu Feb 13 23:12:42 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Tue Feb 18 18:18:17 2014 +0530 @@ -69,6 +69,22 @@ <!--A98899B1C75A4F4EBD3414F1B654EFAB--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> <!--A98899B1C75A4F4EBD3414F1B654EFAB--></OBUISEL_SELECTOR> +<!--B15DC1DA631A402C9B05AC11A2EA724C--><OBUISEL_SELECTOR> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <OBUISEL_SELECTOR_ID><![CDATA[B15DC1DA631A402C9B05AC11A2EA724C]]></OBUISEL_SELECTOR_ID> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <NAME><![CDATA[Organization]]></NAME> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <AD_REFERENCE_ID><![CDATA[1221BEA5C19F4FA89D3565CA8877A82E]]></AD_REFERENCE_ID> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <WHERECLAUSE><![CDATA[AD_ISORGINCLUDED(e.id, @inpadOrgId@,e.client.id)<>-1]]></WHERECLAUSE> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE> +<!--B15DC1DA631A402C9B05AC11A2EA724C--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> +<!--B15DC1DA631A402C9B05AC11A2EA724C--></OBUISEL_SELECTOR> + <!--FF808181312D569C01312D8C1EC40036--><OBUISEL_SELECTOR> <!--FF808181312D569C01312D8C1EC40036--> <OBUISEL_SELECTOR_ID><![CDATA[FF808181312D569C01312D8C1EC40036]]></OBUISEL_SELECTOR_ID> <!--FF808181312D569C01312D8C1EC40036--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 2356d30e0be7 -r 811a6d9a310e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Thu Feb 13 23:12:42 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Tue Feb 18 18:18:17 2014 +0530 @@ -46,6 +46,28 @@ <!--17843AC2A9E247E1A6DAD8041DFDB07A--> <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST> <!--17843AC2A9E247E1A6DAD8041DFDB07A--></OBUISEL_SELECTOR_FIELD> +<!--198C982111AA4CF5ABF5E651ECD611FA--><OBUISEL_SELECTOR_FIELD> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <OBUISEL_SELECTOR_FIELD_ID><![CDATA[198C982111AA4CF5ABF5E651ECD611FA]]></OBUISEL_SELECTOR_FIELD_ID> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <OBUISEL_SELECTOR_ID><![CDATA[B15DC1DA631A402C9B05AC11A2EA724C]]></OBUISEL_SELECTOR_ID> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <AD_COLUMN_ID><![CDATA[522]]></AD_COLUMN_ID> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <NAME><![CDATA[Name]]></NAME> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <HELP><![CDATA[A more descriptive identifier (that does need to be unique) of a record/document that is used as a default search option along with the search key (that is unique and mostly shorter). It is up to 60 characters in length.]]></HELP> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <PROPERTY><![CDATA[name]]></PROPERTY> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <SORT><![CDATA[Y]]></SORT> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <FILTER><![CDATA[Y]]></FILTER> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <SHOWINGRID><![CDATA[Y]]></SHOWINGRID> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <SORTNO><![CDATA[1]]></SORTNO> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD> +<!--198C982111AA4CF5ABF5E651ECD611FA--> <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST> +<!--198C982111AA4CF5ABF5E651ECD611FA--></OBUISEL_SELECTOR_FIELD> + <!--334D0D40EF224D5CA5B9AA56124FEE25--><OBUISEL_SELECTOR_FIELD> <!--334D0D40EF224D5CA5B9AA56124FEE25--> <OBUISEL_SELECTOR_FIELD_ID><![CDATA[334D0D40EF224D5CA5B9AA56124FEE25]]></OBUISEL_SELECTOR_FIELD_ID> <!--334D0D40EF224D5CA5B9AA56124FEE25--> <OBUISEL_SELECTOR_ID><![CDATA[A98899B1C75A4F4EBD3414F1B654EFAB]]></OBUISEL_SELECTOR_ID> @@ -287,6 +309,30 @@ <!--C5CFD3978631444EB97539BCEE3D5239--> <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST> <!--C5CFD3978631444EB97539BCEE3D5239--></OBUISEL_SELECTOR_FIELD> +<!--F229E4FBC3DB4BA6AA295C19E0798785--><OBUISEL_SELECTOR_FIELD> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <OBUISEL_SELECTOR_FIELD_ID><![CDATA[F229E4FBC3DB4BA6AA295C19E0798785]]></OBUISEL_SELECTOR_FIELD_ID> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <OBUISEL_SELECTOR_ID><![CDATA[B15DC1DA631A402C9B05AC11A2EA724C]]></OBUISEL_SELECTOR_ID> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <AD_COLUMN_ID><![CDATA[2045]]></AD_COLUMN_ID> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <NAME><![CDATA[Search Key]]></NAME> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order). + +Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <PROPERTY><![CDATA[searchKey]]></PROPERTY> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <SORT><![CDATA[Y]]></SORT> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <FILTER><![CDATA[Y]]></FILTER> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <SHOWINGRID><![CDATA[Y]]></SHOWINGRID> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <SORTNO><![CDATA[2]]></SORTNO> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD> +<!--F229E4FBC3DB4BA6AA295C19E0798785--> <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST> +<!--F229E4FBC3DB4BA6AA295C19E0798785--></OBUISEL_SELECTOR_FIELD> + <!--FF808181312DEEAE01312DFAFE910022--><OBUISEL_SELECTOR_FIELD> <!--FF808181312DEEAE01312DFAFE910022--> <OBUISEL_SELECTOR_FIELD_ID><![CDATA[FF808181312DEEAE01312DFAFE910022]]></OBUISEL_SELECTOR_FIELD_ID> <!--FF808181312DEEAE01312DFAFE910022--> <OBUISEL_SELECTOR_ID><![CDATA[FF808181312DA8D801312DDE869B000C]]></OBUISEL_SELECTOR_ID> diff -r 2356d30e0be7 -r 811a6d9a310e modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html Thu Feb 13 23:12:42 2014 +0530 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html Tue Feb 18 18:18:17 2014 +0530 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2013 Openbravo SLU + * All portions are Copyright (C) 2013-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -90,7 +90,11 @@ } } } else if (opt == 'GL') { - if (frm.inpGLItemId.value==null || frm.inpGLItemId.value=="") { + if (frm.inpadOrgTrxId.value===null || frm.inpadOrgTrxId.value==="") { + setWindowElementFocus(frm.inpadOrgTrxId); + showJSMessage(7); + return false; + } else if (frm.inpGLItemId.value==null || frm.inpGLItemId.value=="") { setWindowElementFocus(frm.inpGLItemId); showJSMessage(7); return false; @@ -182,6 +186,12 @@ function autoDisplayLogicDimensions(isDisplayed) { var displayTitle = false; + if (document.frmMain.strElement_OT.value === 'Y' && isDisplayed) { + displayLogicDimension('ad_orgtrx_id', true); + displayTitle = true; + } else { + displayLogicDimension('ad_orgtrx_id', false); + } if (document.frmMain.strElement_BP.value === 'Y' && isDisplayed) { displayLogicDimension('c_bpartner_id', true); displayTitle = true; @@ -392,6 +402,7 @@ function onResizeDo(){ resizeAreaCreateFrom(true); + showHideLayers(); } </script> </head> @@ -406,6 +417,7 @@ <input type="hidden" name="inpFinBankStatementLineId" value="" id="fieldFinBankStatementLineId"></input> <input type="hidden" name="buttonRefresh" value="" id="buttonRefresh" onclick="loadGrid();return true;"></input> <input type="hidden" name="isReceipt" value="dummyField" id="fieldReceipt"/> + <input type="hidden" name="strElement_OT" id="paramStrElement_OT" value=""/> <input type="hidden" name="strElement_BP" id="paramStrElement_BP" value=""/> <input type="hidden" name="strElement_PR" id="paramStrElement_PR" value=""/> <input type="hidden" name="strElement_PJ" id="paramStrElement_PJ" value=""/> @@ -922,9 +934,22 @@ </td> </tr> <tr id="GLItemSection1_Dim"> + <!-- Organization Dimension --> + <td id="ad_orgtrx_id_dim_label" class="TitleCell"><span class="LabelText">Organization</span></td> + <td id="ad_orgtrx_id_dim_inp" class="TextBox_ContentCell" colspan="2"> + <table style="border:0px;border-collapse:collapse;"> + <tr> + <td style="padding-top: 0px;"> + <script>var sc_AD_OrgTrx_ID = null;</script> + <input type="hidden" name="inpadOrgTrxId" identifier="" id="AD_Org_ID" value="" onreset="sc_AD_OrgTrx_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_AD_OrgTrx_ID.selectorField);"></input> + <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/B15DC1DA631A402C9B05AC11A2EA724C?columnName=AD_Org_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=true"></script> + </td> + </tr> + </table> + </td> <!-- Business Partner Dimension --> <td id="c_bpartner_id_dim_label" class="TitleCell"><span class="LabelText">Business Partner</span></td> - <td id="c_bpartner_id_dim_inp" class="TextBox_ContentCell" colspan="2"> + <td id="c_bpartner_id_dim_inp" class="TextBox_ContentCell" colspan="1"> <table style="border:0px;border-collapse:collapse;"> <tr> <td style="padding-top: 0px;"> @@ -935,9 +960,12 @@ </tr> </table> </td> + <td class="TitleCell"></td> + </tr> + <tr id="GLItemSection2_Dim"> <!-- Product Dimension --> <td id="m_product_id_dim_label" class="TitleCell"><span class="LabelText">Product</span></td> - <td id="m_product_id_dim_inp" class="TextBox_ContentCell" colspan="1"> + <td id="m_product_id_dim_inp" class="TextBox_ContentCell" colspan="2"> <table style="border:0px;border-collapse:collapse;"> <tr> <td style="padding-top: 0px;"> @@ -947,13 +975,10 @@ </td> </tr> </table> - </td> - <td class="TitleCell"></td> - </tr> - <tr id="GLItemSection2_Dim"> + </td> <!-- Project Dimension --> <td id="c_project_id_dim_label" class="TitleCell"><span class="LabelText">Project</span></td> - <td id="c_project_id_dim_inp" class="TextBox_ContentCell" colspan="2"> + <td id="c_project_id_dim_inp" class="TextBox_ContentCell" colspan="1"> <table style="border:0px;border-collapse:collapse;"> <tr> <td style="padding-top: 0px;"> @@ -964,9 +989,12 @@ </tr> </table> </td> - <!-- Cost center --> + <td class="TitleCell"></td> + </tr> + <tr id="GLItemSection3_Dim"> + <!-- Cost center --> <td id="c_costcenter_id_dim_label" class="TitleCell"><span class="LabelText">Cost Center</span></td> - <td id="c_costcenter_id_dim_inp" class="TextBox_ContentCell" colspan="1"> + <td id="c_costcenter_id_dim_inp" class="TextBox_ContentCell" colspan="2"> <table style="border:0px;border-collapse:collapse;"> <tr> <td style="padding-top: 0px;"> @@ -977,12 +1005,9 @@ </tr> </table> </td> - <td class="TitleCell"></td> - </tr> - <tr id="GLItemSection3_Dim"> <!-- Campaign Dimension --> <td id="c_campaign_id_dim_label" class="TitleCell"><span class="LabelText">Campaign</span></td> - <td id="c_campaign_id_dim_inp" class="TextBox_ContentCell" colspan="2"> + <td id="c_campaign_id_dim_inp" class="TextBox_ContentCell" colspan="1"> <table style="border:0px;border-collapse:collapse;"> <tr> <td style="padding-top: 0px;"> @@ -993,19 +1018,6 @@ </tr> </table> </td> - <!-- Activity Dimension --> - <td id="c_activity_id_dim_label" class="TitleCell"><span class="LabelText">Activity</span></td> - <td id="c_activity_id_dim_inp" class="TextBox_ContentCell" colspan="1"> - <table style="border:0px;border-collapse:collapse;"> - <tr> - <td style="padding-top: 0px;"> - <script>var sc_C_Activity_ID = null;</script> - <input type="hidden" name="inpCActivityId" id="C_Activity_ID" value="" onreset="sc_C_Activity_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_Activity_ID.selectorField);"></input> - <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/FF808181312D569C01312D8C1EC40036?columnName=C_Activity_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=false"></script> - </td> - </tr> - </table> - </td> <td class="TitleCell"></td> </tr> <tr id="GLItemSection4_Dim"> @@ -1038,9 +1050,22 @@ <td class="TitleCell"></td> </tr> <tr id="GLItemSection5_Dim"> + <!-- Activity Dimension --> + <td id="c_activity_id_dim_label" class="TitleCell"><span class="LabelText">Activity</span></td> + <td id="c_activity_id_dim_inp" class="TextBox_ContentCell" colspan="2"> + <table style="border:0px;border-collapse:collapse;"> + <tr> + <td style="padding-top: 0px;"> + <script>var sc_C_Activity_ID = null;</script> ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits