details: https://code.openbravo.com/erp/devel/main/rev/c81309acacb2 changeset: 22837:c81309acacb2 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri Apr 25 12:17:26 2014 +0200 summary: Fixed bug 26387 Add payment button is shown when the purchase invoice is not completed
details: https://code.openbravo.com/erp/devel/main/rev/0f75c1447d7e changeset: 22838:0f75c1447d7e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Apr 28 11:37:37 2014 +0200 summary: fixed bug 26396: widgets not seen for fortal roles details: https://code.openbravo.com/erp/devel/main/rev/e74f1d4cca01 changeset: 22839:e74f1d4cca01 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Apr 30 13:20:21 2014 +0200 summary: fixed bug 26396: widgets not seen for fortal roles fixed typo introduced in previous fix details: https://code.openbravo.com/erp/devel/main/rev/f10bbecc61ba changeset: 22840:f10bbecc61ba user: Guillermo Gil <guillermo.gil <at> openbravo.com> date: Mon Apr 28 11:21:55 2014 +0200 summary: Fixed issue 26395: Create a sales invoice in grid & save it by losing focus On create a new record this.getEditRow() does not exists, used rowNum instead this.getEditRow() details: https://code.openbravo.com/erp/devel/main/rev/8ee26180317a changeset: 22841:8ee26180317a user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Apr 28 19:03:23 2014 +0200 summary: Fixes issue 26406: 'Is Tree' field of Table tab should be shown in grid view. Is Tree field of Table tab should be shown in grid view. The display logic of the Table Tree Category needs to have this field shown in grid view in order to work properly. details: https://code.openbravo.com/erp/devel/main/rev/e29da6b3d833 changeset: 22842:e29da6b3d833 user: Salvador Zapata <salvador.zapata <at> gmail.com> date: Mon Apr 07 11:45:35 2014 -0300 summary: Fixed 25739: Added display logic to show only for Price Adjustment offers details: https://code.openbravo.com/erp/devel/main/rev/f05c1d1e1c17 changeset: 22843:f05c1d1e1c17 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Apr 30 15:49:22 2014 +0200 summary: fixed bug 26432: can't select a computed column for a property field fixed drop down list selector to shown compuedColumns info diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js | 3 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java | 29 ++++++++- src-db/database/sourcedata/AD_FIELD.xml | 3 +- 5 files changed, 29 insertions(+), 10 deletions(-) diffs (106 lines): diff -r 67e9d9baa0b4 -r f05c1d1e1c17 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Thu Apr 24 10:06:42 2014 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Wed Apr 30 15:49:22 2014 +0200 @@ -8863,7 +8863,7 @@ <!--80D2CCB125DAECE6E040007F01000DDE--> <AD_COLUMN_ID><![CDATA[78A3367822B35459E040007F01012510]]></AD_COLUMN_ID> <!--80D2CCB125DAECE6E040007F01000DDE--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--80D2CCB125DAECE6E040007F01000DDE--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--80D2CCB125DAECE6E040007F01000DDE--> <DISPLAYLOGIC><![CDATA[@DocStatus@='CO'&@IsPaid@='N' &@showAddPayment@='Y' | @showAddPayment@ ='']]></DISPLAYLOGIC> +<!--80D2CCB125DAECE6E040007F01000DDE--> <DISPLAYLOGIC><![CDATA[@DocStatus@='CO'& @IsPaid@='N' & (@showAddPayment@='Y' | @showAddPayment@ ='')]]></DISPLAYLOGIC> <!--80D2CCB125DAECE6E040007F01000DDE--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--80D2CCB125DAECE6E040007F01000DDE--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--80D2CCB125DAECE6E040007F01000DDE--> <SEQNO><![CDATA[510]]></SEQNO> diff -r 67e9d9baa0b4 -r f05c1d1e1c17 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Apr 24 10:06:42 2014 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Wed Apr 30 15:49:22 2014 +0200 @@ -2873,7 +2873,7 @@ // Update the focus cell value if different from edit form values. // To avoid the case where sometimes data updated through trigger is not showing up without refreshing. // Refer issue https://issues.openbravo.com/view.php?id=25028 - this.setEditValue(this.getEditRow(), this.getField(colNum).name, record[this.getField(colNum).name], true, true); + this.setEditValue(rowNum, this.getField(colNum).name, record[this.getField(colNum).name], true, true); if (this.getEditRow() === rowNum) { this.getEditForm().markForRedraw(); diff -r 67e9d9baa0b4 -r f05c1d1e1c17 modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js --- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js Thu Apr 24 10:06:42 2014 +0200 +++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js Wed Apr 30 15:49:22 2014 +0200 @@ -760,8 +760,7 @@ } } } - - if (OB.MyOB.leftColumnLayout.addWigetSelector) { + if (OB.MyOB.leftColumnLayout && OB.MyOB.leftColumnLayout.addWigetSelector) { // after updating cache lets reflect it in the drop down list if present OB.MyOB.leftColumnLayout.addWigetSelector.refreshAvailableWidgets(); } diff -r 67e9d9baa0b4 -r f05c1d1e1c17 modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java --- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java Thu Apr 24 10:06:42 2014 +0200 +++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ModelDataSourceService.java Wed Apr 30 15:49:22 2014 +0200 @@ -134,8 +134,16 @@ currentDepth++; boolean propNotFound = true; - - final List<Property> currentEntityProperties = getEntityProperties(currentEntity); + final List<Property> currentEntityProperties; + if (currentProperty != null + && Entity.COMPUTED_COLUMNS_PROXY_PROPERTY.equals(currentProperty.getName())) { + // for computed columns get computed properties + currentEntity = currentProperty.getEntity(); + currentEntityProperties = currentEntity.getComputedColumnProperties(); + } else { + // other case get properties from entity + currentEntityProperties = getEntityProperties(currentEntity); + } for (Property prop : currentEntityProperties) { boolean tryProperty = false; @@ -165,12 +173,23 @@ } foundProperty = currentProperty; - currentEntity = foundProperty.getTargetEntity(); + List<Property> computedColProperties = null; + if (getAllProperties + && Entity.COMPUTED_COLUMNS_PROXY_PROPERTY.equals(currentProperty.getName())) { + computedColProperties = currentEntity.getComputedColumnProperties(); + } else { + currentEntity = foundProperty.getTargetEntity(); + } - if (currentDepth == pathDepth && getAllProperties && currentEntity != null) { + if (currentDepth == pathDepth && getAllProperties + && (currentEntity != null || computedColProperties != null)) { // User just pressed a final dot (.) key - getting all properties // of current Entity - return getJSONResponse(getEntityProperties(currentEntity), propertyPath, 0); + if (Entity.COMPUTED_COLUMNS_PROXY_PROPERTY.equals(currentProperty.getName())) { + return getJSONResponse(computedColProperties, propertyPath, 0); + } else if (currentEntity != null) { + return getJSONResponse(getEntityProperties(currentEntity), propertyPath, 0); + } } index++; } diff -r 67e9d9baa0b4 -r f05c1d1e1c17 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Thu Apr 24 10:06:42 2014 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Wed Apr 30 15:49:22 2014 +0200 @@ -189375,7 +189375,7 @@ <!--303B16D33FDB45AD80B07D568570EEC6--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--303B16D33FDB45AD80B07D568570EEC6--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--303B16D33FDB45AD80B07D568570EEC6--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> -<!--303B16D33FDB45AD80B07D568570EEC6--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--303B16D33FDB45AD80B07D568570EEC6--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--303B16D33FDB45AD80B07D568570EEC6--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--303B16D33FDB45AD80B07D568570EEC6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--303B16D33FDB45AD80B07D568570EEC6--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> @@ -192097,6 +192097,7 @@ <!--3846B544FCE14364B39D309A04EC3994--> <AD_COLUMN_ID><![CDATA[73E2F737D5B24CB4AA2CB06A82A07116]]></AD_COLUMN_ID> <!--3846B544FCE14364B39D309A04EC3994--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--3846B544FCE14364B39D309A04EC3994--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--3846B544FCE14364B39D309A04EC3994--> <DISPLAYLOGIC><![CDATA[@M_Offer_Type_ID@='5D4BAF6BB86D4D2C9ED3D5A6FC051579']]></DISPLAYLOGIC> <!--3846B544FCE14364B39D309A04EC3994--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--3846B544FCE14364B39D309A04EC3994--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--3846B544FCE14364B39D309A04EC3994--> <SEQNO><![CDATA[210]]></SEQNO> ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available. Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
