details: https://code.openbravo.com/erp/devel/pi/rev/c790c07bf96f changeset: 15773:c790c07bf96f user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Mar 08 17:49:43 2012 +0100 summary: Fixes issue 19965: Changed template name in reference data.
details: https://code.openbravo.com/erp/devel/pi/rev/6c0de0bce864 changeset: 15774:6c0de0bce864 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Mar 13 09:19:09 2012 +0100 summary: merge diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 2 +- referencedata/sampledata/F_B_International_Group.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (33 lines): diff -r b1522bbad05f -r 6c0de0bce864 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Thu Mar 08 17:25:55 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Tue Mar 13 09:19:09 2012 +0100 @@ -502,7 +502,7 @@ this.filterImage.hide(); } - if (this.filterClause && !this.view.isShowingForm && !this.view.messageBar.isVisible()) { + if (this.filterClause && !this.view.isShowingForm && (this.view.messageBar && !this.view.messageBar.isVisible())) { var showMessageProperty = OB.PropertyStore.get('OBUIAPP_ShowImplicitFilterMsg'), showMessage = (showMessageProperty !== 'N' && showMessageProperty !== '"N"' && noParentOrParentSelected); if (showMessage) { diff -r b1522bbad05f -r 6c0de0bce864 referencedata/sampledata/F_B_International_Group.xml --- a/referencedata/sampledata/F_B_International_Group.xml Thu Mar 08 17:25:55 2012 +0100 +++ b/referencedata/sampledata/F_B_International_Group.xml Tue Mar 13 09:19:09 2012 +0100 @@ -376787,7 +376787,7 @@ <name>US AP Invoice Report template</name> <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation> <reportFilename>Vendor Invoice-@our_ref@</reportFilename> - <templateFilename>RptC_Invoice_Purchase.jrxml</templateFilename> + <templateFilename>RptC_Invoice.jrxml</templateFilename> <showcompanydata>true</showcompanydata> <showlogo>true</showlogo> <headermargin xsi:nil="true"/> @@ -377221,7 +377221,7 @@ <name>US AP Credit Memo report template</name> <templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation> <reportFilename>AP Credit Memo-@our_ref@</reportFilename> - <templateFilename>RptC_Invoice_Purchase.jrxml</templateFilename> + <templateFilename>RptC_Invoice.jrxml</templateFilename> <showcompanydata>true</showcompanydata> <showlogo>true</showlogo> <headermargin xsi:nil="true"/> ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
