[OpenbravoERP-commits] devel/pi: Fixed Issue 19673. Peformance on product selector
details: https://code.openbravo.com/erp/devel/pi/rev/b3dd8df9ad41 changeset: 15365:b3dd8df9ad41 user: Egoitz Castillo egoitz.castillo at openbravo.com date: Tue Feb 07 09:50:01 2012 +0100 summary: Fixed Issue 19673. Peformance on product selector diffstat: src-db/database/model/tables/M_PRODUCTPRICE.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 08a073e24c09 -r b3dd8df9ad41 src-db/database/model/tables/M_PRODUCTPRICE.xml --- a/src-db/database/model/tables/M_PRODUCTPRICE.xml Mon Feb 06 13:18:50 2012 +0100 +++ b/src-db/database/model/tables/M_PRODUCTPRICE.xml Tue Feb 07 09:50:01 2012 +0100 @@ -65,6 +65,9 @@ foreign-key foreignTable=M_PRODUCT name=M_PRODUCTPRICE_M_PRODUCT onDelete=cascade reference local=M_PRODUCT_ID foreign=M_PRODUCT_ID/ /foreign-key + index name=M_PRODUCTPRICE_PRODUCT unique=false +index-column name=M_PRODUCT_ID/ + /index unique name=M_PRODUCTPRICE_PRICELIST_VE_UN unique-column name=M_PRICELIST_VERSION_ID/ unique-column name=M_PRODUCT_ID/ -- 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 Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Fixed issue 19675: Affected callouts have been re-fact...
details: https://code.openbravo.com/erp/devel/pi/rev/cac07d43bece
changeset: 15366:cac07d43bece
user: Guillermo Álvarez de Eulate guillermo.alvarez at openbravo.com
date: Tue Feb 07 11:33:36 2012 +0100
summary: Fixed issue 19675: Affected callouts have been re-factorized
diffstat:
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java| 431
-
src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 234 +---
src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Locator.java | 81 +-
src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java | 234 ++---
src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java | 222 +---
5 files changed, 481 insertions(+), 721 deletions(-)
diffs (truncated from 1528 to 300 lines):
diff -r b3dd8df9ad41 -r cac07d43bece
src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.javaTue Feb
07 09:50:01 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.javaTue Feb
07 11:33:36 2012 +0100
@@ -11,200 +11,156 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2010 Openbravo SLU
+ * All portions are Copyright (C) 2001-2012 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
*/
package org.openbravo.erpCommon.ad_callouts;
-import java.io.IOException;
-import java.io.PrintWriter;
import java.math.BigDecimal;
-import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.openbravo.base.secureApp.HttpSecureAppServlet;
-import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.data.FieldProvider;
import org.openbravo.erpCommon.businessUtility.BpartnerMiscData;
import org.openbravo.erpCommon.utility.ComboTableData;
import org.openbravo.erpCommon.utility.Utility;
-import org.openbravo.utils.FormatUtilities;
-import org.openbravo.xmlEngine.XmlDocument;
-public class SE_Order_BPartner extends HttpSecureAppServlet {
+public class SE_Order_BPartner extends SimpleCallout {
private static final long serialVersionUID = 1L;
- public void init(ServletConfig config) {
-super.init(config);
-boolHist = false;
- }
+ @Override
+ protected void execute(CalloutInfo info) throws ServletException {
- public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException,
- ServletException {
-VariablesSecureApp vars = new VariablesSecureApp(request);
-if (vars.commandIn(DEFAULT)) {
- String strChanged = vars.getStringParameter(inpLastFieldChanged);
- if (log4j.isDebugEnabled())
-log4j.debug(CHANGED: + strChanged);
- String strBPartner = vars.getStringParameter(inpcBpartnerId);
- String strOrderType = vars.getStringParameter(inpordertype);
- String strLocation = vars.getStringParameter(inpcBpartnerId_LOC);
- String strContact = vars.getStringParameter(inpcBpartnerId_CON);
- String strWindowId = vars.getStringParameter(inpwindowId);
- String strProjectId = vars.getStringParameter(inpcProjectId);
- String strIsSOTrx = Utility.getContext(this, vars, isSOTrx,
strWindowId);
- String strTabId = vars.getStringParameter(inpTabId);
- String strDeliveryRule = vars.getStringParameter(inpdeliveryrule);
- String strUserRep = vars.getStringParameter(inpsalesrepId);
- String strPaymentrule = vars.getStringParameter(inppaymentrule);
- String strPaymentterm = vars.getStringParameter(inpcPaymenttermId);
- String strInvoiceRule = vars.getStringParameter(inpinvoicerule);
- String strPriceList = vars.getStringParameter(inpmPricelistId);
- String strDeliveryViaRule =
vars.getStringParameter(inpdeliveryviarule);
- String strOrgId = vars.getStringParameter(inpadOrgId);
+// General data
- try {
-printPage(response, vars, strBPartner, strOrderType, strIsSOTrx,
strWindowId, strLocation,
-strContact, strProjectId, strTabId, strDeliveryRule, strUserRep,
strPaymentrule,
-strPaymentterm, strInvoiceRule, strPriceList, strDeliveryViaRule,
strOrgId);
- } catch (ServletException ex) {
-pageErrorCallOut(response);
- }
-} else
- pageError(response);
- }
+String strBPartner = info.vars.getStringParameter(inpcBpartnerId);
+String strIsSOTrx = Utility.getContext(this, info.vars, isSOTrx,
info.getWindowId());
+String strOrgId = info.vars.getStringParameter(inpadOrgId);
+String strPriceList = ;
+String strUserRep = ;
+String strInvoiceRule = ;
+String strFinPaymentMethodId = ;
+String strPaymentrule = ;
+String
[OpenbravoERP-commits] devel/pi: Related to issue 19539: Adds unit test
details: https://code.openbravo.com/erp/devel/pi/rev/8a33db400cad
changeset: 15368:8a33db400cad
user: Augusto Mauch augusto.mauch at openbravo.com
date: Tue Feb 07 14:06:42 2012 +0100
summary: Related to issue 19539: Adds unit test
diffstat:
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java
| 65 ++
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
| 3 +
2 files changed, 68 insertions(+), 0 deletions(-)
diffs (89 lines):
diff -r ec446df8cfe5 -r 8a33db400cad
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java
Tue Feb 07 14:06:42 2012 +0100
@@ -0,0 +1,65 @@
+package org.openbravo.client.application.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+public class DynamicExpressionParserTest extends TestCase {
+
+ private static MapString, String exprToJSMap;
+ static {
+exprToJSMap = new HashMapString, String();
+exprToJSMap.put('Y', true);
+exprToJSMap.put('N', false);
+ }
+
+ private String transformValue(String value) {
+if (value == null) {
+ return null;
+}
+String removeBracketsRegExp = [\\[\\(]*(.*?)[\\)\\]]*;
+Pattern pattern = Pattern.compile(removeBracketsRegExp);
+Matcher matcher = pattern.matcher(value);
+String transformedValueWithBrackets = null;
+// It is always matched: zero or plus opening brackets, followed by any
string, follow by zero
+// or plus closing brackets
+if (matcher.matches()) {
+ // Extracts the value
+ String valueWithoutBrackets = matcher.group(1);
+ // Transforms the value
+ String transformedValueWithoutBrackets =
exprToJSMap.get(valueWithoutBrackets) != null ? exprToJSMap
+ .get(valueWithoutBrackets) : valueWithoutBrackets;
+ // Re-encloses the value
+ transformedValueWithBrackets = value.replace(valueWithoutBrackets,
+ transformedValueWithoutBrackets);
+}
+return transformedValueWithBrackets;
+ }
+
+ public void testRegularExpression() {
+String value = 'Y';
+String transformedValue = transformValue(value);
+Assert.assertEquals(transformedValue, true);
+
+value = (['Y';
+transformedValue = transformValue(value);
+Assert.assertEquals(transformedValue, ([true);
+
+value = 'Y');
+transformedValue = transformValue(value);
+Assert.assertEquals(transformedValue, true));
+
+value = (['Y']);
+transformedValue = transformValue(value);
+Assert.assertEquals(transformedValue, ([true]));
+
+value = ('NotBoolean');
+transformedValue = transformValue(value);
+Assert.assertEquals(transformedValue, ('NotBoolean'));
+ }
+
+}
diff -r ec446df8cfe5 -r 8a33db400cad
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
Tue Feb 07 12:57:37 2012 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
Tue Feb 07 14:06:42 2012 +0100
@@ -27,6 +27,7 @@
import java.util.regex.Pattern;
import org.openbravo.base.weld.WeldUtils;
+import org.openbravo.client.application.test.DynamicExpressionParserTest;
import
org.openbravo.client.application.window.ApplicationDictionaryCachedStructures;
import org.openbravo.client.kernel.KernelUtils;
import org.openbravo.client.kernel.reference.UIDefinition;
@@ -156,6 +157,8 @@
*
* If the value is enclosed between brackets, it is extracted, translated
and enclosed again
*
+ * @see DynamicExpressionParserTest
+ *
* @param value
* A string expression like b'Y'/b
* @return A equivalent value in JavaScript or the same string if has no
mapping value
--
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
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixed bug 19680: Saving new record now disables save b...
details: https://code.openbravo.com/erp/devel/pi/rev/4182555aaecc
changeset: 15369:4182555aaecc
user: Asier Lostalé asier.lostale at openbravo.com
date: Tue Feb 07 16:22:27 2012 +0100
summary: fixed bug 19680: Saving new record now disables save button
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js
| 84 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 1 +
2 files changed, 49 insertions(+), 36 deletions(-)
diffs (142 lines):
diff -r 8a33db400cad -r 4182555aaecc
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js
Tue Feb 07 14:06:42 2012 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js
Tue Feb 07 16:22:27 2012 +0100
@@ -11,7 +11,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) 2011 Openbravo SLU
+ * All portions are Copyright (C) 2011-2012 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -27,40 +27,56 @@
additionalProps: null,
showProgress: function(editedRecord){
-
-// don't show it, done to quickly
-if (!editedRecord._showProgressAfterDelay) {
- return;
-}
-
-if (editedRecord editedRecord.editColumnLayout) {
- if (!this.view.isShowingForm) {
-editedRecord.editColumnLayout.toggleProgressIcon(true);
+var btn, btn2;
+if (editedRecord){
+ // don't show it, done to quickly
+ if (!editedRecord._showProgressAfterDelay) {
+return;
+ }
+
+ if (editedRecord editedRecord.editColumnLayout) {
+if (!this.view.isShowingForm) {
+ editedRecord.editColumnLayout.toggleProgressIcon(true);
+}
}
}
-
-if (this.view.isShowingForm) {
- var btn = this.view.toolBar.getLeftMember(isc.OBToolbar.TYPE_SAVE);
- btn.customState = 'Progress';
- btn.resetBaseStyle();
- btn.markForRedraw();
+
+// Always show progress in save button and disable save and close one
+btn = this.view.toolBar.getLeftMember(isc.OBToolbar.TYPE_SAVE);
+btn.setDisabled(true);
+btn.customState = 'Progress';
+btn.resetBaseStyle();
+btn.markForRedraw();
+
+btn2 = this.view.toolBar.getLeftMember(isc.OBToolbar.TYPE_SAVECLOSE);
+if (btn2) {
+ btn2.setDisabled(true);
+ btn2.markForRedraw();
}
},
hideProgress: function(editedRecord){
-editedRecord._showProgressAfterDelay = false;
-if (editedRecord editedRecord.editColumnLayout) {
- editedRecord.editColumnLayout.toggleProgressIcon(false);
+var btn;
+if (editedRecord){
+ editedRecord._showProgressAfterDelay = false;
+ if (editedRecord editedRecord.editColumnLayout) {
+editedRecord.editColumnLayout.toggleProgressIcon(false);
+ }
}
-
+
// always remove the progress style here anyway
-var btn = this.view.toolBar.getLeftMember(isc.OBToolbar.TYPE_SAVE);
+btn = this.view.toolBar.getLeftMember(isc.OBToolbar.TYPE_SAVE);
btn.customState = '';
btn.resetBaseStyle();
btn.markForRedraw();
},
performDSOperation: function(operationType, data, callback,
requestProperties){
+var currentRecord;
+
+requestProperties = requestProperties || {};
+requestProperties.clientContext = requestProperties.clientContext || {};
+
// only update the values of the record itself but not of any referenced
// entity
if (operationType === 'update' || operationType === 'add') {
@@ -71,21 +87,18 @@
}
}
data = correctedData;
-}
-
-// requestProperties.showPrompt = false;
-// set the current selected record before the delay
-var currentRecord = this.view.viewGrid.getSelectedRecord();
-if (currentRecord) {
- // only show progress after 200ms delay
- currentRecord._showProgressAfterDelay = true;
- // keep the edited record in the client context
- requestProperties = requestProperties || {};
- requestProperties.clientContext = requestProperties.clientContext || {};
- requestProperties.clientContext.progressIndicatorSelectedRecord =
currentRecord;
+ currentRecord = this.view.viewGrid.getSelectedRecord();
+ if (currentRecord) {
+// only show progress after 200ms delay
+// set the current selected record before the delay
+// keep the edited record in the client context
+currentRecord._showProgressAfterDelay = true;
+
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/8ec4eac1fac0 changeset: 15370:8ec4eac1fac0 user: Guillermo Álvarez de Eulate guillermo.alvarez at openbravo.com date: Tue Feb 07 16:18:38 2012 +0100 summary: Fixed issue 10429: Warning is shown if wrong java package is entered. details: https://code.openbravo.com/erp/devel/pi/rev/b25e86b22d00 changeset: 15371:b25e86b22d00 user: Guillermo Álvarez de Eulate guillermo.alvarez at openbravo.com date: Tue Feb 07 15:57:02 2012 +0100 summary: Fixed issue 17955: Now sequence numbers are genetared correctly using 'create fields' diffstat: src-db/database/model/functions/AD_TAB_IMPORT.xml | 11 +- src-db/database/sourcedata/AD_CALLOUT.xml | 10 + src-db/database/sourcedata/AD_COLUMN.xml| 2 + src-db/database/sourcedata/AD_MESSAGE.xml | 11 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src/org/openbravo/erpCommon/ad_callouts/JavaPackageChecker.java | 66 ++ 7 files changed, 120 insertions(+), 2 deletions(-) diffs (200 lines): diff -r 4182555aaecc -r b25e86b22d00 src-db/database/model/functions/AD_TAB_IMPORT.xml --- a/src-db/database/model/functions/AD_TAB_IMPORT.xml Tue Feb 07 16:22:27 2012 +0100 +++ b/src-db/database/model/functions/AD_TAB_IMPORT.xml Tue Feb 07 15:57:02 2012 +0100 @@ -98,6 +98,11 @@ where ad_tab_id = v_Record_ID and m.ad_module_id = t.ad_module_id and ISINDEVELOPMENT ='Y'; + +select max(seqno) + into v_SeqNoCounter + from ad_field + where ad_field.ad_tab_id = v_Record_ID; if v_module_id is null then select max(ad_module_id) @@ -128,8 +133,10 @@ else v_GridSeqNo := 0; end if; - -v_SeqNoCounter := 20; --Reserve 10 for Organization + +if v_SeqNoCounter 20 then + v_SeqNoCounter := 20; --Reserve 10 for Organization +end if; FOR Cur_Column IN(-- added by Pablo Sarobe SELECT c.Columnname, c.Name, c.Description, c.Help, c.AD_Column_ID, c.FieldLength, t.tablename, c.AD_Module_ID diff -r 4182555aaecc -r b25e86b22d00 src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Tue Feb 07 16:22:27 2012 +0100 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Tue Feb 07 15:57:02 2012 +0100 @@ -980,6 +980,16 @@ !--F6E343E77DA249559AEF8651D595E880-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID !--F6E343E77DA249559AEF8651D595E880--/AD_CALLOUT +!--FABEBED69FEF49F8993F3FDA911FD94B--AD_CALLOUT +!--FABEBED69FEF49F8993F3FDA911FD94B-- AD_CALLOUT_ID![CDATA[FABEBED69FEF49F8993F3FDA911FD94B]]/AD_CALLOUT_ID +!--FABEBED69FEF49F8993F3FDA911FD94B-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID +!--FABEBED69FEF49F8993F3FDA911FD94B-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID +!--FABEBED69FEF49F8993F3FDA911FD94B-- ISACTIVE![CDATA[Y]]/ISACTIVE +!--FABEBED69FEF49F8993F3FDA911FD94B-- NAME![CDATA[Java package checker]]/NAME +!--FABEBED69FEF49F8993F3FDA911FD94B-- DESCRIPTION![CDATA[verifies if the java package is valid]]/DESCRIPTION +!--FABEBED69FEF49F8993F3FDA911FD94B-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID +!--FABEBED69FEF49F8993F3FDA911FD94B--/AD_CALLOUT + !--FF8080813141FBE30131420735D80013--AD_CALLOUT !--FF8080813141FBE30131420735D80013-- AD_CALLOUT_ID![CDATA[FF8080813141FBE30131420735D80013]]/AD_CALLOUT_ID !--FF8080813141FBE30131420735D80013-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID diff -r 4182555aaecc -r b25e86b22d00 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Feb 07 16:22:27 2012 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Feb 07 15:57:02 2012 +0100 @@ -224376,6 +224376,7 @@ !--56EB0A0CAC47B232E040007F01001BD8-- ISSESSIONATTR![CDATA[N]]/ISSESSIONATTR !--56EB0A0CAC47B232E040007F01001BD8-- ISSECONDARYKEY![CDATA[N]]/ISSECONDARYKEY !--56EB0A0CAC47B232E040007F01001BD8-- ISDESENCRYPTABLE![CDATA[N]]/ISDESENCRYPTABLE +!--56EB0A0CAC47B232E040007F01001BD8-- AD_CALLOUT_ID![CDATA[FABEBED69FEF49F8993F3FDA911FD94B]]/AD_CALLOUT_ID !--56EB0A0CAC47B232E040007F01001BD8-- DEVELOPMENTSTATUS![CDATA[RE]]/DEVELOPMENTSTATUS !--56EB0A0CAC47B232E040007F01001BD8-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID !--56EB0A0CAC47B232E040007F01001BD8-- POSITION![CDATA[19]]/POSITION @@ -248759,6 +248760,7 @@ !--7E3EF62A996311DD88AB001D09C4A2FE-- ISSESSIONATTR![CDATA[N]]/ISSESSIONATTR !--7E3EF62A996311DD88AB001D09C4A2FE-- ISSECONDARYKEY![CDATA[N]]/ISSECONDARYKEY !--7E3EF62A996311DD88AB001D09C4A2FE-- ISDESENCRYPTABLE![CDATA[N]]/ISDESENCRYPTABLE +!--7E3EF62A996311DD88AB001D09C4A2FE-- AD_CALLOUT_ID![CDATA[FABEBED69FEF49F8993F3FDA911FD94B]]/AD_CALLOUT_ID !--7E3EF62A996311DD88AB001D09C4A2FE-- DEVELOPMENTSTATUS![CDATA[RE]]/DEVELOPMENTSTATUS !--7E3EF62A996311DD88AB001D09C4A2FE-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID !--7E3EF62A996311DD88AB001D09C4A2FE--
[OpenbravoERP-commits] devel/pi: Backed out changeset b25e86b22d00
details: https://code.openbravo.com/erp/devel/pi/rev/561e6f569f2c changeset: 15372:561e6f569f2c user: Asier Lostalé asier.lostale at openbravo.com date: Tue Feb 07 17:48:16 2012 +0100 summary: Backed out changeset b25e86b22d00 diffstat: src-db/database/model/functions/AD_TAB_IMPORT.xml | 11 ++- 1 files changed, 2 insertions(+), 9 deletions(-) diffs (28 lines): diff -r b25e86b22d00 -r 561e6f569f2c src-db/database/model/functions/AD_TAB_IMPORT.xml --- a/src-db/database/model/functions/AD_TAB_IMPORT.xml Tue Feb 07 15:57:02 2012 +0100 +++ b/src-db/database/model/functions/AD_TAB_IMPORT.xml Tue Feb 07 17:48:16 2012 +0100 @@ -98,11 +98,6 @@ where ad_tab_id = v_Record_ID and m.ad_module_id = t.ad_module_id and ISINDEVELOPMENT ='Y'; - -select max(seqno) - into v_SeqNoCounter - from ad_field - where ad_field.ad_tab_id = v_Record_ID; if v_module_id is null then select max(ad_module_id) @@ -133,10 +128,8 @@ else v_GridSeqNo := 0; end if; - -if v_SeqNoCounter 20 then - v_SeqNoCounter := 20; --Reserve 10 for Organization -end if; + +v_SeqNoCounter := 20; --Reserve 10 for Organization FOR Cur_Column IN(-- added by Pablo Sarobe SELECT c.Columnname, c.Name, c.Description, c.Help, c.AD_Column_ID, c.FieldLength, t.tablename, c.AD_Module_ID -- 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 Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 6 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/7182f77e changeset: 15279:7182f77e user: Javier Etxarri javier.echarri at openbravo.com date: Wed Feb 01 09:06:49 2012 +0100 summary: Issue 19341: The number of Alerts on the menu and Alert Management window do not match. Now, if you have more than 100 alerts, you will see '100'. If you have less than 100, every time you will see the same value in the Alerts of menu and Alerts Managemenet window details: https://code.openbravo.com/erp/devel/main/rev/d7f87506c261 changeset: 15280:d7f87506c261 user: Eduardo Argal Guibert eduardo.argal at openbravo.com date: Thu Feb 02 13:04:52 2012 +0100 summary: Fixes bug 19631: Payment report is not working when filtering by dates details: https://code.openbravo.com/erp/devel/main/rev/5d21beb5a80f changeset: 15281:5d21beb5a80f user: Eduardo Argal Guibert eduardo.argal at openbravo.com date: Thu Feb 02 14:19:18 2012 +0100 summary: Fixes bug 19638: Prepaid account must exists to post an invoice, even if it hasn't got any prepayment details: https://code.openbravo.com/erp/devel/main/rev/99e6717a3cb0 changeset: 15282:99e6717a3cb0 user: Javier Etxarri javier.echarri at openbravo.com date: Fri Feb 03 10:25:42 2012 +0100 summary: Fixes issue 19644: Product complete selector does not work properly. I revert the change because with '===' equals is not working as it is expected. details: https://code.openbravo.com/erp/devel/main/rev/2fbd0f5d6438 changeset: 15283:2fbd0f5d6438 user: Eduardo Argal Guibert eduardo.argal at openbravo.com date: Fri Feb 03 12:44:31 2012 +0100 summary: fixes bug 19653 details: https://code.openbravo.com/erp/devel/main/rev/64d4473ba03d changeset: 15284:64d4473ba03d user: Asier Lostalé asier.lostale at openbravo.com date: Mon Feb 06 13:14:36 2012 +0100 summary: fixed bug 19619: Financial Account: Transaction tab does not get refreshed diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 20 +++-- modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 5 +-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 5 ++- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 9 - src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 2 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 12 -- 8 files changed, 39 insertions(+), 18 deletions(-) diffs (195 lines): diff -r 072cd32ef504 -r 64d4473ba03d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Fri Feb 03 06:18:45 2012 + +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Mon Feb 06 13:14:36 2012 +0100 @@ -6305,7 +6305,7 @@ !--B44BDBCFCEC243179D78A333FA0497A5-- AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID !--B44BDBCFCEC243179D78A333FA0497A5-- POSITION![CDATA[34]]/POSITION !--B44BDBCFCEC243179D78A333FA0497A5-- ISTRANSIENT![CDATA[N]]/ISTRANSIENT -!--B44BDBCFCEC243179D78A333FA0497A5-- ISAUTOSAVE![CDATA[N]]/ISAUTOSAVE +!--B44BDBCFCEC243179D78A333FA0497A5-- ISAUTOSAVE![CDATA[Y]]/ISAUTOSAVE !--B44BDBCFCEC243179D78A333FA0497A5-- VALIDATEONNEW![CDATA[Y]]/VALIDATEONNEW !--B44BDBCFCEC243179D78A333FA0497A5-- IMAGESIZEVALUESACTION![CDATA[N]]/IMAGESIZEVALUESACTION !--B44BDBCFCEC243179D78A333FA0497A5--/AD_COLUMN diff -r 072cd32ef504 -r 64d4473ba03d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Fri Feb 03 06:18:45 2012 + +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Mon Feb 06 13:14:36 2012 +0100 @@ -35,6 +35,7 @@ import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; +import org.hibernate.criterion.Restrictions; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import
