[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/4dc18ae9b326
changeset: 35446:4dc18ae9b326
user:  Asier Lostalé  openbravo.com>
date:  Thu Feb 14 09:31:22 2019 +0100
summary:   fixed issue 40192: XmlEngine should not be a Servlet

details:   https://code.openbravo.com/erp/devel/pi/rev/6c4017ffae94
changeset: 35447:6c4017ffae94
user:  Asier Lostalé  openbravo.com>
date:  Thu Feb 14 09:32:18 2019 +0100
summary:   fixed issue 40192: XmlEngine shouldn't be standalone executuble

details:   https://code.openbravo.com/erp/devel/pi/rev/1175ab44522d
changeset: 35448:1175ab44522d
user:  Asier Lostalé  openbravo.com>
date:  Thu Feb 14 10:05:31 2019 +0100
summary:   related to issue 40192: additional cleanup

  Removed unnecessary methods
  Reduced visibility
  Minor code refactors

details:   https://code.openbravo.com/erp/devel/pi/rev/b32c4494df35
changeset: 35449:b32c4494df35
user:  Asier Lostalé  openbravo.com>
date:  Thu Feb 14 12:05:41 2019 +0100
summary:   related to issue 40192: removed unused Report class

diffstat:

 src-core/src/org/openbravo/xmlEngine/Report.java|   46 --
 src-core/src/org/openbravo/xmlEngine/XmlEngine.java |  450 ++-
 src-db/database/sourcedata/AD_MODEL_OBJECT.xml  |   12 -
 src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml |   33 -
 4 files changed, 52 insertions(+), 489 deletions(-)

diffs (truncated from 762 to 300 lines):

diff -r 3358f7883c08 -r b32c4494df35 
src-core/src/org/openbravo/xmlEngine/Report.java
--- a/src-core/src/org/openbravo/xmlEngine/Report.java  Mon Feb 11 18:07:30 
2019 +0100
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,46 +0,0 @@
-/*
- 

- * Copyright (C) 2001-2010 Openbravo S.L.U.
- * Licensed under the Apache Software License version 2.0
- * You may obtain a copy of the License at 
http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to  in writing,  software  
distributed
- * under the License is distributed  on  an  "AS IS"  BASIS,  WITHOUT  
WARRANTIES  OR
- * CONDITIONS OF ANY KIND, either  express  or  implied.  See  the  License  
for  the
- * specific language governing permissions and limitations under the License.
- 

- */
-package org.openbravo.xmlEngine;
-
-import org.openbravo.data.FieldProvider;
-
-class Report {
-  XmlDocument xmlDocument;
-
-  public Report(String strReportFile, String[] discard, XmlEngine xmlEngine) {
-xmlDocument = xmlEngine.readXmlTemplate(strReportFile, 
discard).createXmlDocument(null);
-  }
-
-  public void setParameter(String strName, String strValue) {
-xmlDocument.setParameter(strName, strValue);
-  }
-
-  public void setData(String structureName, FieldProvider[] data) {
-xmlDocument.setData(structureName, data);
-  }
-
-  public void setData(String xmlDocumentName, String structureName, 
FieldProvider[] data) {
-xmlDocument.setData(xmlDocumentName, structureName, data);
-  }
-
-  public void setDataArray(String xmlDocumentName, String structureName, 
FieldProvider[][] data) {
-xmlDocument.setDataArray(xmlDocumentName, structureName, data);
-  }
-
-  public String print() {
-return xmlDocument.print();
-  }
-
-  public String print(String strText) {
-return xmlDocument.print(strText);
-  }
-}
diff -r 3358f7883c08 -r b32c4494df35 
src-core/src/org/openbravo/xmlEngine/XmlEngine.java
--- a/src-core/src/org/openbravo/xmlEngine/XmlEngine.java   Mon Feb 11 
18:07:30 2019 +0100
+++ b/src-core/src/org/openbravo/xmlEngine/XmlEngine.java   Thu Feb 14 
12:05:41 2019 +0100
@@ -1,6 +1,6 @@
 /*
  

- * Copyright (C) 2001-2018 Openbravo S.L.U.
+ * Copyright (C) 2001-2019 Openbravo S.L.U.
  * Licensed under the Apache Software License version 2.0
  * You may obtain a copy of the License at 
http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to  in writing,  software  
distributed
@@ -13,21 +13,11 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Stack;
 import java.util.Vector;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.xerces.parsers.SAXParser;
@@ -35,18 +25,16 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
-public class XmlEngine extends HttpServlet {
-  private static final long 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/e36d52a51aee
changeset: 35427:e36d52a51aee
user:  Sandra Huguet  openbravo.com>
date:  Thu Jan 31 16:18:04 2019 +0100
summary:   Fixed issue 39969 Avoid NPE when posting a 
payment/transaction/reconciliation
of a Cash VAT invoice with different currency.


After convert the tax amount with from the used currency to the financial 
account
currency it is possible that this conversion is ZERO.
If Amount converted is zero should have the same behaviour as when amount is 
zero.

details:   https://code.openbravo.com/erp/devel/pi/rev/e4b514229785
changeset: 35428:e4b514229785
user:  David Miguelez  openbravo.com>
date:  Mon Feb 04 11:53:15 2019 +0100
summary:   Related to Issue 39969. Code Review changes.

Moved logic to retrieve some variables after if clause.
If the condition is not fulfilled, it is not necessary to
initialize this variables.

details:   https://code.openbravo.com/erp/devel/pi/rev/5b3625a0edb3
changeset: 35429:5b3625a0edb3
user:  Sandra Huguet  openbravo.com>
date:  Mon Feb 04 13:38:49 2019 +0100
summary:   related to issue 39969 update Copyright year

details:   https://code.openbravo.com/erp/devel/pi/rev/94c8cd7d1c55
changeset: 35430:94c8cd7d1c55
user:  Atul Gaware  openbravo.com>
date:  Tue Jan 29 23:13:57 2019 +0530
summary:   Fixes Issue 0039993: / by zero error in Costing Background Process
with backdated and negative stock correction and voided goods
receipt

In case of negative stock correction, handle divide by zero when
currentStock value is zero

diffstat:

 src/org/openbravo/costing/AverageCostAdjustment.java |   12 +-
 src/org/openbravo/erpCommon/utility/CashVATUtil.java |  117 +-
 2 files changed, 67 insertions(+), 62 deletions(-)

diffs (187 lines):

diff -r 9141b6a4a4e8 -r 94c8cd7d1c55 
src/org/openbravo/costing/AverageCostAdjustment.java
--- a/src/org/openbravo/costing/AverageCostAdjustment.java  Tue Feb 05 
08:11:05 2019 +0100
+++ b/src/org/openbravo/costing/AverageCostAdjustment.java  Tue Jan 29 
23:13:57 2019 +0530
@@ -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) 2014-2018 Openbravo SLU
+ * All portions are Copyright (C) 2014-2019 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  __.
  *
@@ -376,10 +376,12 @@
   lineParameters.setNegativeCorrection(true);
   lineParameters.setRelatedTransactionAdjusted(true);
   insertCostAdjustmentLine(lineParameters);
-  cost = currentValueAmt.add(adjustmentBalance)
-  .divide(currentStock, costCurPrecission, 
RoundingMode.HALF_UP);
-  log.debug("Revert Negative stock correction. Amount: {}, new 
cost {}",
-  revertedNegativeAdjustment.toPlainString(), 
cost.toPlainString());
+  if (currentStock.signum() != 0) {
+cost = currentValueAmt.add(adjustmentBalance)
+.divide(currentStock, costCurPrecission, 
RoundingMode.HALF_UP);
+log.debug("Revert Negative stock correction. Amount: {}, new 
cost {}",
+revertedNegativeAdjustment.toPlainString(), 
cost.toPlainString());
+  }
 }
   }
 
diff -r 9141b6a4a4e8 -r 94c8cd7d1c55 
src/org/openbravo/erpCommon/utility/CashVATUtil.java
--- a/src/org/openbravo/erpCommon/utility/CashVATUtil.java  Tue Feb 05 
08:11:05 2019 +0100
+++ b/src/org/openbravo/erpCommon/utility/CashVATUtil.java  Tue Jan 29 
23:13:57 2019 +0530
@@ -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) 2013-2018 Openbravo SLU
+ * All portions are Copyright (C) 2013-2019 Openbravo SLU
  * All Rights Reserved. 
  * Contributor(s):  __.
  
@@ -516,26 +516,48 @@
   if (tax.isCashVAT() && StringUtils.equals(inv.getId(), 
invoice.getId())) {
 final BigDecimal taxAmt = itcv.getTaxAmount();
 if (taxAmt.compareTo(BigDecimal.ZERO) != 0) {
-  final DocTax m_tax = new DocTax(tax.getId(), tax.getName(), 
tax.getRate().toString(),
-  itcv.getInvoiceTax().getTaxableAmount().toString(),
-  itcv.getTaxAmount().toString(), tax.isNotTaxdeductable(), 
tax.isTaxdeductable());
-  final String invoicedocumentType = 
invoice.getDocumentType().getDocumentCategory();
-  final boolean isReversal = 
invoice.getDocumentType().isReversal();
   String dateFormatString = OBPropertiesProvider.getInstance()
   .getOpenbravoProperties()

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/02638ff47292
changeset: 35336:02638ff47292
user:  Javier Armendáriz  openbravo.com>
date:  Mon Jan 21 16:55:41 2019 +0100
summary:   Fixed issue 39982: Clean up javascript code.

In order to be compliant of new versions of ESLint, some changes have to be
performed in current javascript code. This changeset adds a line break at the
end of .js files when necessary.

details:   https://code.openbravo.com/erp/devel/pi/rev/b0a745abbd2b
changeset: 35337:b0a745abbd2b
user:  Javier Armendáriz  openbravo.com>
date:  Mon Jan 21 16:57:20 2019 +0100
summary:   Related to issue 39982: Clean up javascript code.

This changeset fixes all errors detected by ESLint

details:   https://code.openbravo.com/erp/devel/pi/rev/88e72b6054e0
changeset: 35338:88e72b6054e0
user:  Javier Armendáriz  openbravo.com>
date:  Mon Jan 21 16:58:30 2019 +0100
summary:   Related to issue 39982: Clean up javascript code.

This changeset removes all warning detected by ESLint, mostly related to unused
variables.

details:   https://code.openbravo.com/erp/devel/pi/rev/f6f096631204
changeset: 35339:f6f096631204
user:  Javier Armendáriz  openbravo.com>
date:  Mon Jan 21 17:00:48 2019 +0100
summary:   Related to issue 39982: Clean up javascript code.

This changeset fixed ESLint warnings related to regexp escape characters.
Included a QUnit test case for one change.

diffstat:

 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
 |  41 +++---
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
 |  13 +-
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js
 |   2 +-
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js
|   2 +-
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js
  |   2 +-
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
 |  16 +-
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js
  |   2 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
|   1 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/example/grid-example.js
  |   6 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
 |   8 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
  |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-manager.js
  |  10 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js
   |  40 --
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js
  |  26 +---
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/callback/ob-extra-window-settings-actions.js
  |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
   |   6 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-help.js
|   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-popup.js
   |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js
  |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/costing/ob-lc-matchfrominvoice.js
 |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js
   |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
  |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-checkbox.js
 |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-combo.js
|   2 +-
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/11dbadbe4ba4
changeset: 35314:11dbadbe4ba4
user:  David Miguelez  openbravo.com>
date:  Mon Dec 17 17:50:52 2018 +0100
summary:   Fixes Issue 39822. Fixes issues when merging new cost adjustment 
lines
with existing ones.

To avoid creating more Adjusment Lines than needed, the process
tries to find existing cost adjustment lines and it adds the cost
adjusted to an existing line if any.
But when looking for existing lines it was not taking into account
the unit cost, negative correction or backdated flags.

To do so, it is necessary to send the parameters to the methods
that creates the lines. But adding more parameters to this
functions was too complex, as they already had many parameters.

What has been done is to create a new class to store the line information.
This class is initialized with just three parameters and the
rest are set to the default values.

Then, the developer can change any parameter with the setter methods.
This makes the code more clear and clean, instead of having a
function with more than 10 parameters, being 4 of them booleans,
now it creates a new object with three parameters and then it
sets the boolean values with methods that have a name with more
meaning.

After this change, all the information of the line is set through this
new object, so there is no need to change the line object afterwards,
since all the different parameters are set to the LineParameter object.

Changes:

Database:
* Change default value of needsposting column to use the same
  one as in AD and avoid confusion

CostAdjustmentLineParameters:
* New class to store lines information
* Does not allow to create adjustment lines with empty cost adjusment
  or empty Transaction
* Does not create an adjustment that is both negative and unit cost.
  This was not controlled before

CostAdjustmentUtils:
* Deprecated old methods that does not send the new flags
* Created new API to use the new LineParams object
* Modify query to take into account new flags
* Modify insert method to set all the parameters for the new
  Cost Adjusment Line

CostingAlgorithmAdjustmentImp:
* Modify inser line method to use new API

Adapted all the calls to old methods to use new API

details:   https://code.openbravo.com/erp/devel/pi/rev/4b812cac3744
changeset: 35315:4b812cac3744
user:  David Miguelez  openbravo.com>
date:  Wed Dec 26 17:28:40 2018 +0100
summary:   Related to Issue 39822. Code Review Changes:

* Fixed typo in Message value
* Changed name of class variable from costAdjusted to adjustmentAmt (changed 
getter too)
* Added currency variable for parameters class
  * If not specified, it uses the currency of the transaction
  * If specified, it is used to create the line and to search
for existing adjustment lines

details:   https://code.openbravo.com/erp/devel/pi/rev/a913d96060c7
changeset: 35316:a913d96060c7
user:  David Miguelez  openbravo.com>
date:  Mon Jan 14 09:40:46 2019 +0100
summary:   Fixes Issue 39888. When canceling a cost adjustment:

* Keep the Negative Stock Correction and Backdated Transactions
  flags with the same values as the original record
* When retrieving the lines of the Adjustment, retrieve also the lines
  from Adjusments in Voided Status

details:   https://code.openbravo.com/erp/devel/pi/rev/00f3ad11d13d
changeset: 35317:00f3ad11d13d
user:  David Miguelez  openbravo.com>
date:  Mon Jan 14 12:10:40 2019 +0100
summary:   Related to Issue 39822. Added previously deleted method and set it 
as deprecated
to avoid API Change.

This method however should be avoided as it should be removed in the future,
as the other deprecated methods in this issue.

diffstat:

 src-db/database/model/tables/M_COSTADJUSTMENTLINE.xml |2 +-
 src-db/database/sourcedata/AD_MESSAGE.xml |   12 +
 src/org/openbravo/costing/AverageCostAdjustment.java  |   51 +-
 src/org/openbravo/costing/CancelCostAdjustment.java   |7 +-
 src/org/openbravo/costing/CostAdjustmentLineParameters.java   |  270 
++
 src/org/openbravo/costing/CostAdjustmentUtils.java|   95 ++-
 src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java  |   63 +-
 src/org/openbravo/costing/CostingServer.java  |   16 +-
 src/org/openbravo/costing/FixBackdatedTransactionsProcess.java|   14 +-
 src/org/openbravo/costing/LCMatchingProcess.java  |   17 +-
 src/org/openbravo/costing/LandedCostProcess.java  |   19 +-
 src/org/openbravo/costing/ManualCostAdjustmentProcessHandler.java |   14 +-
 src/org/openbravo/costing/PriceDifferenceProcess.java |9 +-
 src/org/openbravo/costing/StandardCostAdjustment.java |6 +-
 14 files changed, 477 insertions(+), 118 deletions(-)

diffs (truncated from 1039 to 300 lines):

diff -r b4c3e3431595 -r 00f3ad11d13d 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/a3bda4f3376a
changeset: 34955:a3bda4f3376a
user:  Nono Carballo  gmail.com>
date:  Thu Oct 04 15:59:12 2018 -0400
summary:   Fixed issue 39617: Allows Automatic Invoice from Goods Shipment

- A new field was added to "Request Process" pop up window. The field is only
  visible in Goods Shipment window if the selected document is in draft status.
- A new class was created for automatically creating invoices from Goods
  Shipment, considering the invoice terms of the order linked to the shipment
  lines, when exists.
- The ProcessGoods process was modified to invoke the new API after complete the
  document, if the field in the pop up window is checked.
- A new button was added to Goods Shipment window to allow generate invoice
  from Goods Shipment. The button is only visible if the document is in status
  "CO" and is not completely invoiced.
- Automated tests were created.

details:   https://code.openbravo.com/erp/devel/pi/rev/f2c342521137
changeset: 34956:f2c342521137
user:  Nono Carballo  gmail.com>
date:  Thu Oct 25 15:40:15 2018 -0400
summary:   Fixed issue 39617: Added new features

- Three new fields were added to "Request Process" pop up window. The fields
  are only visible in Goods Shipment window if the selected document is in
  draft status. The fields hold the Invoice Date, the Price List and whether
  the invoice generated  will be processed or not.
- The ProcessGoods process was modified to consider the new fields added.
- The success message in Process Goods process shows the document number
  of the generated invoice and its status.
- Three new parameters were added to Generate Invoice from Goods Shipment
  process definition. The fields hold the Invoice Date, the Price List and
  whether the invoice generated  will be processed or not.
- The Generate Invoice from Goods Shipment action handler was modified to
  consider the new fields added.
- Code was refactored. Some classes were renamed, java documentation was
  improved.
- Automated test were updated
- Two new automated test were added

details:   https://code.openbravo.com/erp/devel/pi/rev/37ad45032da1
changeset: 34957:37ad45032da1
user:  Nono Carballo  gmail.com>
date:  Thu Oct 25 17:59:27 2018 -0400
summary:   Fixed issue 39617: Java doc to Invoice from Goods Shipment action 
handler

details:   https://code.openbravo.com/erp/devel/pi/rev/af52c7d01edc
changeset: 34958:af52c7d01edc
user:  Víctor Martínez Romanos  openbravo.com>
date:  Mon Nov 12 19:38:38 2018 +0100
summary:   Fixed issue 39617: Code review improvements

Fixed db consistency.
Avoid useless usage of flush() and commitAndClose(). Refreshing needed objects 
instead.
TestUtils class declared at package level.
Refactor InvoiceGeneratorFromGoodsShipment class to improve code cleanliness.
 - Pass Process Invoice as parameter
 - Declare enum with the list of supported Invoice Terms
 - Avoid to store hibernate objects as class variables
 - Properly manage memory consumption by evicting useless objects
 - Simplify exception management
 - Validate order line is returned by C_Invoice_Candidate_V
 - Take into account only completed invoices
 - Properly calculate pending qty to invoice
 - Reduce complexity in several methods
 - Get the invoice document type using the standard AD_GET_DOCTYPE
HTML/XML/Java related to ProcessGoods:
 - It now follows Openbravo standards (parse dates and checkbox, remove useless 
catch)
 - Added default display logic hidden to invoice related fields

diffstat:

 src-db/database/model/tables/M_INOUT.xml   
   |4 +
 src-db/database/sourcedata/AD_COLUMN.xml   
   |   39 +
 src-db/database/sourcedata/AD_ELEMENT.xml  
   |   26 +
 src-db/database/sourcedata/AD_FIELD.xml
   |   29 +
 src-db/database/sourcedata/AD_MESSAGE.xml  
   |   48 +
 src-db/database/sourcedata/AD_REFERENCE.xml
   |   14 +
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml   
   |   44 +
 src-db/database/sourcedata/OBUIAPP_PARAMETER.xml   
   |   81 +
 src-db/database/sourcedata/OBUIAPP_PROCESS.xml 
   |   20 +
 src-db/database/sourcedata/OBUISEL_SELECTOR.xml
   |   17 +
 src-test/src/org/openbravo/test/AllAntTaskTests.java   
   |6 +-
 
src-test/src/org/openbravo/test/materialMgmt/invoiceFromShipment/InvoiceFromShipmentTest.java
 |  905 ++
 
src-test/src/org/openbravo/test/materialMgmt/invoiceFromShipment/TestUtils.java 
  |  299 +++
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/e834e74a3c1a
changeset: 34947:e834e74a3c1a
user:  Asier Lostalé  openbravo.com>
date:  Thu Nov 08 10:19:51 2018 +0100
summary:   fixed bug 39601: can't execute DB updates after killing a connection

  Audit Trail infrastructure (ad_context_info in PG) is initialized each time a
  new connection is created. We incorrectly assumed a PooledConnection is always
  associated with a single Connection instance, which is not true in case 
Connection
  gets corrupted or killed, in this case Tomcat pool transparently re-associates
  a new connection with existent PooledConnection.

  We are now caching in PooledConnection actual Connection to detect this case
  so it can be initialized again.

details:   https://code.openbravo.com/erp/devel/pi/rev/2ef2c5233cab
changeset: 34948:2ef2c5233cab
user:  Asier Lostalé  openbravo.com>
date:  Thu Nov 08 10:47:32 2018 +0100
summary:   related with bug 39601: minor code cleanup

details:   https://code.openbravo.com/erp/devel/pi/rev/f55cbe0219f9
changeset: 34949:f55cbe0219f9
user:  Asier Lostalé  openbravo.com>
date:  Thu Nov 08 10:57:00 2018 +0100
summary:   related with bug 39601: let it fail if ad_context info couldn't be 
created

details:   https://code.openbravo.com/erp/devel/pi/rev/847353facd72
changeset: 34950:847353facd72
user:  Asier Lostalé  openbravo.com>
date:  Thu Nov 08 10:59:02 2018 +0100
summary:   related with bug 39601: minor code cleanup

diffstat:

 
modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java
 |  99 ++---
 src-core/src/org/openbravo/database/SessionInfo.java   
 |  64 ++---
 2 files changed, 86 insertions(+), 77 deletions(-)

diffs (235 lines):

diff -r 0b6bb996e29d -r 847353facd72 
modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java
--- 
a/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java
   Fri Nov 02 12:54:48 2018 -0400
+++ 
b/modules/org.openbravo.apachejdbcconnectionpool/src/org/openbravo/apachejdbcconnectionpool/ConnectionInitializerInterceptor.java
   Thu Nov 08 10:59:02 2018 +0100
@@ -18,15 +18,15 @@
  */
 package org.openbravo.apachejdbcconnectionpool;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
 import org.apache.tomcat.jdbc.pool.ConnectionPool;
 import org.apache.tomcat.jdbc.pool.JdbcInterceptor;
 import org.apache.tomcat.jdbc.pool.PooledConnection;
-import org.openbravo.base.exception.OBException;
 import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.database.PoolInterceptorProvider;
 import org.openbravo.database.SessionInfo;
@@ -40,6 +40,7 @@
 
   private static final String SESSION_CONFIG_APPLIED = "OB_INITIALIZED";
   private static final String SESSION_INFO_APPLIED = 
"SESSION_INFO_INITIALIZED";
+  private static final String CACHED_CONNECTION = "CACHED_CONNECTION";
 
   String rbdms = (String) 
OBPropertiesProvider.getInstance().getOpenbravoProperties()
   .get("bbdd.rdbms");
@@ -50,46 +51,66 @@
*/
   @Override
   public void reset(ConnectionPool parent, PooledConnection con) {
-if (con != null) {
-  HashMap attributes = con.getAttributes();
-  Boolean sessionInfoApplied = (Boolean) 
attributes.get(SESSION_CONFIG_APPLIED);
-  if (sessionInfoApplied == null || !sessionInfoApplied) {
-PreparedStatement pstmt = null;
-try {
-  final Properties props = 
OBPropertiesProvider.getInstance().getOpenbravoProperties();
-  final String dbSessionConfig = 
props.getProperty("bbdd.sessionConfig");
-  pstmt = con.getConnection().prepareStatement(dbSessionConfig);
-  pstmt.executeQuery();
-} catch (Exception e) {
-  throw new IllegalStateException(e);
-} finally {
-  try {
-if (pstmt != null && !pstmt.isClosed()) {
-  pstmt.close();
-}
-  } catch (SQLException e) {
-throw new OBException(e);
-  }
-}
-attributes.put(SESSION_CONFIG_APPLIED, true);
+if (con == null) {
+  return;
+}
+
+boolean physicalConnectionChanged = hasPhysicalConnectionChanged(con);
+
+Map attributes = con.getAttributes();
+Boolean sessionInfoApplied = (Boolean) 
attributes.get(SESSION_CONFIG_APPLIED);
+if (physicalConnectionChanged || sessionInfoApplied == null || 
!sessionInfoApplied) {
+  final Properties props = 
OBPropertiesProvider.getInstance().getOpenbravoProperties();
+  final String dbSessionConfig = props.getProperty("bbdd.sessionConfig");
+  try (PreparedStatement pstmt = 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/630ac971a56d
changeset: 34186:630ac971a56d
user:  Mark  gmail.com>
date:  Mon Dec 04 18:33:34 2017 -0500
summary:   Fixes issue 37141: Added missed country: Isle of Man

details:   https://code.openbravo.com/erp/devel/pi/rev/e048d67b76d3
changeset: 34187:e048d67b76d3
user:  David Miguelez  openbravo.com>
date:  Fri Jun 08 14:03:19 2018 +0200
summary:   Fixes issue 36651: Clean up of repeated logs found in try-addpayment 
jobs
for Payment's workflows

Functional validations are not logged any more, only not specific exceptions 
are now
logged. Also this fix to avoid to log the same error more than once, 
log4j.error() is
executed only in the processPayment function.

details:   https://code.openbravo.com/erp/devel/pi/rev/cd3262c908aa
changeset: 34188:cd3262c908aa
user:  David Miguelez  openbravo.com>
date:  Fri Jun 08 13:56:01 2018 +0200
summary:   Fixes issue 32862: "Enable Stock Reservations" preference throws an 
error
when a Sales Order is booked

If more than one "Enable Stock Reservations" preference is defined, and are 
specified
to specific users, C_ORDER_POST1 calls AD_GET_PREFERENCE_VALUE function without 
specify
the user, for this reason function throw an exception explaining that 
Preference can't be
found.

To fix that, user is specified when the AD_GET_PREFERENCE_VALUE is called.

details:   https://code.openbravo.com/erp/devel/pi/rev/30563bebf57c
changeset: 34189:30563bebf57c
user:  David Miguelez  openbravo.com>
date:  Tue Jun 12 10:00:05 2018 +0200
summary:   Related to Issue 36651. Code Review changes. Renamed exception
variable names

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
 |  11 +++--
 src-db/database/model/functions/C_ORDER_POST1.xml  
   |   4 +-
 src-db/database/sourcedata/referencedData/C_COUNTRY.xml
   |  20 ++
 3 files changed, 29 insertions(+), 6 deletions(-)

diffs (77 lines):

diff -r 8e28ba8c1eb9 -r 30563bebf57c 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
 Mon Jun 11 13:31:50 2018 +
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
 Tue Jun 12 10:00:05 2018 +0200
@@ -93,7 +93,7 @@
   processPayment(payment, strAction, paymentDate, comingFrom, 
selectedCreditLineIds, doFlush);
   bundle.setResult(msg);
 } catch (Exception e) {
-  log4j.error(e.getMessage());
+  log4j.debug(e.getMessage());
   msg.setType("Error");
   msg.setTitle(OBMessageUtils.messageBD("Error"));
   msg.setMessage(FIN_Utility.getExceptionMessage(e));
@@ -1137,9 +1137,12 @@
   OBContext.restorePreviousMode();
 }
   }
-} catch (final Exception e) {
-  log4j.error(e.getMessage());
-  msg = 
OBMessageUtils.translateError(FIN_Utility.getExceptionMessage(e)).getMessage();
+} catch (final OBException obException) {
+  throw obException;
+} catch (final Exception genericException) {
+  log4j.error(genericException.getMessage(), genericException);
+  msg = 
OBMessageUtils.translateError(FIN_Utility.getExceptionMessage(genericException))
+  .getMessage();
   throw new OBException(msg);
 }
   }
diff -r 8e28ba8c1eb9 -r 30563bebf57c 
src-db/database/model/functions/C_ORDER_POST1.xml
--- a/src-db/database/model/functions/C_ORDER_POST1.xml Mon Jun 11 13:31:50 
2018 +
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml Tue Jun 12 10:00:05 
2018 +0200
@@ -676,7 +676,7 @@
 FROM ad_preference
 WHERE property = 'StockReservations';
 IF (v_count > 1) THEN
-  v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', 
v_client_id, v_org_id, NULL, NULL, NULL);
+  v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', 
v_client_id, v_org_id, v_User, NULL, NULL);
   DBMS_OUTPUT.PUT_LINE('StockReservations preference value: ' || 
v_dummy);
 ELSIF (v_count = 1) THEN
   UPDATE c_orderline
@@ -1308,7 +1308,7 @@
   WHERE property = 'StockReservations';
   IF (v_count > 0) THEN
 IF (v_count > 1) THEN
-  v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', 
v_client_id, v_org_id, NULL, NULL, NULL);
+  v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', 
v_client_id, v_org_id, v_User, NULL, NULL);
   DBMS_OUTPUT.PUT_LINE('StockReservations preference value: ' || 
v_dummy);
 END IF;
 DECLARE
diff -r 8e28ba8c1eb9 -r 30563bebf57c 
src-db/database/sourcedata/referencedData/C_COUNTRY.xml
--- a/src-db/database/sourcedata/referencedData/C_COUNTRY.xml   Mon Jun 11 
13:31:50 2018 +
+++ 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/2db82514d5d5
changeset: 33945:2db82514d5d5
user:  Atul Gaware  openbravo.com>
date:  Wed May 02 23:46:36 2018 +0530
summary:   Fixes Issue 36280:Several unused + probably unusable callouts exists 
and are
candidates to be deleted.

** All the below callouts are not used in internal and external class and
has a low risk to remove them.
** Removed java files for SE_Years_For_Calendar, SE_Calendar_For_Org and
registers in ad_callout.
** Removed java files for SL_Payment_No_Verify, SL_MovementAll_Locator,
SL_Payment_DocType & data xsql file, SL_Payment_Amounts,
SL_WorkRequirement_Sequence & xsql file, SL_Invoice_Tax,
SL_InOutLine_Locator & data xsql file.

details:   https://code.openbravo.com/erp/devel/pi/rev/2663ab08fb3f
changeset: 33946:2663ab08fb3f
user:  Alvaro Ferraz  openbravo.com>
date:  Fri May 11 10:13:35 2018 +0200
summary:   Related to issue 36280: Remove SL_Payment_Amounts_data.xsql

details:   https://code.openbravo.com/erp/devel/pi/rev/19590151cbb2
changeset: 33947:19590151cbb2
user:  Atul Gaware  openbravo.com>
date:  Tue May 08 22:32:12 2018 +0530
summary:   Fixes Issue 0038487:"Suspense balancing" account used when
invoice's total is zero and prepayment exists

Prepayment Amount and Different amount should be posted to
respective customer / vendor prepayment and receivable/payable
accounts when there is difference in between invoice grossamt
(grandtotal) and prepayment amount. Prior to this solution it
was done only when grossamt is greater than prepayment amt.

details:   https://code.openbravo.com/erp/devel/pi/rev/324ddcc5adc9
changeset: 33948:324ddcc5adc9
user:  Atul Gaware  openbravo.com>
date:  Fri May 11 00:45:46 2018 +0530
summary:   Fixes Issue 0038490: Empty error message is shown when processing a
stock reservation without available stock and without attribute set
value

Use COALESCE(TO_CHAR(cur_not_available.attributeName), '') to avoid null
value in the description of attribute set instance with id 0

diffstat:

 src-db/database/model/functions/M_RESERVATION_POST.xml   |
4 +-
 src-db/database/sourcedata/AD_CALLOUT.xml|   
20 -
 src/org/openbravo/erpCommon/ad_callouts/SE_Calendar_For_Org.java |   
99 
 src/org/openbravo/erpCommon/ad_callouts/SE_Years_For_Calendar.java   |  
100 
 src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator.java|   
94 
 src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator_data.xsql   |   
65 ---
 src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Tax.java  |   
96 
 src/org/openbravo/erpCommon/ad_callouts/SL_MovementAll_Locator.java  |   
97 
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts.java  |  
214 --
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts_data.xsql |   
53 --
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType.java  |   
93 
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType_data.xsql |   
49 --
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_No_Verify.java|  
105 
 src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.java |   
88 
 src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.xsql |   
37 -
 src/org/openbravo/erpCommon/ad_forms/DocInvoice.java |
4 +-
 16 files changed, 4 insertions(+), 1214 deletions(-)

diffs (truncated from 1321 to 300 lines):

diff -r 8ba7ab55dd7a -r 324ddcc5adc9 
src-db/database/model/functions/M_RESERVATION_POST.xml
--- a/src-db/database/model/functions/M_RESERVATION_POST.xmlMon May 07 
18:21:59 2018 -0400
+++ b/src-db/database/model/functions/M_RESERVATION_POST.xmlFri May 11 
00:45:46 2018 +0530
@@ -25,7 +25,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) 2012-2017 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  __.
 /
@@ -204,7 +204,7 @@
   AND rs.m_reservation_id = v_reservation_id
   AND rs.m_locator_id IS NOT NULL
   ) LOOP
-RAISE_APPLICATION_ERROR(-2, '@NotEnoughAvailableStock@ : ' || 
cur_not_available.locatorName || ' - ' || cur_not_available.attributeName);
+RAISE_APPLICATION_ERROR(-2, '@NotEnoughAvailableStock@ : ' || 
cur_not_available.locatorName || ' - ' || 
COALESCE(TO_CHAR(cur_not_available.attributeName), ''));
   END LOOP;
   
   -- Check that prereserved quantity is equal all lower than ordered 
quantity
diff -r 8ba7ab55dd7a -r 324ddcc5adc9 src-db/database/sourcedata/AD_CALLOUT.xml
--- a/src-db/database/sourcedata/AD_CALLOUT.xml Mon May 07 18:21:59 2018 -0400
+++ 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/b91caad20e5c
changeset: 33780:b91caad20e5c
user:  Stefan Hühner  openbravo.com>
date:  Sat Feb 10 15:11:46 2018 +0100
summary:   Fixed 37875. Remove unused & broken RptM_Inout report.

That report does not support uuids, so cannot work on any entries since
start of 2.50. As that was never reported that report in fact seems not
used by anybody.

details:   https://code.openbravo.com/erp/devel/pi/rev/4ebe0a2e7d1d
changeset: 33781:4ebe0a2e7d1d
user:  Stefan Hühner  openbravo.com>
date:  Sat Feb 10 15:34:04 2018 +0100
summary:   Fixed 37876. Remove broken & unused RptM_Movement report.

Report does not support uuid's introduced in 2.50 and nobody ever reported.
So in fact it looks not used by anybody.

details:   https://code.openbravo.com/erp/devel/pi/rev/9dd5be4a1bd3
changeset: 33782:9dd5be4a1bd3
user:  Stefan Hühner  openbravo.com>
date:  Sun Feb 11 13:12:12 2018 +0100
summary:   Fixed 37880. Remove broken & obsolete Report RptC_Settlement 
(pre-arpm)

That report is broken since start of 2016 as not updated for api-changes
related to fop library upgrade. No bug was reported during last 2 years
about that.
Apart is related to pre-arpm old payment flow which is not used since start
of 3.0 and only for transactions done before that.

details:   https://code.openbravo.com/erp/devel/pi/rev/ef587ec4fac7
changeset: 33783:ef587ec4fac7
user:  Stefan Hühner  openbravo.com>
date:  Sun Feb 11 13:47:02 2018 +0100
summary:   Fixed 37881. Remove obsolete (pre-aprm) old flow report Promissory 
Note.

That report uses old fop rendering technology and is related to the old
payment flow from before aprm which is mandatory since start of 3.0
It is only referenced in 3 deactivated tabs related to that old flow.

diffstat:

 referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml |  560 
--
 referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml  |  168 
---
 src-db/database/sourcedata/AD_MODEL_OBJECT.xml |   48 -
 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml |  120 
--
 src-db/database/sourcedata/AD_PROCESS.xml  |   93 -
 src-db/database/sourcedata/AD_TAB.xml  |4 -
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml   |  477 

 src/org/openbravo/erpReports/RptC_Settlement.fo|   39 -
 src/org/openbravo/erpReports/RptC_Settlement.java  |   96 -
 src/org/openbravo/erpReports/RptC_Settlement.xml   |   29 -
 src/org/openbravo/erpReports/RptC_SettlementHeader.fo  |   81 -
 src/org/openbravo/erpReports/RptC_SettlementHeader.xml |   33 -
 src/org/openbravo/erpReports/RptC_SettlementLines.fo   |   91 -
 src/org/openbravo/erpReports/RptC_SettlementLines.xml  |   33 -
 src/org/openbravo/erpReports/RptC_Settlement_Header_data.xsql  |   48 -
 src/org/openbravo/erpReports/RptC_Settlement_Lines_data.xsql   |   47 -
 src/org/openbravo/erpReports/RptC_Settlement_data.xsql |   49 -
 src/org/openbravo/erpReports/RptM_Inout.fo |   42 -
 src/org/openbravo/erpReports/RptM_Inout.java   |   97 -
 src/org/openbravo/erpReports/RptM_Inout.xml|   29 -
 src/org/openbravo/erpReports/RptM_InoutHeader.fo   |  130 
--
 src/org/openbravo/erpReports/RptM_InoutHeader.xml  |   38 -
 src/org/openbravo/erpReports/RptM_InoutLines.fo|  141 
--
 src/org/openbravo/erpReports/RptM_InoutLines.xml   |   32 -
 src/org/openbravo/erpReports/RptM_Inout_Header_data.xsql   |   47 -
 src/org/openbravo/erpReports/RptM_Inout_Lines_data.xsql|   47 -
 src/org/openbravo/erpReports/RptM_Inout_data.xsql  |   62 -
 src/org/openbravo/erpReports/RptM_Movement.fo  |   31 -
 src/org/openbravo/erpReports/RptM_Movement.java|   81 -
 src/org/openbravo/erpReports/RptM_Movement.xml |   28 -
 src/org/openbravo/erpReports/RptM_MovementLines.fo |  261 

 src/org/openbravo/erpReports/RptM_MovementLines.xml|   43 -
 src/org/openbravo/erpReports/RptM_Movement_data.xsql   |   79 -
 src/org/openbravo/erpReports/RptPromissoryNote.fo  |   66 -
 src/org/openbravo/erpReports/RptPromissoryNote.java|  218 
---
 src/org/openbravo/erpReports/RptPromissoryNote.xml |   38 -
 src/org/openbravo/erpReports/RptPromissoryNoteAfter.fo |   61 -
 src/org/openbravo/erpReports/RptPromissoryNoteAfter.xml|   74 -
 src/org/openbravo/erpReports/RptPromissoryNoteAfter_data.xsql  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/dd9c043ee2f4
changeset: 33717:dd9c043ee2f4
user:  Atul Gaware  openbravo.com>
date:  Mon Mar 19 23:43:37 2018 +0530
summary:   Related to Issue 0038172:Sample data (F International Group Client)
for 3.0PR18Q2

Changes prior to creating transactions for sample data for 3.0PR18Q2

details:   https://code.openbravo.com/erp/devel/pi/rev/1bf2d3102c9c
changeset: 33718:1bf2d3102c9c
user:  Atul Gaware  openbravo.com>
date:  Tue Mar 20 12:01:14 2018 +0530
summary:   Fixes Issue 38172:Sample data (F International Group Client)
for 3.0PR18Q2

Sample data (F International Group Client) for 3.0PR18Q2 for the
month of Jan., Feb. and Mar. 2018. Following the "How to evolve F"
document instructions transactions created for 3.0PR18Q2 release.

details:   https://code.openbravo.com/erp/devel/pi/rev/3ba8c94f1fc1
changeset: 33719:3ba8c94f1fc1
user:  Víctor Martínez Romanos  openbravo.com>
date:  Wed Mar 21 18:23:45 2018 +0100
summary:   Related to Issue 38172: Removed useless amortization records

details:   https://code.openbravo.com/erp/devel/pi/rev/325935d2204e
changeset: 33720:325935d2204e
user:  Víctor Martínez Romanos  openbravo.com>
date:  Wed Mar 21 18:40:55 2018 +0100
summary:   Related to Issue 38172: Added Referenced Inventory Sampledata

Created a Big Box in España Norte with 1 box transactions and 1 partial unbox 
transaction.
The Box has two contents:
 * 1 Unit Vino Tinto 0,75L
 * 1 Unit Zumo de Naranja Bio 0,33L with Lot L0803

diffstat:

 referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml
 |   1210 +-
 referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml   
 |106 +-
 referencedata/sampledata/F_B_International_Group/AD_USER.xml   
 | 48 +-
 referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml  
 |560 +
 referencedata/sampledata/F_B_International_Group/A_AMORTIZATION.xml
 |190 -
 referencedata/sampledata/F_B_International_Group/A_AMORTIZATIONLINE.xml
 |180 -
 referencedata/sampledata/F_B_International_Group/A_ASSET.xml   
 |  4 +-
 referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml
 | 74 +-
 referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml 
 | 36 +
 referencedata/sampledata/F_B_International_Group/C_INVOICE.xml 
 |   3862 +-
 referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml 
 |   9016 +
 referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml  
 |   4410 +
 referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml  
 |   1020 +
 referencedata/sampledata/F_B_International_Group/C_ORDER.xml   
 |   2286 +
 referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml   
 |  10365 ++
 referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml
 |   3757 +
 referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml
 |576 +
 referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml  
 |180 +
 referencedata/sampledata/F_B_International_Group/C_PERIOD.xml  
 |432 +
 referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL.xml   
 |  16128 +++
 referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL_LOG.xml   
 |456 +
 referencedata/sampledata/F_B_International_Group/C_YEAR.xml
 | 34 +
 referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml 
 |  49547 +-
 referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml 
 | 44 +
 referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml 
 |   1260 +
 referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml
 |   1794 +
 referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml 
 | 13 +-
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml   
 |   2046 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml
 |   1024 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml  
 |174 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml   
 |690 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml  
 |   2346 +-
 
referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml 
|   1330 +-
 referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml
 | 58 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml
 |108 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml   
 | 82 +-
 referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/91cc3fec7716
changeset: 33602:91cc3fec7716
user:  Stefan Hühner  openbravo.com>
date:  Sun Feb 18 19:15:11 2018 +0100
summary:   Issue 37964. Fix most of new JDK9 BigDecimal related deprecation 
warnings.

All changes are:
- BigDecimal.ROUND_HALF_UP -> RoundingMode.HALF_UP
- BigDecimal.ROUND_HALF_EVEN -> RoundingMode.HALF_EVEN
- BigDecimal.ROUND_CEILING -> RoundingMode.CEILING
- Adding java.math.RoundingMode import when required

details:   https://code.openbravo.com/erp/devel/pi/rev/bdaaadb9d483
changeset: 33603:bdaaadb9d483
user:  David Miguelez  openbravo.com>
date:  Thu Feb 22 10:49:57 2018 +0100
summary:   Related to Issue 37964. While setting the precission for a 
BigDecimal,
use the RoundingMode class to retrieve the precission instead of setting
the constant value manually. It makes the code easier to read by using
RoundingMode

details:   https://code.openbravo.com/erp/devel/pi/rev/5312e8108397
changeset: 33604:5312e8108397
user:  David Miguelez  openbravo.com>
date:  Thu Feb 22 11:33:30 2018 +0100
summary:   Related to Issue 37964.

Added missing RoundingMode (it was a mistake done by the developer, it was
intended to round to 2 decimals)
Changed wrong Logger class definitions

details:   https://code.openbravo.com/erp/devel/pi/rev/86709bedb772
changeset: 33605:86709bedb772
user:  Stefan Hühner  openbravo.com>
date:  Thu Feb 22 11:46:45 2018 +0100
summary:   Fixed 37965. Fix new jdk9 deprecation warnings (new Long, new 
Integer,...)

Replace the now deprecated constructors by equivalent use of
- typed constant: i.e. 10 by 10L (typed long)
- autoboxing
- Long Long.valueOf, long Long.parseInt

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/DoubtFulDebtPickEditLines.java
 |3 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
  |4 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java
   |8 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java
 |2 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ElementValueEventHandler.java
  |6 +-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
|4 +-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
 |   17 +-
 src-test/src/org/openbravo/advpaymentmngt/test/FundsTransferTest.java  
|7 +-
 src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_02.java 
|6 +-
 src-test/src/org/openbravo/advpaymentmngt/test/PaymentTest_03.java 
|2 +-
 src-test/src/org/openbravo/advpaymentmngt/test/TestUtility.java
|4 +-
 src-test/src/org/openbravo/test/costing/utils/TestCostingUtils.java
|  221 +
 src-test/src/org/openbravo/test/taxes/TaxesTest.java   
|3 +-
 src/org/openbravo/common/actionhandler/OrderCreatePOLines.java 
|5 +-
 src/org/openbravo/common/actionhandler/SRMOPickEditLines.java  
|5 +-
 src/org/openbravo/common/actionhandler/ServiceOrderLineRelate.java 
|2 +-
 src/org/openbravo/common/actionhandler/SetNewBPCurrency.java   
|4 +-
 
src/org/openbravo/common/actionhandler/copyfromorderprocess/UpdatePricesAndAmounts.java
|   11 +-
 src/org/openbravo/costing/AverageAlgorithm.java
|2 +-
 src/org/openbravo/costing/CostingMigrationProcess.java 
|9 +-
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java   
|9 +-
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.java 
|   11 +-
 src/org/openbravo/erpCommon/ad_actionButton/CreateFile.java
  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/79530e9c288f
changeset: 33214:79530e9c288f
user:  Nono Carballo  gmail.com>
date:  Mon Jan 22 12:12:44 2018 +0100
summary:   Fixes issue 34840: Movement Qty column info not updated once a 
product with stock
is selected in Goods Shipment if Alt UOM Preference is enable.

Operative Quantity field isautomatically populated if the selected product
do not have a default Alternative UOM configured and the product has
quantity on hand.

details:   https://code.openbravo.com/erp/devel/pi/rev/85c01f98ce20
changeset: 33215:85c01f98ce20
user:  David Miguelez  openbravo.com>
date:  Mon Jan 22 12:30:04 2018 +0100
summary:   Related to issue 34840: Code Review changes

* Added final modifier to product object again
* Removed unused methods
* When setting the AUM, set also the Quantity expresed in AUM
  and for that, convert the original quantity to the AUM equivalent.

details:   https://code.openbravo.com/erp/devel/pi/rev/208045acad06
changeset: 33216:208045acad06
user:  Nono Carballo  gmail.com>
date:  Mon Jan 22 12:49:49 2018 +0100
summary:   Fixes issue 34841: RTV shipment (Pick/Edit Lines) not properly 
working if
Returned UOM is changed from Unit to Pallet.

When changing Ship Qty and then returned Uom, just pending field is updated,
showing the pending quantity expressed in returned Uom.

Same behaviour in Return Material Receipt window.

details:   https://code.openbravo.com/erp/devel/pi/rev/889d74074bf0
changeset: 33217:889d74074bf0
user:  David Miguelez  openbravo.com>
date:  Wed Jan 24 16:21:27 2018 +0100
summary:   Related to Issue 34840. Change done to reload the qty in stock for a 
product
instead of 0 after the line has been saved

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
 |  12 +++---
 src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java  
|  19 +++--
 2 files changed, 21 insertions(+), 10 deletions(-)

diffs (99 lines):

diff -r b39a4d259c57 -r 889d74074bf0 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
Wed Jan 24 13:09:52 2018 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
Wed Jan 24 16:21:27 2018 +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-2016 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  __.
  
@@ -242,8 +242,6 @@
 record = grid.getSelectedRecord();
   }
   if (item.pickList.getSelection()[0].id !== item.getValue()) {
-grid.setEditValue(item.grid.getEditRow(), 'movementQuantity', 
record.pendingQtyInAUM);
-record.movementQuantity = record.pendingQtyInAUM;
 var pending = record.pending;
 grid.setEditValue(item.grid.getEditRow(), 'pending', 
record.pendingQtyInAUM);
 record.pending = record.pendingQtyInAUM;
@@ -252,7 +250,7 @@
 grid.setEditValue(item.grid.getEditRow(), 'availableQty', 
record.availableQtyInAUM);
 record.availableQty = record.availableQtyInAUM;
 record.availableQtyInAUM = availableQty;
-grid.setEditValue(item.grid.getEditRow(), 'returnedUOM', 
record.pendingQtyInAUM);
+grid.setEditValue(item.grid.getEditRow(), 'returnedUOM', 
item.pickList.getSelection()[0].id);
 record.returnedUOM = item.pickList.getSelection()[0].id;
   }
 };
@@ -262,13 +260,15 @@
  */
 OB.RM.RMReceiptQtyValuesChange = function (item, view, form, grid) {
   var record = grid.getSelectionObject().lastSelectionItem;
+  if (typeof record === 'undefined') {
+record = grid.getSelectedRecord();
+  }
   if (item.pickList.getSelection()[0].id !== item.getValue()) {
-grid.setEditValue(item.grid.getEditRow(), 'receiving', 
record.pendingQtyInAUM);
-record.receiving = record.pendingQtyInAUM;
 var pending = record.pending;
 grid.setEditValue(item.grid.getEditRow(), 'pending', 
record.pendingQtyInAUM);
 record.pending = record.pendingQtyInAUM;
 record.pendingQtyInAUM = pending;
+grid.setEditValue(item.grid.getEditRow(), 'returnedUOM', 
item.pickList.getSelection()[0].id);
 record.returnedUOM = item.pickList.getSelection()[0].id;
   }
 };
\ No newline at end of file
diff -r b39a4d259c57 -r 889d74074bf0 
src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java Wed Jan 
24 13:09:52 2018 +0100
+++ 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/6fc5c9829dff
changeset: 33189:6fc5c9829dff
user:  David Miguelez  openbravo.com>
date:  Mon Jan 15 12:58:08 2018 +0100
summary:   Fixes Issue 37279. Corrects Transactions affected by Average cost 
adjustments

When a Cost Adjustment is created, some transactions are affected by this change
For Average Cost adjustment, the transactions that modifies the average cost,
but has used the actual average cost in it's calculation must be taken into
account.

details:   https://code.openbravo.com/erp/devel/pi/rev/77e3e788178b
changeset: 33190:77e3e788178b
user:  David Miguelez  openbravo.com>
date:  Wed Jan 17 16:50:04 2018 +0100
summary:   Related to Issue 37279. Fixes automated test after fixing issue:

* Changed amounts of automated test LC3LC4
* Changed logic asserting the distributed amount of a Landed Cost between
  it's related Recipt lines
* For each transacion it calculates it's cost as the original Transaction
  Cost plus the Cost of the previous Unit Cost adjustments
* Reload and refresh the Landed Cost object when needed
* Add isNeedPosting variable to costAdjustmentAssertLine and use it to check
  if a transaction has been posted or not

details:   https://code.openbravo.com/erp/devel/pi/rev/a773422cce1f
changeset: 33191:a773422cce1f
user:  Nono Carballo  gmail.com>
date:  Wed Jan 17 16:56:19 2018 +0100
summary:   Added test for issue 32729

details:   https://code.openbravo.com/erp/devel/pi/rev/7918fd33ee23
changeset: 33192:7918fd33ee23
user:  David Miguelez  openbravo.com>
date:  Wed Jan 17 17:05:17 2018 +0100
summary:   Related to Issue 32729. Code Review changes

Improvmentes in automated tests:
* Set more meaningful names
* Avoid Dal refresh when possible
* Set final to parameters in methods when possible

diffstat:

 src-test/src/org/openbravo/test/costing/TestCosting.java |  787 --
 src/org/openbravo/costing/AverageCostAdjustment.java |   55 +
 2 files changed, 723 insertions(+), 119 deletions(-)

diffs (truncated from 1219 to 300 lines):

diff -r 120a6a75f9b7 -r 7918fd33ee23 
src-test/src/org/openbravo/test/costing/TestCosting.java
--- a/src-test/src/org/openbravo/test/costing/TestCosting.java  Tue Jan 16 
17:16:51 2018 +0100
+++ b/src-test/src/org/openbravo/test/costing/TestCosting.java  Wed Jan 17 
17:05:17 2018 +0100
@@ -19,8 +19,10 @@
 
 package org.openbravo.test.costing;
 
+import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Method;
@@ -30,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -48,6 +51,7 @@
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.structure.BaseOBObject;
+import org.openbravo.base.weld.WeldUtils;
 import org.openbravo.base.weld.test.WeldBaseTest;
 import org.openbravo.costing.CancelCostAdjustment;
 import org.openbravo.costing.CostingBackground;
@@ -62,12 +66,14 @@
 import org.openbravo.costing.ReactivateLandedCost;
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.core.SessionHandler;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
 import org.openbravo.database.ConnectionProvider;
 import org.openbravo.erpCommon.ad_forms.AcctServer;
 import org.openbravo.erpCommon.ad_process.VerifyBOM;
+import org.openbravo.materialmgmt.InventoryCountProcess;
 import org.openbravo.model.ad.access.User;
 import org.openbravo.model.ad.datamodel.Table;
 import org.openbravo.model.ad.process.ProcessInstance;
@@ -112,11 +118,13 @@
 import org.openbravo.model.materialmgmt.cost.LandedCost;
 import org.openbravo.model.materialmgmt.cost.LandedCostCost;
 import org.openbravo.model.materialmgmt.cost.TransactionCost;
+import org.openbravo.model.materialmgmt.onhandquantity.StorageDetail;
 import org.openbravo.model.materialmgmt.transaction.InternalConsumption;
 import org.openbravo.model.materialmgmt.transaction.InternalConsumptionLine;
 import org.openbravo.model.materialmgmt.transaction.InternalMovement;
 import org.openbravo.model.materialmgmt.transaction.InternalMovementLine;
 import org.openbravo.model.materialmgmt.transaction.InventoryCount;
+import org.openbravo.model.materialmgmt.transaction.InventoryCountLine;
 import org.openbravo.model.materialmgmt.transaction.MaterialTransaction;
 import org.openbravo.model.materialmgmt.transaction.ProductionLine;
 import org.openbravo.model.materialmgmt.transaction.ProductionPlan;
@@ -140,6 +148,9 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/da1ddbd84387
changeset: 33173:da1ddbd84387
user:  David Miguelez  openbravo.com>
date:  Thu Jan 04 12:50:12 2018 +0100
summary:   Fixes issue 34628: Manage variants can return unexpected values

When filtering concurrently in Manage Variants P, it was possible to obtain
incorrect values. This is caused because ManageVariantsDS is not thread safe it
is used as singleton but it has state variables that can be messed up by
different threads.

The global state variables has been removed and now their values are contained
in a new private class. A new instance of this class is created for every 
execution
of the process, so the values are not mixed again.

The getData and readCriteria methods have been modified to make use of this new
class.

details:   https://code.openbravo.com/erp/devel/pi/rev/add922deb584
changeset: 33174:add922deb584
user:  David Miguelez  openbravo.com>
date:  Thu Jan 04 12:54:31 2018 +0100
summary:   Related to Issue 34628. Updated license year

details:   https://code.openbravo.com/erp/devel/pi/rev/5b6a22a83186
changeset: 33175:5b6a22a83186
user:  David Miguelez  openbravo.com>
date:  Thu Jan 04 13:35:03 2018 +0100
summary:   Fixes issue 34497: CostingTransactionsHQLTransformer class is not 
thread safe

The orgs and costDimensions fields is now local variable for the 
transformHqlQuery
method to avoid concurrent modification access when being executed by different
threads in parallel

A refactor was made including the previous fields as method args when it needed

details:   https://code.openbravo.com/erp/devel/pi/rev/cd520d72489f
changeset: 33176:cd520d72489f
user:  David Miguelez  openbravo.com>
date:  Thu Jan 04 13:36:24 2018 +0100
summary:   Relate to Issue 34497: Several minor improvements to the code:

* Updated license year
* Changed StringBuffers with StringBuilders
* Set the names of the constants to uppercase
* Removed unnecessary comparison in if clause
* Use .isEmpty() instead of .size() > 0

diffstat:

 src/org/openbravo/common/datasource/CostingTransactionsHQLTransformer.java |   
94 +++---
 src/org/openbravo/materialmgmt/ManageVariantsDS.java   |  
121 +++--
 2 files changed, 134 insertions(+), 81 deletions(-)

diffs (truncated from 450 to 300 lines):

diff -r ad429b2b7700 -r cd520d72489f 
src/org/openbravo/common/datasource/CostingTransactionsHQLTransformer.java
--- 
a/src/org/openbravo/common/datasource/CostingTransactionsHQLTransformer.java
Tue Dec 19 17:40:09 2017 +0100
+++ 
b/src/org/openbravo/common/datasource/CostingTransactionsHQLTransformer.java
Thu Jan 04 13:36:24 2018 +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) 2015 Openbravo SLU
+ * All portions are Copyright (C) 2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  __.
  *
@@ -42,18 +42,19 @@
 @ComponentProvider.Qualifier("DFF0A9F7C26C457FA8735A09ACFD5971")
 public class CostingTransactionsHQLTransformer extends HqlQueryTransformer {
 
-  private static final String propADListPriority = 
org.openbravo.model.ad.domain.List.PROPERTY_SEQUENCENUMBER;
-  private static final String propADListReference = 
org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE;
-  private static final String propADListValue = 
org.openbravo.model.ad.domain.List.PROPERTY_SEARCHKEY;
-  private static final String MovementTypeRefID = "189";
-  private Set orgs = null;
-  private Map costDimensions = null;
+  private static final String PROP_ADLIST_PRIORITY = 
org.openbravo.model.ad.domain.List.PROPERTY_SEQUENCENUMBER;
+  private static final String PROP_ADLIST_REFERENCE = 
org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE;
+  private static final String PROP_ADLIST_VALUE = 
org.openbravo.model.ad.domain.List.PROPERTY_SEARCHKEY;
+  private static final String MOVEMENTTYPE_REF_ID = "189";
 
   @Override
   public String transformHqlQuery(String hqlQuery, Map 
requestParameters,
   Map queryNamedParameters) {
 // Sets the named parameters
 
+Set orgs = null;
+Map costDimensions = null;
+
 final String costingId = requestParameters.get("@MaterialMgmtCosting.id@");
 String transformedHqlQuery = null;
 
@@ -85,22 +86,23 @@
   }
 }
 
-Costing prevCosting = getPreviousCosting(transaction);
+Costing prevCosting = getPreviousCosting(transaction, orgs, 
costDimensions);
 
-if (prevCosting == null || (prevCosting != null && 
"AVA".equals(prevCosting.getCostType( {
+if (prevCosting == null || "AVA".equals(prevCosting.getCostType())) {
 
   // Transform the query
   String 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/3d2566d2bf35
changeset: 33169:3d2566d2bf35
user:  David Miguelez  openbravo.com>
date:  Tue Dec 19 15:40:18 2017 +0100
summary:   Fixes Issue 37482. Remove unused variables in PL's

details:   https://code.openbravo.com/erp/devel/pi/rev/68d09ac13f38
changeset: 33170:68d09ac13f38
user:  David Miguelez  openbravo.com>
date:  Tue Dec 19 15:40:46 2017 +0100
summary:   Related to Issue 37482. Revert variables that has been removed and 
use them
in the error message. Also updated copyrights

details:   https://code.openbravo.com/erp/devel/pi/rev/00155f72a180
changeset: 33171:00155f72a180
user:  David Miguelez  openbravo.com>
date:  Tue Dec 19 16:08:53 2017 +0100
summary:   Related to Issue 37482. Removed unused variable and code in PL.
The check for stock consistency is done by the call to the
m_check_stock function

details:   https://code.openbravo.com/erp/devel/pi/rev/ad429b2b7700
changeset: 33172:ad429b2b7700
user:  David Miguelez  openbravo.com>
date:  Tue Dec 19 17:40:09 2017 +0100
summary:   Related to Issue 37482. Removed unnecessary comment and added a 
deleted
variable to include it in the returned error message

diffstat:

 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
 |   6 --
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml
 |   6 --
 src-db/database/model/functions/A_ASSET_CREATE.xml 
   |   2 -
 src-db/database/model/functions/A_ASSET_POST.xml   
   |  26 +-
 src-db/database/model/functions/C_CHANGEPROJECTSTATUS.xml  
   |   2 -
 src-db/database/model/functions/C_DEBT_PAYMENT_BALANCING_REP.xml   
   |   7 +-
 src-db/database/model/functions/C_DP_MANAGEMENT_POST.xml   
   |   3 -
 src-db/database/model/functions/C_INVOICELINE_TAX.xml  
   |   7 +--
 src-db/database/model/functions/C_INVOICE_CANCEL.xml   
   |   2 -
 src-db/database/model/functions/C_INVOICE_CREATE.xml   
   |   9 +--
 src-db/database/model/functions/C_INVOICE_POST.xml 
   |  13 +
 src-db/database/model/functions/C_ORDER_POST1.xml  
   |  16 --
 src-db/database/model/functions/C_SETTLEMENT_POST.xml  
   |  13 +---
 src-db/database/model/functions/C_TAXPAYMENT_POST.xml  
   |   5 +-
 src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml   
   |   6 --
 src-db/database/model/functions/FACT_ACCT_RESET.xml
   |  12 
 src-db/database/model/functions/GL_JOURNAL_POST.xml
   |   5 +-
 src-db/database/model/functions/MA_PRODUCTION_COST.xml 
   |  10 +--
 src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml  
   |   5 +-
 src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml 
   |  25 +
 src-db/database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml   
   |   2 -
 src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml 
   |   7 +-
 src-db/database/model/functions/MA_WRPHASE_CLOSE.xml   
   |   2 -
 src-db/database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml 
   |   2 -
 src-db/database/model/functions/M_FREIGHT_CALCULATE.xml
   |   4 -
 src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml   
   |   2 -
 src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml  
   |   2 -
 src-db/database/model/functions/M_GET_STOCK_PARAM.xml  
   |   2 +-
 src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml  
   |   6 +-
 src-db/database/model/functions/M_INOUT_CREATE.xml 
   |   2 -
 src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml  
   |   5 +-
 src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml   
   |   8 ---
 src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml 
   |   9 +-
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/428b379554bc
changeset: 33084:428b379554bc
user:  Armaignac  gmail.com>
date:  Mon Nov 20 14:43:52 2017 -0500
summary:   Fixes issue 37314: Gross Unit Price is updated to 0 if a sales 
invoice line from
a Return Material Receipt is modified and price includes taxes

When invoicing from a Return Material Receipt related to a price list with
price include taxes to Y the order line doesn't take into account the base gross
unit price

Now when creating an order line in the Return From Customer process the base
gross unit price value is computed and saved

details:   https://code.openbravo.com/erp/devel/pi/rev/a1200492f268
changeset: 33085:a1200492f268
user:  David Miguelez  openbravo.com>
date:  Tue Nov 28 18:03:42 2017 +0100
summary:   Related to Issue 37314. Code Review changes.

If no unit price in the line selected, assign the standard price
to the base gross unit price

details:   https://code.openbravo.com/erp/devel/pi/rev/7ce264deda38
changeset: 33086:7ce264deda38
user:  Nono Carballo  gmail.com>
date:  Tue Nov 28 18:05:00 2017 +0100
summary:   Fixes issue 37302: Process Price Difference Correction fails with 
n.p.e. or
create wrong Cost Adjustment Documents when it works

Price Difference Adjustment process is invoked for legal organizations.

When invoked from manual process, the legal organization(s) of selected
organization is retrieved, the process is invoked for that legal organization
in order to the Cost Adjustment Document be created with the legal organization
in the header, and lines for transaction belonging to organizations under it.

When invoked from the background process, the process is invoked for legal
organizations under organization "*".

When invoked from the Costing Background process, the legal organization of the
transaction organization is retrieved, and is used to invoke the process.

details:   https://code.openbravo.com/erp/devel/pi/rev/741f87599303
changeset: 33087:741f87599303
user:  David Miguelez  openbravo.com>
date:  Tue Nov 28 18:28:16 2017 +0100
summary:   Related to Issue 37302. Code Review Changes. Improved Java Doc

diffstat:

 src/org/openbravo/common/actionhandler/SRMOPickEditLines.java |   7 +-
 src/org/openbravo/costing/PriceDifferenceBackground.java  |  12 +-
 src/org/openbravo/costing/PriceDifferenceByDateProcess.java   |  73 
 src/org/openbravo/costing/PriceDifferenceProcess.java |  66 +--
 src/org/openbravo/costing/PriceDifferenceUtil.java|  91 +++
 5 files changed, 190 insertions(+), 59 deletions(-)

diffs (truncated from 448 to 300 lines):

diff -r 754d0d843ec5 -r 741f87599303 
src/org/openbravo/common/actionhandler/SRMOPickEditLines.java
--- a/src/org/openbravo/common/actionhandler/SRMOPickEditLines.java Thu Nov 
30 09:04:32 2017 +0100
+++ b/src/org/openbravo/common/actionhandler/SRMOPickEditLines.java Tue Nov 
28 18:28:16 2017 +0100
@@ -244,8 +244,8 @@
   newOrderLine.setTax(tax);
 
   // Price
-  BigDecimal unitPrice, netPrice, grossPrice, stdPrice, limitPrice, 
grossAmt, netListPrice, grossListPrice;
-  stdPrice = BigDecimal.ZERO;
+  BigDecimal unitPrice, netPrice, grossPrice, stdPrice, limitPrice, 
grossAmt, netListPrice, grossListPrice, baseGrossUnitPrice;
+  stdPrice = baseGrossUnitPrice = BigDecimal.ZERO;
   final int stdPrecision = 
order.getCurrency().getStandardPrecision().intValue();
 
   if (selectedLine.get("unitPrice").equals(null) || 
"".equals(selectedLine.get("unitPrice"))) {
@@ -257,6 +257,7 @@
   netListPrice = pp.getListPrice();
   grossListPrice = pp.getListPrice();
   stdPrice = pp.getStandardPrice();
+  baseGrossUnitPrice = pp.getStandardPrice();
 } catch (OBException e) {
   // Product not found in price list. Prices default to ZERO
   unitPrice = limitPrice = netListPrice = grossListPrice = stdPrice = 
BigDecimal.ZERO;
@@ -268,6 +269,7 @@
   netListPrice = shipmentLine.getSalesOrderLine().getListPrice();
   grossListPrice = 
shipmentLine.getSalesOrderLine().getGrossListPrice();
   stdPrice = shipmentLine.getSalesOrderLine().getStandardPrice();
+  baseGrossUnitPrice = 
shipmentLine.getSalesOrderLine().getBaseGrossUnitPrice();
 } else {
   limitPrice = netListPrice = grossListPrice = stdPrice = unitPrice;
 }
@@ -292,6 +294,7 @@
   
newOrderLine.setLineNetAmount(netPrice.multiply(qtyReturned).setScale(stdPrecision,
   BigDecimal.ROUND_HALF_UP));
   newOrderLine.setLineGrossAmount(grossAmt);
+  newOrderLine.setBaseGrossUnitPrice(baseGrossUnitPrice);
 
   if (!selectedLine.get("returnReason").equals(null)) {
 
newOrderLine.setReturnReason(OBDal.getInstance().get(ReturnReason.class,
diff -r 754d0d843ec5 -r 741f87599303 
src/org/openbravo/costing/PriceDifferenceBackground.java
--- 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/ef2a84e698c4
changeset: 32616:ef2a84e698c4
user:  Mark  gmail.com>
date:  Mon Sep 04 12:44:00 2017 -0400
summary:   Fixes issue 36776: Amounts in invoice lines and taxes rounded to 
price precision
instead of standard precision in Create Lines From process.

In CreateFrom class, the price precision was used for rounding amounts instead 
of
standard precision and it was causing differences with totals when invoices were
created from orders or shipments.

Now all prices are rounded with the price precision of it currency and amounts
with standard precision.

details:   https://code.openbravo.com/erp/devel/pi/rev/f103322dedd4
changeset: 32617:f103322dedd4
user:  Alvaro Ferraz  openbravo.com>
date:  Tue Sep 05 12:37:04 2017 +0200
summary:   Related to issue 36776: Code review improvements

Retrieve currency standard precision instead of price precision in 
selectFromPO, selectFromPOUpdate, selectFromPOUpdateSOTrx and selectPriceList 
methods.
Do not round price actual with price precision when calculating line net amount.
Remove unused priceprecision variable.
Use data variable to retrieve currency standard precision when creating invoice 
from order and dataAux variable when creating invoice from receipt/shipment.

details:   https://code.openbravo.com/erp/devel/pi/rev/f9e08035b10d
changeset: 32618:f9e08035b10d
user:  Mark  gmail.com>
date:  Mon Sep 04 15:09:05 2017 -0400
summary:   Fixes issue 36705: More than one pending payment plan detail for 
same invoice
payment plan

When the payment schedule details were generated it was comparing the invoiced
amount of related order with the sum of lineNetAmt + taxAmt of it lines, as tax
calculation can be done at document level, and this sum is done at line level it
is possible that exists differences between this sum and totals already rounded
in the invoice.

Also was considered an order completely invoiced if it dosn't has lines with 
ordered
quatities different than invoiced. When exists orders with lines with 
lineNetAmt = 0
it was taking it as completed invoiced and then the whole amount of the psd was 
included
in the invoice and it generates a difference between the total of document and 
the sum of the
lines that was created as a new payment schedule detail.

To avoid this situation, only are considered order lines with lineNetAmt 
different than zero
to use the whole amount of the psd or to re-calculate the correct amounts from 
Payment
Schedule and Payment Schedule Details related to the order and invoices.

details:   https://code.openbravo.com/erp/devel/pi/rev/40185fb2080e
changeset: 32619:40185fb2080e
user:  Alvaro Ferraz  openbravo.com>
date:  Tue Sep 05 13:38:02 2017 +0200
summary:   Related to issue 36705: Code review improvements

Apply same fix in purchase flow.

diffstat:

 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
 |   2 +
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
   |  32 -
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql   
   |  12 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diffs (141 lines):

diff -r 2873be0d1b66 -r 40185fb2080e 
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
 Mon Sep 04 14:03:39 2017 +0530
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
 Tue Sep 05 13:38:02 2017 +0200
@@ -392,6 +392,7 @@
 SELECT COALESCE(COUNT(*),0) INTO v_Count
 FROM c_orderline
 WHERE qtyordered <> (qtyinvoiced*v_MultiplierARC)
+  AND linenetamt <> 0
   AND c_order_id = order_schdet.order_id;
   ELSE
 SELECT count(*) INTO v_count
@@ -401,6 +402,7 @@
LEFT JOIN m_matchpo mpo ON ol.c_orderline_id = 
mpo.c_orderline_id
   AND mpo.c_invoiceline_id IS 
NOT NULL
   WHERE ol.c_order_id = order_schdet.order_id
+AND ol.linenetamt <> 0
   GROUP BY ol.c_orderline_id, ol.qtyordered) a
 WHERE a.qtyordered != (a.matchedqty*v_MultiplierARC);
   END IF;
diff -r 2873be0d1b66 -r 40185fb2080e 
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java   Mon Sep 
04 14:03:39 2017 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java   Tue Sep 
05 13:38:02 2017 +0200
@@ -1671,12 +1671,6 @@
   }
 }
 
-final int curPrecision;
-if (strType.equals("SHIPMENT")) {
-  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/b8a0e333c8f2
changeset: 32425:b8a0e333c8f2
user:  Víctor Martínez Romanos  openbravo.com>
date:  Fri Jul 07 09:11:46 2017 +0200
summary:   Fixed issue 36430: Cleanup bad logging (printStackTrace, 
System.*.print.*)

Pushed on Stefan's behalf

Removed usage of printStackTrace and System.*.print.* and tranform them to 
log4j.error

details:   https://code.openbravo.com/erp/devel/pi/rev/918cd718f0f3
changeset: 32426:918cd718f0f3
user:  Víctor Martínez Romanos  openbravo.com>
date:  Fri Jul 07 09:36:56 2017 +0200
summary:   Fixed issue 36430: Cleanup bad logging (printStackTrace, 
System.*.print.*)

Replaced to log.error() calls where necessary

details:   https://code.openbravo.com/erp/devel/pi/rev/47aab9353bb6
changeset: 32427:47aab9353bb6
user:  Víctor Martínez Romanos  openbravo.com>
date:  Fri Jul 07 09:39:49 2017 +0200
summary:   Fixed issue 36430: removed bad usage even in examples

details:   https://code.openbravo.com/erp/devel/pi/rev/b4290824ae05
changeset: 32428:b4290824ae05
user:  Víctor Martínez Romanos  openbravo.com>
date:  Fri Jul 07 10:43:24 2017 +0200
summary:   Fixed issue 36436: Avoid using Vector for single type of data

Changeset pushed on Stefan's behalf

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
   |   7 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
 |  20 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java
   |   9 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java
   |   9 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java
|   8 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java
  |   6 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
   |   3 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java
 |   5 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
   |   6 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java
   |   6 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java
|   6 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionModify.java
|   6 +-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
 |   8 +-
 src/org/openbravo/common/hooks/InventoryStatusValidationHook.java  
 |   2 +-
 src/org/openbravo/common/hooks/OrderLineQtyChangedHook.java
 |   5 +-
 src/org/openbravo/erpCommon/ad_process/CreateTaxReport.java
 |  13 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java 
 |  34 ++--
 src/org/openbravo/erpCommon/businessUtility/AccountTree.java   
 |  64 +-
 src/org/openbravo/erpCommon/businessUtility/COAUtility.java
 |   4 +-
 src/org/openbravo/erpCommon/businessUtility/Tax.java   
 |  28 +
 20 files changed, 115 insertions(+), 134 deletions(-)

diffs (truncated from 941 to 300 lines):

diff -r 36b24dd5e2ff -r b4290824ae05 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
 Fri Jul 07 12:28:04 2017 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
 Fri Jul 07 10:43:24 2017 +0200
@@ -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) 2010-2014 Openbravo SLU
+ * All portions are Copyright (C) 2010-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  __.
  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/80dc9ed3cec0
changeset: 32336:80dc9ed3cec0
user:  David Miguelez  openbravo.com>
date:  Thu Jun 08 12:39:20 2017 +0200
summary:   Fixes Issue 36199. Adds several Units of Measure to the dataset

details:   https://code.openbravo.com/erp/devel/pi/rev/cdc61ae0f9ff
changeset: 32337:cdc61ae0f9ff
user:  David Miguelez  openbravo.com>
date:  Thu Jun 08 12:40:07 2017 +0200
summary:   Fixes Issue 36200. Adds Uom Conversion Table to the UOM Dataset.

details:   https://code.openbravo.com/erp/devel/pi/rev/515bcf15a54b
changeset: 32338:515bcf15a54b
user:  David Miguelez  openbravo.com>
date:  Thu Jun 08 12:42:00 2017 +0200
summary:   Fixes Issue 36201. Do not allow to edit a conversion rate from a 
generic UOM

* Added an auxilary input to know if there is a generic conversion already
* Added a readonly logic based on the previous auxiliary input

details:   https://code.openbravo.com/erp/devel/pi/rev/01ae69f28d45
changeset: 32339:01ae69f28d45
user:  David Miguelez  openbravo.com>
date:  Thu Jun 08 12:46:41 2017 +0200
summary:   Fixes Issue 36203. Changes definition of some columns

* Changes the position of some columns related with Production flow
* Set the StoredInSession flag = Y for locator, attribute and uom of the
  Storage Detail Table

diffstat:

 referencedata/standard/Unit_of_Measure.xml  |  1097 ++-
 src-db/database/sourcedata/AD_AUXILIARINPUT.xml |11 +
 src-db/database/sourcedata/AD_COLUMN.xml|21 +-
 src-db/database/sourcedata/AD_DATASET.xml   | 2 +-
 src-db/database/sourcedata/AD_DATASET_TABLE.xml |14 +
 5 files changed, 1132 insertions(+), 13 deletions(-)

diffs (truncated from 1345 to 300 lines):

diff -r 8838359e3ec1 -r 01ae69f28d45 referencedata/standard/Unit_of_Measure.xml
--- a/referencedata/standard/Unit_of_Measure.xmlTue Jun 20 14:31:30 
2017 +
+++ b/referencedata/standard/Unit_of_Measure.xmlThu Jun 08 12:46:41 
2017 +0200
@@ -1,5 +1,820 @@
-
-http://www.openbravo.com; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
+http://www.openbravo.com; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
+  
+010C2C92E4394D87BF811BD011F2A015
+true
+
+
+0.060
+160934.4
+  
+  
+0704A83693954422841AD514528A238A
+true
+
+
+0.16
+63360
+  
+  
+09B5480A5C3C4D64B39E4EA4482BAF5C
+true
+
+
+63360
+0.16
+  
+  
+0B2184C2381341FEA71849676B4E0DD9
+true
+
+
+25.4
+0.03937
+  
+  
+0C6BEB4583DB47A4B94B060797F717EB
+true
+
+
+1609.344
+0.000621
+  
+  
+0F3BADDC745B4315816375C943A863D8
+true
+
+
+0.25
+39370.0787
+  
+  
+0F4184B04C67493E9DDC2F8D3A66A43F
+true
+
+
+1093.6133
+0.000914
+  
+  
+1173082D93424A81B03356255E80DCB6
+true
+
+
+91.44
+0.010936
+  
+  
+148F73BDAB864104A0D80BE1E54C9D63
+true
+
+
+0.004546
+219.9692
+  
+  
+1572435CF6124EFD9D1FD9544E53A411
+true
+
+
+0.33
+3
+  
+  
+15B9086673464FC79115C5904EEDCCBE
+true
+
+
+3
+0.33
+  
+  
+17A1E272E90A48429C3F6955864E95DB
+true
+
+
+1
+0.00010
+  
+  
+1922E4021A9449C3B18E9590AF4AB2E9
+true
+
+
+929.0304
+0.001076
+  
+  
+1C91CA02272D40139164E9D90007B3DC
+true
+
+
+0.10
+10
+  
+  
+1FAEF7EE99D543B7AD15A192B23EE84E
+true
+
+
+0.000914
+1093.6133
+  
+  
+20AD6971415D40849CADBAEACBC8BABE
+true
+
+
+0.01
+100
+  
+  
+2278C20E54674E71A78CC055E7A31D7D
+true
+
+
+0.08
+12
+  
+  
+274066DB048B4B47A7208C01A2DCCC6A
+true
+
+
+0.001
+1000
+  
+  
+2846FA4B938E41A9BBB4DBAA31091D07
+true
+
+
+0.001
+1000
+  
+  
+35D7A67AD7844FB4A05A57F1DF80454A
+true
+
+
+304.8
+0.003281
+  
+  
+36A83692A2DF4C20A66B0985C140476E
+true
+
+
+1609344
+0.010
+  
+  
+37C5D05FBF39438CA2382FE0D284D622
+true
+
+
+10.7639
+0.092903
+  
+  
+39A364209B0D415C9ECD920ABEEDFE97
+true
+
+
+160934.4
+0.060
+  
+  
+40BEF9D1FD3B4872BF3BDA47A8491A97
+true
+
+
+3.2808
+0.304804
+  
+  
+466CD3F8414340DDBB8AE47D5860EC17
+true
+
+
+0.001076
+929.0304
+  
+  
+469BA1C3F574429F87A045D93AA0E290
+true
+
+
+0.000621
+1609.344
+  
+  
+49E8E18038AE4D48A06E6A637541D551
+true
+
+
+0.03937
+25.4
+  
+  
+4A628E1037D6441E9650031AF74538FE
+true
+
+
+1000
+0.001
+  
+  
+4E29C0865FA540299764883884589497
+true
+
+
+28.3495
+0.035274
+  
+  
+51D177F90373443487D241CEAC0F34AC
+true
+
+
+2.2046
+   

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/c320af7dd7e5
changeset: 32253:c320af7dd7e5
user:  Asier Lostalé  openbravo.com>
date:  Thu Jun 01 12:32:48 2017 +0200
summary:   related to bug 36161: useless log having an incorrect definition for 
val rule

  In centralized FIC error log
- added context information (tabId, FIC mode, row id)
- use standard log: don't print in System.err

details:   https://code.openbravo.com/erp/devel/pi/rev/37cb0c3edabd
changeset: 32254:37cb0c3edabd
user:  Asier Lostalé  openbravo.com>
date:  Thu Jun 01 12:41:02 2017 +0200
summary:   fixed bug 36161: useless log having an incorrect definition for 
validation rule

  Include in the log information about the columns that participate in the 
faling
  auxiliary input, as well as the list of columns that were sorted before the 
failure.

details:   https://code.openbravo.com/erp/devel/pi/rev/2750ad10ee7d
changeset: 32255:2750ad10ee7d
user:  Asier Lostalé  openbravo.com>
date:  Thu Jun 01 14:24:49 2017 +0200
summary:   fixed bug 36163: val rule for non-existent col fails if prop fld has 
same name

  Having a validation rule referring to a non-existent column in tab fields, and
  having in the same tab a property field with the same name failed.

  This was caused because in the map of available columns used to parse 
validation
  rule, the column name was directly used withouth distinguishing property 
fields,
  so the validation rule was parsed assuming there was a column with the same 
name.

  Now this list differentiates property fields, so in this case that reference 
will
  just be skipped as non-existing (see also #36164)

details:   https://code.openbravo.com/erp/devel/pi/rev/e00c7560119e
changeset: 32256:e00c7560119e
user:  Asier Lostalé  openbravo.com>
date:  Thu Jun 01 14:28:39 2017 +0200
summary:   related to bug 36161: FIC log

  don't calculate log message if known not to be displayed

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 |  61 +
 1 files changed, 35 insertions(+), 26 deletions(-)

diffs (122 lines):

diff -r 59898e805bfd -r e00c7560119e 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 Thu Jun 01 10:20:15 2017 +0530
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 Thu Jun 01 14:28:39 2017 +0200
@@ -120,19 +120,20 @@
   protected JSONObject execute(Map parameters, String content) 
{
 OBContext.setAdminMode(true);
 long iniTime = System.currentTimeMillis();
+String mode = null, tabId = null, rowId = null;
 try {
   // Execution mode. It can be:
   // - NEW: used when the user clicks on the "New record" button
   // - EDIT: used when the user opens a record in form view
   // - CHANGE: used when the user changes a field which should fire 
callouts or comboreloads
   // - SETSESSION: used when the user calls a process
-  String mode = readParameter(parameters, "MODE");
+  mode = readParameter(parameters, "MODE");
   // ID of the parent record
   String parentId = readParameter(parameters, "PARENT_ID");
   // The ID of the tab
-  String tabId = readParameter(parameters, "TAB_ID");
+  tabId = readParameter(parameters, "TAB_ID");
   // The ID of the record. Only relevant on EDIT, CHANGE and SETSESSION 
modes
-  String rowId = readParameter(parameters, "ROW_ID");
+  rowId = readParameter(parameters, "ROW_ID");
   // The IDs of the selected records in case more than one
   String multipleRowIds[] = (String[]) parameters.get("MULTIPLE_ROW_IDS");
   // The column changed by the user. Only relevant on CHANGE mode
@@ -325,7 +326,7 @@
   log.debug("Attachment exists: " + 
finalObject.getBoolean("attachmentExists"));
   return finalObject;
 } catch (Throwable t) {
-  t.printStackTrace(System.err);
+  log.error("TabId:" + tabId + " - Mode:" + mode + " - rowId:" + rowId, t);
   final String jsonString = JsonUtils.convertExceptionToJson(t);
   try {
 return new JSONObject(jsonString);
@@ -333,7 +334,6 @@
 log.error("Error while generating the error JSON object: " + 
jsonString, e);
   }
 } finally {
-
   // Clear session to prevent slow flush
   OBDal.getInstance().getSession().clear();
 
@@ -1134,31 +1134,35 @@
   if (field.getColumn() == null) {
 continue;
   }
-  String columnName = field.getColumn().getDBColumnName();
-  columns.add(columnName.toUpperCase());
+
+  String colName = null;
+  if (field.getProperty() != null && !field.getProperty().isEmpty()) {
+colName = "_propertyField_"
++ 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/34c040a18ce0
changeset: 31060:34c040a18ce0
user:  Atul Gaware  openbravo.com>
date:  Thu Dec 22 22:54:41 2016 +0530
summary:   Fixes Issue 34676:It is possible to see prices for list prices for
organizations that you don't have access to.

Problem is Organization property of Product Price in the Product Price By
Warehouse view is not checked whether it appears in Natural Tree of the
Current Logged in Organization.

details:   https://code.openbravo.com/erp/devel/pi/rev/ca851ae75852
changeset: 31061:ca851ae75852
user:  Mark  gmail.com>
date:  Thu Dec 22 13:22:46 2016 -0500
summary:   Related to issue 34676: Code review improvements

Reordered conditions in where clause.

details:   https://code.openbravo.com/erp/devel/pi/rev/6edf67f27c25
changeset: 31062:6edf67f27c25
user:  Rafael Queralta Pozo  nauta.cu>
date:  Mon Dec 19 13:22:02 2016 -0500
summary:   Fixed issue 34620: The ReportWarehouseControl report collapse the 
system

For a better performance, the data was limit with the value of a preference.
And a warning is shown to inform that data is being limited. Besides the query 
does
not be launched when opening the report

details:   https://code.openbravo.com/erp/devel/pi/rev/e7d951326bc3
changeset: 31063:e7d951326bc3
user:  Mark  gmail.com>
date:  Wed Dec 21 12:11:17 2016 -0500
summary:   Related to issue 34620: Code review improvements

Removed ORDER BY clause, it is not relevant due this method is used to retrieve 
the record count.

diffstat:

 src-db/database/sourcedata/OBUISEL_SELECTOR.xml |   2 
+-
 src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.java  |  28 
+-
 src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl_data.xsql |  47 
+-
 3 files changed, 72 insertions(+), 5 deletions(-)

diffs (125 lines):

diff -r 13f087a1517e -r e7d951326bc3 
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml   Fri Dec 23 14:26:16 
2016 -0500
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml   Wed Dec 21 12:11:17 
2016 -0500
@@ -207,7 +207,7 @@
   
   

   

-  
+  
   
   

   
diff -r 13f087a1517e -r e7d951326bc3 
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.java
Fri Dec 23 14:26:16 2016 -0500
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl.java
Wed Dec 21 12:11:17 2016 -0500
@@ -71,11 +71,23 @@
 PrintWriter out = response.getWriter();
 XmlDocument xmlDocument = null;
 
-ReportWarehouseControlData[] data = ReportWarehouseControlData.select(this,
+ReportWarehouseControlData[] data = null;
+int limit = 0;
+int countLines = 0;
+if(!vars.commandIn("DEFAULT")){
+  limit = Integer.parseInt(Utility.getPreference(vars, "ReportsLimit", 
""));
+  if(limit > 0){
+countLines = 
Integer.valueOf(ReportWarehouseControlData.countLines(this,
+  Utility.getContext(this, vars, "#User_Client", 
"ReportWarehouseControl"),
+  Utility.getContext(this, vars, "#AccessibleOrgTree", 
"ReportWarehouseControl"),
+strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"), 
strReferential));
+  }
+  data = ReportWarehouseControlData.select(this,
 Utility.getContext(this, vars, "#User_Client", 
"ReportWarehouseControl"),
 Utility.getContext(this, vars, "#AccessibleOrgTree", 
"ReportWarehouseControl"),
-strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"), 
strReferential);
-
+strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"), 
strReferential, 0, limit);
+}
+
 if (data == null || data.length == 0 || vars.commandIn("DEFAULT")) {
   String discard[] = { "sectionDescription" };
   xmlDocument = xmlEngine.readXmlTemplate(
@@ -119,6 +131,15 @@
 }
 {
   OBError myMessage = vars.getMessage("ReportWarehouseControl");
+  if (limit > 0 && countLines > limit) {
+myMessage = new OBError();
+myMessage.setType("Warning");
+myMessage.setTitle("");
+String msgbody = Utility.messageBD(this, "ReportsLimitBody", 
vars.getLanguage());
+msgbody = msgbody.replace("@limit@", String.valueOf(limit));
+msgbody = msgbody.replace("@rows@", String.valueOf(countLines));
+myMessage.setMessage(msgbody);
+  }
   vars.removeMessage("ReportWarehouseControl");
   if (myMessage != null) {
 xmlDocument.setParameter("messageType", myMessage.getType());
@@ -140,6 +161,7 @@
 xmlDocument.setData("structure1", data);
 out.println(xmlDocument.print());
 out.close();
+
   }
 
   public String getServletInfo() {
diff -r 13f087a1517e -r e7d951326bc3 
src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportWarehouseControl_data.xsql   
Fri Dec 23 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/984e759b3b0d
changeset: 31014:984e759b3b0d
user:  Sanjota  promantia.com>
date:  Tue Dec 20 10:48:16 2016 +0530
summary:   Fixes issue 34718:Modify TransactionsWithMissingData.java 
buildValidation

Modify TransactionsWithMissingData.java buildValidation to execute it only if 
updating from before this changeset:
https://code.openbravo.com/erp/devel/main/rev/7bf7fccd7e95

details:   https://code.openbravo.com/erp/devel/pi/rev/bb385581c51e
changeset: 31015:bb385581c51e
user:  Sanjota  promantia.com>
date:  Tue Dec 20 10:49:38 2016 +0530
summary:   Fixes issue 34718:Modify UniquePaymentForTransaction.java 
buildValidation

Modify UniquePaymentForTransaction.java buildValidation to execute it only if 
updating from before this changeset:
 https://code.openbravo.com/erp/devel/main/rev/1ba88c7ea4b5

details:   https://code.openbravo.com/erp/devel/pi/rev/e672b21e7cf0
changeset: 31016:e672b21e7cf0
user:  Sanjota  promantia.com>
date:  Tue Dec 20 10:50:25 2016 +0530
summary:   Fixes issue 34718:Modify UnpostRefundPayments.java buildValidation

Modify UnpostRefundPayments.java buildValidation to execute it only if updating 
from before this changeset:
https://code.openbravo.com/erp/devel/main/rev/1ba88c7ea4b5

details:   https://code.openbravo.com/erp/devel/pi/rev/b064eb706570
changeset: 31017:b064eb706570
user:  Sanjota  promantia.com>
date:  Tue Dec 20 10:51:01 2016 +0530
summary:   Fixes issue 34718:Modify WrongPaymentScheduleDetailsCheck.java 
buildValidation

Modify WrongPaymentScheduleDetailsCheck.java buildValidation to execute it only 
if updating from before this changeset:
https://code.openbravo.com/erp/devel/main/rev/11602bd040b1

diffstat:

 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class
|0 
 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class
|0 
 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class
   |0 
 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class
   |0 
 
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java
  |8 +++
 
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.java
  |   10 -
 
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.java
 |   10 -
 
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java
 |   11 +-
 8 files changed, 36 insertions(+), 3 deletions(-)

diffs (136 lines):

diff -r ba18b17ef483 -r b064eb706570 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class
 has changed
diff -r ba18b17ef483 -r b064eb706570 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UniquePaymentForTransaction.class
 has changed
diff -r ba18b17ef483 -r b064eb706570 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/UnpostRefundPayments.class
 has changed
diff -r ba18b17ef483 -r b064eb706570 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class
 has changed
diff -r ba18b17ef483 -r b064eb706570 
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java
--- 
a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java
   Tue Dec 20 10:46:54 2016 +0530
+++ 
b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java
   Tue Dec 20 10:51:01 2016 +0530
@@ -21,8 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/789db27692a6
changeset: 30452:789db27692a6
user:  Atul Gaware  openbravo.com>
date:  Tue Jul 28 20:07:53 2015 +0530
summary:   Fixes issue 29674: Error posting a payment if no access to Currency 
window

Change OBContext to admin mode needed before accessing currency objects in 
isconvertible method of AcctServer class.

details:   https://code.openbravo.com/erp/devel/pi/rev/543c8285c581
changeset: 30453:543c8285c581
user:  Atul Gaware  openbravo.com>
date:  Tue Jul 28 19:29:28 2015 +0530
summary:   Fixes issue 29671: Error in Copy Lines if no access to Currency 
window

Implemented a change in context mode to admin in CopyFromInvoice process.

details:   https://code.openbravo.com/erp/devel/pi/rev/42b07001fd6a
changeset: 30454:42b07001fd6a
user:  Atul Gaware  openbravo.com>
date:  Tue Jul 28 20:46:30 2015 +0530
summary:   Fixes issue 30018: Invoice Line field in Work Effort should be 
editable

Read only logic in column setting for Invoice Line is removed.

details:   https://code.openbravo.com/erp/devel/pi/rev/de5fec5ed5b3
changeset: 30455:de5fec5ed5b3
user:  Atul Gaware  openbravo.com>
date:  Fri Jul 31 13:01:32 2015 +0530
summary:   Fixes issue 29470: "Last day cut-off" fields should be hidden in 
Payment Term

Last day cut off field is set displayed = no, show in grid = no

diffstat:

 src-db/database/sourcedata/AD_COLUMN.xml |   1 -
 src-db/database/sourcedata/AD_FIELD.xml  |   4 +-
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java |   6 +-
 src/org/openbravo/erpCommon/ad_forms/AcctServer.java |  29 
+
 4 files changed, 24 insertions(+), 16 deletions(-)

diffs (108 lines):

diff -r ab62853b9b6c -r de5fec5ed5b3 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml  Mon Oct 10 17:12:47 2016 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml  Fri Jul 31 13:01:32 2015 +0530
@@ -206382,7 +206382,6 @@
   
   
   
-  
   
   
   
diff -r ab62853b9b6c -r de5fec5ed5b3 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml   Mon Oct 10 17:12:47 2016 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml   Fri Jul 31 13:01:32 2015 +0530
@@ -117749,14 +117749,14 @@
   
   
   
-  
+  
   
   
   
   
   
   
-  
+  
   
   
   
diff -r ab62853b9b6c -r de5fec5ed5b3 
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java  Mon Oct 
10 17:12:47 2016 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java  Fri Jul 
31 13:01:32 2015 +0530
@@ -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) 2001-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  __.
  
@@ -33,6 +33,7 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.businessUtility.Tax;
@@ -92,6 +93,7 @@
 OBError myError = null;
 Connection conn = null;
 try {
+  OBContext.setAdminMode(true);
   conn = getTransactionConnection();
   CopyFromInvoiceData[] data = CopyFromInvoiceData.select(conn, this, 
strInvoice,
   Utility.getContext(this, vars, "#User_Client", windowId),
@@ -239,6 +241,8 @@
   myError.setTitle(OBMessageUtils.messageBD("Error"));
   myError.setMessage(OBMessageUtils.messageBD("ProcessRunError"));
   return myError;
+} finally {
+  OBContext.restorePreviousMode();
 }
 myError = new OBError();
 myError.setType("Success");
diff -r ab62853b9b6c -r de5fec5ed5b3 
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java  Mon Oct 10 
17:12:47 2016 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java  Fri Jul 31 
13:01:32 2015 +0530
@@ -1275,19 +1275,24 @@
 if (conversionQuery != null) {
   conversionCount = conversionQuery.count();
 }
-if (conversionCount > 0) {
-  List conversionRate = conversionQuery.list();
-  OBCriteria currencyCrit = 
OBDal.getInstance().createCriteria(Currency.class);
-  currencyCrit.add(Restrictions.eq(Currency.PROPERTY_ID, 
acctSchema.m_C_Currency_ID));
-  
currencyCrit.setProjection(Projections.max(Currency.PROPERTY_STANDARDPRECISION));
-  Long precision = 0L;
-  if (currencyCrit.count() > 0) {
-  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/e508c5662e33
changeset: 29893:e508c5662e33
user:  Stefan Hühner  openbravo.com>
date:  Tue Aug 23 17:34:51 2016 +0200
summary:   Fixed 33773. Avoid double query by not calling .list() twice

First case reading from ad_language can be simplified to single .uniqueResult
call as filters are unique.

2nd case just saves list() result to avoid 2nd call easily.

details:   https://code.openbravo.com/erp/devel/pi/rev/af6e72d059cd
changeset: 29894:af6e72d059cd
user:  Stefan Hühner  openbravo.com>
date:  Tue Aug 23 17:58:45 2016 +0200
summary:   Fixed 33774. Fixed accidental double query by not calling .list() 
twice

details:   https://code.openbravo.com/erp/devel/pi/rev/197fb66d7cea
changeset: 29895:197fb66d7cea
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 13:51:59 2016 +0200
summary:   Issue 33773. Apply review feedback replace .size() >0 with !isEmpty()

details:   https://code.openbravo.com/erp/devel/pi/rev/a8163cc557bb
changeset: 29896:a8163cc557bb
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 13:54:17 2016 +0200
summary:   Issue 33774. Apply review feedback, change .size() > 0 to !isEmpty()

diffstat:

 src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java |  16 
+-
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r c35e5b050f0b -r a8163cc557bb 
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java  
Wed Aug 24 11:54:52 2016 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java  
Wed Aug 24 13:54:17 2016 +0200
@@ -284,10 +284,8 @@
   public static Language getLanguage(String strLanguage) throws Exception {
 final OBCriteria obcLanguage = 
OBDal.getInstance().createCriteria(Language.class);
 obcLanguage.add(Restrictions.eq(Language.PROPERTY_LANGUAGE, strLanguage));
-if (obcLanguage.list().size() > 0)
-  return obcLanguage.list().get(0);
-else
-  return null;
+// ad_language.ad_language is unique
+return (Language) obcLanguage.uniqueResult();
   }
 
   /**
@@ -1863,8 +1861,9 @@
   obcDataSets.add(Restrictions.eq(DataSet.PROPERTY_MODULE, module));
   obcDataSets.add(Restrictions.in(DataSet.PROPERTY_DATAACCESSLEVEL, 
accessLevel));
   obcDataSets.addOrder(Order.asc(DataSet.PROPERTY_NAME));
-  if (obcDataSets.list().size() > 0) {
-return obcDataSets.list();
+  List listDataSets = obcDataSets.list();
+  if (!listDataSets.isEmpty()) {
+return listDataSets;
   } else {
 return null;
   }
@@ -1887,8 +1886,9 @@
   .createCriteria(org.openbravo.model.ad.domain.List.class);
   
obcRefList.add(Restrictions.eq(org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE,
 OBDal
   .getInstance().get(Reference.class, "181")));
-  if (obcRefList.list().size() > 0) {
-return obcRefList.list();
+  List listRefList = obcRefList.list();
+  if (!listRefList.isEmpty()) {
+return listRefList;
   } else {
 return null;
   }

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/ef154325c6cf
changeset: 29577:ef154325c6cf
user:  Atul Gaware  openbravo.com>
date:  Wed Jun 01 18:31:57 2016 +0530
summary:   Fixes issue 32949: Improve performance in Return to Vendor Pick and 
Execute

In order to avoid unnecessary joins to M_InoutLine table, replace 
ol.goodsShipmentLine = iol with ol.goodsShipmentLine.id = iol.

details:   https://code.openbravo.com/erp/devel/pi/rev/f3f815904ffd
changeset: 29578:f3f815904ffd
user:  Alvaro Ferraz  openbravo.com>
date:  Fri Jun 03 15:32:03 2016 +0200
summary:   Related to issue 32949: Code review improvements

- Use inner join instead of left join between OrderLine and Order tables.
- Avoid unnecessary join with Tax table.
- Add index in M_MatchPO table to M_InoutLine_Id column.

details:   https://code.openbravo.com/erp/devel/pi/rev/083683ac0038
changeset: 29579:083683ac0038
user:  Atul Gaware  openbravo.com>
date:  Wed May 25 00:58:03 2016 +0530
summary:   Fixes issue 32032: ReportOrderNotShipped report query improved

-Replace IN clause for locator using EXISTS
-Remove unwanted C_Order from subquery which compares quantities
-Rearrange the query
-Get stock from m_storage_detail using subquery instead of left join

details:   https://code.openbravo.com/erp/devel/pi/rev/a68ba952787a
changeset: 29580:a68ba952787a
user:  Alvaro Ferraz  openbravo.com>
date:  Fri Jun 03 14:56:32 2016 +0200
summary:   Related to issue 32032: Code review improvements

diffstat:

 
modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql
 |  67 -
 src-db/database/model/tables/M_MATCHPO.xml 
|   
3 +
 src-db/database/sourcedata/AD_TABLE.xml
|  
10 +-
 
src/org/openbravo/common/datasource/ReturnToFromCustomerVendorHQLTransformer.java
  |  26 
+-
 4 files changed, 53 insertions(+), 53 deletions(-)

diffs (173 lines):

diff -r 5c3ae208fb2c -r a68ba952787a 
modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql
--- 
a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql
Fri Jun 03 13:58:10 2016 +0200
+++ 
b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql
Fri Jun 03 14:56:32 2016 +0200
@@ -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) 2009-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2016 Openbravo SLU
  * All Rights Reserved. 
  * Contributor(s):  __.
  
@@ -29,46 +29,43 @@
 PR.NAME || ' ' || COALESCE(TO_CHAR(ASI.DESCRIPTION), '') AS PRODNAME, 
OL.M_ATTRIBUTESETINSTANCE_ID,
 OL.QTYORDERED || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS ORDEREDQTY, 
 (OL.QTYORDERED-OL.QTYDELIVERED) || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), 
'') AS PENDINGQTY, 
-SUM(SD.QTYONHAND) || ' ' || COALESCE(TO_CHAR(UO.UOMSYMBOL), '') AS 
QTYINSTOCK
-FROM AD_ORG ORG, C_BPARTNER BP, C_BPARTNER_LOCATION BPADD, 
-M_PRODUCT PR, C_UOM UO, 
-C_ORDER O
-LEFT JOIN AD_REF_LIST_V REFLISTV
-ON REFLISTV.VALUE = O.DELIVERYRULE
-LEFT JOIN C_BPARTNER_LOCATION DLOC
-ON DLOC.C_BPARTNER_LOCATION_ID = O.DELIVERY_LOCATION_ID,
-C_ORDERLINE OL
-LEFT JOIN M_ATTRIBUTESETINSTANCE ASI
-ON OL.M_ATTRIBUTESETINSTANCE_ID = ASI.M_ATTRIBUTESETINSTANCE_ID
-LEFT JOIN M_STORAGE_DETAIL SD
-ON OL.M_PRODUCT_ID = SD.M_PRODUCT_ID
-AND OL.C_UOM_ID = SD.C_UOM_ID
-AND COALESCE(OL.M_ATTRIBUTESETINSTANCE_ID, SD.M_ATTRIBUTESETINSTANCE_ID, 
'0') = COALESCE(SD.M_ATTRIBUTESETINSTANCE_ID, '0')
-AND COALESCE(OL.M_PRODUCT_UOM_ID, '-1') = 
COALESCE(SD.M_PRODUCT_UOM_ID,'-1')
-AND SD.M_LOCATOR_ID IN (SELECT LOC.M_LOCATOR_ID
-FROM M_LOCATOR LOC
-WHERE LOC.M_WAREHOUSE_ID = OL.M_WAREHOUSE_ID)
-WHERE O.AD_ORG_ID = ORG.AD_ORG_ID
-AND O.C_BPARTNER_ID = BP.C_BPARTNER_ID
-AND O.C_BPARTNER_LOCATION_ID = BPADD.C_BPARTNER_LOCATION_ID
-AND O.C_ORDER_ID = OL.C_ORDER_ID
-AND O.DOCSTATUS = 'CO'
+(
+  SELECT SUM(SD.QTYONHAND)
+  FROM M_STORAGE_DETAIL SD
+  WHERE SD.M_PRODUCT_ID = OL.M_PRODUCT_ID
+  AND SD.C_UOM_ID = OL.C_UOM_ID
+  AND COALESCE(SD.M_ATTRIBUTESETINSTANCE_ID, '0') = 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/121bcf7ae05b
changeset: 29545:121bcf7ae05b
user:  Mark  gmail.com>
date:  Tue May 17 11:39:36 2016 -0400
summary:   Fixes issue 32937: Correct parameter is passed to the c_uom_convert 
function

The correct parameter is passed to the c_uom_convert function: it is the 
c_uom_id associated to the m_product_uom_id instead the m_product_uom_id.

details:   https://code.openbravo.com/erp/devel/pi/rev/8d4bd74e71c7
changeset: 29546:8d4bd74e71c7
user:  Alvaro Ferraz  openbravo.com>
date:  Tue May 24 18:11:55 2016 +0200
summary:   Related to issue 32937: Code review improvements

details:   https://code.openbravo.com/erp/devel/pi/rev/6d6e0cbcdbd3
changeset: 29547:6d6e0cbcdbd3
user:  Atul Gaware  openbravo.com>
date:  Tue May 17 13:37:09 2016 +0530
summary:   Fixes issue 32954: Payment Report in Excel format is not setting ","
(comma) as decimal separator, although it is defined in Format.xml file

Numberformat parameter added inorder to apply formats on transactional and base 
amount values

details:   https://code.openbravo.com/erp/devel/pi/rev/82ad87115642
changeset: 29548:82ad87115642
user:  Alvaro Ferraz  openbravo.com>
date:  Tue May 24 12:05:23 2016 +0200
summary:   Related to issue 32954: Code review improvements

diffstat:

 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
 |   6 ++
 src-db/database/model/functions/C_ORDER_POST1.xml  
   |  26 -
 src-db/database/model/functions/M_INOUT_CREATE.xml 
   |   4 +-
 src-db/database/model/triggers/C_ORDERLINE2_TRG.xml
   |  11 +++-
 4 files changed, 37 insertions(+), 10 deletions(-)

diffs (173 lines):

diff -r 00a9622ba84e -r 82ad87115642 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
--- 
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
 Tue May 24 15:06:23 2016 +0200
+++ 
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
 Tue May 24 12:05:23 2016 +0200
@@ -16,6 +16,7 @@



+   



@@ -65,6 +66,9 @@



+   
+   
+   


+   




@@ -399,6 +404,7 @@




+   




diff -r 00a9622ba84e -r 82ad87115642 
src-db/database/model/functions/C_ORDER_POST1.xml
--- a/src-db/database/model/functions/C_ORDER_POST1.xml Tue May 24 15:06:23 
2016 +0200
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml Tue May 24 12:05:23 
2016 +0200
@@ -540,6 +540,7 @@
   v_QtyOrderSO NUMBER;
   v_QtyPO NUMBER; -- Ordered
   v_QtyOrderPO NUMBER;
+  v_UOM_ID VARCHAR2(32);
 BEGIN
   v_ResultStr:='ReserveInventory';
   -- For all lines needing reservation
@@ -563,14 +564,22 @@
   IF (Cur_ResLine.QtyDelivered=0) THEN
 v_QtyOrderPO := -Cur_ResLine.QuantityOrder;
   ELSIF Cur_ResLine.M_Product_UOM_ID IS NOT NULL THEN
-v_QtyOrderPO := -C_Uom_Convert(v_QtyPO, Cur_ResLine.C_UOM_ID, 
Cur_ResLine.M_Product_UOM_ID, 'Y');
+SELECT c_uom_id
+INTO v_UOM_ID
+FROM m_product_uom
+WHERE m_product_uom_id = Cur_ResLine.M_Product_UOM_ID;
+v_QtyOrderPO := -C_Uom_Convert(v_QtyPO, Cur_ResLine.C_UOM_ID, 
v_UOM_ID, 'Y');
   END IF;
 ELSE
   v_QtySO:=-Cur_ResLine.QtyReserved;
   IF (Cur_ResLine.QtyReserved=Cur_ResLine.Qty) THEN
 v_QtyOrderSO := -Cur_ResLine.QuantityOrder;
   ELSIF Cur_ResLine.M_Product_UOM_ID IS NOT NULL THEN
-v_QtyOrderSO := -C_Uom_Convert(v_QtySO, Cur_ResLine.C_UOM_ID, 
Cur_ResLine.M_Product_UOM_ID, 'Y');
+SELECT c_uom_id
+INTO v_UOM_ID
+FROM m_product_uom
+WHERE m_product_uom_id = Cur_ResLine.M_Product_UOM_ID;
+v_QtyOrderSO := -C_Uom_Convert(v_QtySO, Cur_ResLine.C_UOM_ID, 
v_UOM_ID, 'Y');
   END IF;
   v_QtyPO:=0;
   v_QtyOrderPO:=NULL;
@@ -1135,6 +1144,7 @@
   v_QtyOrderSO  NUMBER;
  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/c33cf2dc04ad
changeset: 29263:c33cf2dc04ad
user:  Mark  nectus.com>
date:  Thu Apr 14 14:27:30 2016 -0400
summary:   Fixes issue 32654: Unhomogeneus behavior in Transaction organization 
dimension.

To avoid that the value for Organization in Transaction's dimension section be 
different depending on process used to add transaction, if the Add payment 
action is excecuted from it, always will be used as organization the ad_org_id 
field selected in the caller window (Add transaction window).

details:   https://code.openbravo.com/erp/devel/pi/rev/6ae46b081f60
changeset: 29264:6ae46b081f60
user:  Alvaro Ferraz  openbravo.com>
date:  Thu Apr 21 15:03:45 2016 +0200
summary:   Related to issue 32654: Code review improvements

Some changes have been done in Add Transaction process definition related to 
organization field in order to have the same behaviour as in Financial Account 
Transaction tab.

- Filter payments in Payment selector (drop down or magnifying glass) in Add 
new transaction process definition:
Add new parameter called ad_org_id_process to save process definition's current 
organization value, and filter by it in the hql where clause of the payment 
selector.
- Filter in Add Payment grids when opening from Payment selector in Add new 
transaction process definition.
Check for ad_org_id parameter before checking for inpadOrgId parameter in 
TransactionAddPaymentDefaultValues.
- Creating new payments in Add Payment when opening from Payment selector in 
Add new transaction process definition:
Check for ad_org_id parameter before checking for inpadOrgId parameter in 
AddPaymentActionHandler.
- Creating new financial account transactions in Add new transaction process 
definition:
Process definition's current organization value will be taken instead of 
selected payment organization.
- Avoid changing organization once you have selected a payment:
Update read only logic of accounting dimensions to disable them when we have 
already selected a payment.

details:   https://code.openbravo.com/erp/devel/pi/rev/75af2f16cdb3
changeset: 29265:75af2f16cdb3
user:  Mark  nectus.com>
date:  Fri Apr 08 15:28:54 2016 -0400
summary:   Fixes issue 32579: Generated credit set as used when it should not

Generated credit was set as used although it is not possible to process the 
payment that uses it, when an exception is thrown the payment processing aborts 
and can't be created or updated the credits.

details:   https://code.openbravo.com/erp/devel/pi/rev/f0f766d86fef
changeset: 29266:f0f766d86fef
user:  Alvaro Ferraz  openbravo.com>
date:  Thu Apr 21 19:24:51 2016 +0200
summary:   Related to issue 32281: Backout changeset a8bef035c93c and 
fc9de8940c8e

diffstat:

 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
  |  40 ++
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
   |   2 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
   |  13 +--
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
   |   8 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java
 |   6 +-
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js
 |   5 +
 src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml   
|  11 +--
 7 files changed, 62 insertions(+), 23 deletions(-)

diffs (290 lines):

diff -r 38a4c359ce90 -r f0f766d86fef 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
 Thu Apr 21 18:49:16 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
 Thu Apr 21 19:24:51 2016 +0200
@@ -561,6 +561,7 @@
   

   

   

+  

   

   

   

@@ -801,6 +802,7 @@
   

   

   

+  

   

   

   

@@ -1655,6 +1657,7 @@
   

   

   

+  

   

   

   

@@ -1733,6 +1736,7 @@
   

   

   

+  

   

   

   

@@ -1791,6 +1795,8 @@
   

   

   

+  

+  

   

   

   

@@ -1870,6 +1876,7 @@
   

   

   

+  

   

   

   

@@ -1898,6 +1905,7 @@
   

   

   

+  

   

   

   

@@ -1978,6 +1986,7 @@
   

   

   

+  

   

   

   

@@ -2094,6 +2103,7 @@
   

   

   

+  

   

   

   

@@ -2176,6 +2186,7 @@
   

   

   

+  

   

   

   

@@ -2204,6 +2215,7 @@
   

   

   

+  

   

   

   

@@ -2238,6 +2250,34 @@
   

 
 
+
+  

+  

+  
+  
+  

+  
+  
+  
+  
+  

+  

+  

+  

+  

+  

+  

+  
+  

+  

+  

+  

+  

+  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/6a656a96298b
changeset: 28694:6a656a96298b
user:  Asier Lostalé  openbravo.com>
date:  Fri Mar 04 08:45:40 2016 +0100
summary:   related to bug 32375: preferences incorrectly resolve client 
visibility

  Small code clean up:
-isHigherPriority renamed to getHighestPriority: by convention is* are 
boolean
 getters which was not the case of this one
-removed unneded brackets in condition which didn't help to make the code 
more
 readable

details:   https://code.openbravo.com/erp/devel/pi/rev/bc3e4c65d7b1
changeset: 28695:bc3e4c65d7b1
user:  Asier Lostalé  openbravo.com>
date:  Fri Mar 04 08:48:31 2016 +0100
summary:   related to bug 32375: make preference resolution more consistent

  In case of several preferences defined for a given property/attribute, the
  result of getting value could be undetermistic.

  Solved by sorting by preference's id in these cases.

details:   https://code.openbravo.com/erp/devel/pi/rev/94f9263bb271
changeset: 28696:94f9263bb271
user:  Asier Lostalé  openbravo.com>
date:  Fri Mar 04 08:50:01 2016 +0100
summary:   fixed bug 32375: preferences incorrectly resolve client visibility

  Reimplemented client visibility resolution to correctly handle the case of
  2 preference candidates with different client visibility.

details:   https://code.openbravo.com/erp/devel/pi/rev/d7b14fb65c2b
changeset: 28697:d7b14fb65c2b
user:  Asier Lostalé  openbravo.com>
date:  Fri Mar 04 08:51:01 2016 +0100
summary:   related to bug 32375: added test case covering preference's client 
visibility

diffstat:

 src-test/src/org/openbravo/test/preference/PreferenceTest.java |  33 +-
 src/org/openbravo/erpCommon/businessUtility/Preferences.java   |  26 +--
 2 files changed, 51 insertions(+), 8 deletions(-)

diffs (141 lines):

diff -r 617c4ab81da2 -r d7b14fb65c2b 
src-test/src/org/openbravo/test/preference/PreferenceTest.java
--- a/src-test/src/org/openbravo/test/preference/PreferenceTest.javaThu Feb 
11 13:03:59 2016 +0100
+++ b/src-test/src/org/openbravo/test/preference/PreferenceTest.javaFri Mar 
04 08:51:01 2016 +0100
@@ -11,16 +11,18 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2010-2014 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2016 Openbravo SLU
  * All Rights Reserved. 
  * Contributor(s):  __.
  
  */
 package org.openbravo.test.preference;
 
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
@@ -282,6 +284,35 @@
   }
 
   @Test
+  public void testH1ClientVisibility() throws PropertyException {
+setSystemAdministratorContext();
+Client testClient = OBDal.getInstance().getProxy(Client.class, 
TEST_CLIENT_ID);
+Client systemClient = OBDal.getInstance().getProxy(Client.class, "0");
+
+final String propAttribute = "clientPropertyTest";
+Preference p1 = Preferences.setPreferenceValue(propAttribute, "test 
client", false, testClient,
+null, null, null, null, null);
+Preference p2 = Preferences.setPreferenceValue(propAttribute, "system", 
false, systemClient,
+null, null, null, null, null);
+
+OBDal.getInstance().flush();
+
+String valueClient = Preferences.getPreferenceValue(propAttribute, false, 
testClient, OBContext
+.getOBContext().getCurrentOrganization(), 
OBContext.getOBContext().getUser(), OBContext
+.getOBContext().getRole(), null);
+assertThat("preference for client", valueClient, is("test client"));
+
+String valueSystem = Preferences.getPreferenceValue(propAttribute, false, 
systemClient, OBDal
+.getInstance().getProxy(Organization.class, "0"), 
OBContext.getOBContext().getUser(),
+OBContext.getOBContext().getRole(), null);
+
+assertThat("preference for system", valueSystem, is("system"));
+
+OBDal.getInstance().remove(p1);
+OBDal.getInstance().remove(p2);
+  }
+
+  @Test
   public void testIPLOrgVisibility() throws SQLException {
 
 setSystemAdministratorContext();
diff -r 617c4ab81da2 -r d7b14fb65c2b 
src/org/openbravo/erpCommon/businessUtility/Preferences.java
--- a/src/org/openbravo/erpCommon/businessUtility/Preferences.java  Thu Feb 
11 13:03:59 2016 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/Preferences.java  Fri Mar 
04 08:51:01 2016 +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) 2010-2015 Openbravo SLU 
+ * All 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/0827ac596ad2
changeset: 28164:0827ac596ad2
user:  Víctor Martínez Romanos  openbravo.com>
date:  Wed Dec 23 13:42:24 2015 +0100
summary:   Fixed bug 31649: Performance problems opening Balance Sheet and PL 
structure

selectYearsDouble query was consuming most of the time required for launching 
the window.

Rewritten query to use EXISTS clause, to filter by AD_CLIENT_ID and to call 
AD_ORG_ISINNATURALTREE() function, which reduces the query cost from 126320.46 
to 2527.97, and the time from 20 secs to 0,8 secs

details:   https://code.openbravo.com/erp/devel/pi/rev/2dfae5bc1ff6
changeset: 28165:2dfae5bc1ff6
user:  Atul Gaware  openbravo.com>
date:  Wed Dec 23 01:08:07 2015 +0530
summary:   Fixes Issue 31697:Bank Statement Line description overwritten with 
GL Item's
or payment's description when adding gl item or payment in add transaction
of Match Statement Process.

This issue is fixed in two area's
1. Add Transaction Process Definition window in Match Statement.
2. Transaction Tab of Financial Account window.

Whenever there exists a description prior adding gl item or payment in above
both cases description is appended with either gl item description or
payment description.

details:   https://code.openbravo.com/erp/devel/pi/rev/ad230fc1c0f1
changeset: 28166:ad230fc1c0f1
user:  Víctor Martínez Romanos  openbravo.com>
date:  Wed Dec 23 18:48:11 2015 +0100
summary:   Fixed bug 31697: code review improvements

In case of removing a gl item from a transaction, the part of the transaction's 
description related to the GL Item (and everything else afterwards) will be 
deleted. The part of the transaction's description before the GL Item 
description
 will be always kept.
The same behavior is applied when adding a new transaction from the Financial 
Account window and from the Match Statement --> Add transaction process

In case of removing a payment, the behavior is similar to the GL Item described 
above. However, since the payment description doesn't follow a constant 
structure (like in the case of GL Item's description), it's very hard to detect 
the description on the fly. That means that the flow will only work just after 
saving the transaction or in the first change after loading the transaction, 
which are the common flows. If the user selects different payments without 
saving the record, the system will append the different payment's description 
to the transaction.

The getFinAccTransactionDescription() method:
1. won't append multiple times the same description.
2. will add an extra empty line only when it's something to be appended
3. will work fine when the transaction already has a description with multiple 
lines
4. control any possible exception and returns the text to be append (if not 
blank), or the original description

Applied jsbeautifier to ob-aprm-addTransaction.js

details:   https://code.openbravo.com/erp/devel/pi/rev/09cb07130e5b
changeset: 28167:09cb07130e5b
user:  Alvaro Ferraz  openbravo.com>
date:  Thu Dec 24 11:03:13 2015 +0100
summary:   Related to issue 31697: Avoid append a null description

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionOnChangePaymentActionHandler.java
 |  11 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/GLItemTransactionActionHandler.java
 |  29 +++-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
  |  38 ++
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js
  |  12 +-
 src/org/openbravo/erpCommon/ad_callouts/SE_GLItem_Transaction.java 
 |  63 -
 src/org/openbravo/erpCommon/ad_callouts/SE_Payment_Transaction.java
 |  37 +-
 src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql  
 |  21 +-
 7 files changed, 145 insertions(+), 66 deletions(-)

diffs (truncated from 391 to 300 lines):

diff -r f26fa9fa4eba -r 09cb07130e5b 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionOnChangePaymentActionHandler.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionOnChangePaymentActionHandler.java
   Wed Dec 23 11:48:21 2015 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionOnChangePaymentActionHandler.java
   Thu Dec 24 11:03:13 2015 +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 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/9c12064c0d44
changeset: 27860:9c12064c0d44
user:  Alvaro Ferraz  openbravo.com>
date:  Mon Oct 26 17:00:37 2015 +0100
summary:   Fixes issue 31202: NSC when you get into 0 stock

Negative Stock Correction adjustment should be created when you get into zero 
stock (only in case you do not get into zero stock by a Closing Inventory), as 
it is created when you get into negative stock.

details:   https://code.openbravo.com/erp/devel/pi/rev/6b0630da41f1
changeset: 27861:6b0630da41f1
user:  Alvaro Ferraz  openbravo.com>
date:  Mon Oct 26 15:07:34 2015 +0100
summary:   Related to issue 31202: Update inventory types created by Costing 
Rule process

details:   https://code.openbravo.com/erp/devel/pi/rev/64e4f46536b7
changeset: 27862:64e4f46536b7
user:  Alvaro Ferraz  openbravo.com>
date:  Mon Oct 26 16:40:52 2015 +0100
summary:   Related to issue 31202: Run Costing Background process for QA 
Testing client

details:   https://code.openbravo.com/erp/devel/pi/rev/c7ee4c9a5a1e
changeset: 27863:c7ee4c9a5a1e
user:  David Miguelez  openbravo.com>
date:  Thu Nov 12 11:48:27 2015 +0100
summary:   Related to Issue 31202. Code Review changes.

While looking for existing Processed Transactions for a Product
it now takes into account costing dimensions, such as Warehouse.

diffstat:

 referencedata/sampledata/F_B_International_Group/M_INVENTORY.xml |20 +-
 referencedata/sampledata/QA_Testing/M_COSTING.xml|  1320 
++
 referencedata/sampledata/QA_Testing/M_INVENTORY.xml  | 8 +-
 referencedata/sampledata/QA_Testing/M_TRANSACTION.xml|   834 +++--
 referencedata/sampledata/QA_Testing/M_TRANSACTION_COST.xml   |   952 
+++
 src/org/openbravo/costing/CostingServer.java |11 +-
 src/org/openbravo/costing/CostingUtils.java  |32 +
 7 files changed, 2827 insertions(+), 350 deletions(-)

diffs (truncated from 4632 to 300 lines):

diff -r cebfec5bc6a9 -r c7ee4c9a5a1e 
referencedata/sampledata/F_B_International_Group/M_INVENTORY.xml
--- a/referencedata/sampledata/F_B_International_Group/M_INVENTORY.xml  Thu Nov 
12 11:25:47 2015 +0100
+++ b/referencedata/sampledata/F_B_International_Group/M_INVENTORY.xml  Thu Nov 
12 11:48:27 2015 +0100
@@ -37,7 +37,7 @@
   
   
   
-  
+  
 
 
 
@@ -57,7 +57,7 @@
   
   
   
-  
+  
 
 
 
@@ -77,7 +77,7 @@
   
   
   
-  
+  
 
 
 
@@ -137,7 +137,7 @@
   
   
   
-  
+  
 
 
 
@@ -157,7 +157,7 @@
   
   
   
-  
+  
 
 
 
@@ -177,7 +177,7 @@
   
   
   
-  
+  
 
 
 
@@ -197,7 +197,7 @@
   
   
   
-  
+  
 
 
 
@@ -217,7 +217,7 @@
   
   
   
-  
+  
 
 
 
@@ -237,7 +237,7 @@
   
   
   
-  
+  
 
 
 
@@ -277,7 +277,7 @@
   
   
   
-  
+  
 
 
 
diff -r cebfec5bc6a9 -r c7ee4c9a5a1e 
referencedata/sampledata/QA_Testing/M_COSTING.xml
--- a/referencedata/sampledata/QA_Testing/M_COSTING.xml Thu Nov 12 11:25:47 
2015 +0100
+++ b/referencedata/sampledata/QA_Testing/M_COSTING.xml Thu Nov 12 11:48:27 
2015 +0100
@@ -41,6 +41,54 @@
 
 
 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  

+  
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  

+  
+
+
+
   
   
   
@@ -101,6 +149,30 @@
 
 
 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  

+  
+
+
+
   
   
   
@@ -121,6 +193,30 @@
 
 
 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  

+  
+
+
+
   
   
   
@@ -161,6 +257,54 @@
 
 
 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  

+  
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  

+  
+
+
+
   
   
   
@@ -201,6 +345,54 @@
 
 
 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  

+  
+
+
+
+  
+  
+  
+  

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/4eceadac7f74
changeset: 27820:4eceadac7f74
user:  Asier Lostalé  openbravo.com>
date:  Fri Oct 30 11:22:17 2015 +0100
summary:   fixed bug 30891: sqlc transactional callable statemts not released 
in Oracle

  Working with Oracle transactional callable statements are not closed after
  invokation, causing the number of open cursors to increase unnecessarily.

  There was already code in sqlc to release the statement, but there was an
  extra incorrect check not to do it in case of callable when in transactional
  mode.

  This check has been removed, being now transactional and non transactional 
cases
  handled in the same way.

details:   https://code.openbravo.com/erp/devel/pi/rev/bf8fd604e551
changeset: 27821:bf8fd604e551
user:  Asier Lostalé  openbravo.com>
date:  Fri Oct 30 11:41:50 2015 +0100
summary:   related to bug 30891: added test case

details:   https://code.openbravo.com/erp/devel/pi/rev/bf568b95d85e
changeset: 27822:bf568b95d85e
user:  Asier Lostalé  openbravo.com>
date:  Fri Oct 30 12:03:10 2015 +0100
summary:   related to bug 30891: added test case

details:   https://code.openbravo.com/erp/devel/pi/rev/6af281d22ea0
changeset: 27823:6af281d22ea0
user:  Asier Lostalé  openbravo.com>
date:  Mon Nov 02 08:33:06 2015 +0100
summary:   related to bug 30891: query open cursors as DBA

diffstat:

 src-core/src/org/openbravo/data/Sqlc.java| 
   4 +-
 src-test/src/org/openbravo/test/AllAntTaskTests.java | 
   8 +-
 src-test/src/org/openbravo/test/AntTaskTests.java| 
   4 +
 src-test/src/org/openbravo/test/db/model/functions/SqlCallableStatement.java | 
 103 ++
 4 files changed, 115 insertions(+), 4 deletions(-)

diffs (181 lines):

diff -r 543f652781a2 -r 6af281d22ea0 src-core/src/org/openbravo/data/Sqlc.java
--- a/src-core/src/org/openbravo/data/Sqlc.java Fri Oct 30 13:15:08 2015 +0100
+++ b/src-core/src/org/openbravo/data/Sqlc.java Mon Nov 02 08:33:06 2015 +0100
@@ -1,6 +1,6 @@
 /*
  

- * Copyright (C) 2001-2014 Openbravo S.L.U.
+ * Copyright (C) 2001-2015 Openbravo S.L.U.
  * Licensed under the Apache Software License version 2.0
  * You may obtain a copy of the License at 
http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to  in writing,  software  
distributed
@@ -1481,7 +1481,7 @@
 } else {
   if (sql.sqlType.equals("statement"))
 out2.append("
connectionProvider.releaseTransactionalStatement(st);\n");
-  else if (sql.sqlType.equalsIgnoreCase("preparedstatement"))
+  else
 out2.append("
connectionProvider.releaseTransactionalPreparedStatement(st);\n");
 }
 out2.append("  } catch(Exception ignore){\n");
diff -r 543f652781a2 -r 6af281d22ea0 
src-test/src/org/openbravo/test/AllAntTaskTests.java
--- a/src-test/src/org/openbravo/test/AllAntTaskTests.java  Fri Oct 30 
13:15:08 2015 +0100
+++ b/src-test/src/org/openbravo/test/AllAntTaskTests.java  Mon Nov 02 
08:33:06 2015 +0100
@@ -57,6 +57,7 @@
 import org.openbravo.test.dal.ReadByNameTest;
 import org.openbravo.test.dal.ValidationTest;
 import org.openbravo.test.dal.ViewTest;
+import org.openbravo.test.db.model.functions.SqlCallableStatement;
 import org.openbravo.test.expression.EvaluationTest;
 import org.openbravo.test.model.ClassLoaderTest;
 import org.openbravo.test.model.IndexesTest;
@@ -103,7 +104,7 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 
-// dal
+// dal
 DalComplexQueryRequisitionTest.class, //
 DalComplexQueryTestOrderLine.class, //
 DalPerformanceInventoryLineTest.class, //
@@ -205,7 +206,10 @@
 ModuleScriptsVersions.class, //
 
 // role inheritance
-RoleInheritanceTestSuite.class
+RoleInheritanceTestSuite.class, //
+
+// db
+SqlCallableStatement.class
 
 })
 public class AllAntTaskTests {
diff -r 543f652781a2 -r 6af281d22ea0 
src-test/src/org/openbravo/test/AntTaskTests.java
--- a/src-test/src/org/openbravo/test/AntTaskTests.java Fri Oct 30 13:15:08 
2015 +0100
+++ b/src-test/src/org/openbravo/test/AntTaskTests.java Mon Nov 02 08:33:06 
2015 +0100
@@ -41,6 +41,7 @@
 import org.openbravo.test.dal.OBContextTest;
 import org.openbravo.test.dal.ReadByNameTest;
 import org.openbravo.test.dal.ValidationTest;
+import org.openbravo.test.db.model.functions.SqlCallableStatement;
 import org.openbravo.test.expression.EvaluationTest;
 import org.openbravo.test.model.ClassLoaderTest;
 import org.openbravo.test.model.OneToManyTest;
@@ -144,6 +145,9 @@
 // cdi
 CdiInfrastructure.class,
 
+// db
+SqlCallableStatement.class
+
 })
 public class AntTaskTests {
 }
\ No newline at end of file
diff -r 543f652781a2 -r 6af281d22ea0 
src-test/src/org/openbravo/test/db/model/functions/SqlCallableStatement.java
--- /dev/null  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/69d8860e9335
changeset: 27416:69d8860e9335
user:  Martin Taal martin.taal at openbravo.com
date:  Mon Aug 24 15:20:53 2015 +0200
summary:   Related to issue 30485: Lots of errors in log during tomcat shutdown 
related to new import entry project

details:   https://code.openbravo.com/erp/devel/pi/rev/7c951bc26fd6
changeset: 27417:7c951bc26fd6
user:  Martin Taal martin.taal at openbravo.com
date:  Tue Aug 25 13:07:01 2015 +0200
summary:   Merged heads

details:   https://code.openbravo.com/erp/devel/pi/rev/416fa6638a01
changeset: 27418:416fa6638a01
user:  Martin Taal martin.taal at openbravo.com
date:  Tue Aug 25 23:11:29 2015 +0200
summary:   Merged heads

details:   https://code.openbravo.com/erp/devel/pi/rev/43add7d45732
changeset: 27419:43add7d45732
user:  Martin Taal martin.taal at openbravo.com
date:  Wed Aug 26 22:45:47 2015 +0200
summary:   Merged Heads

diffstat:

 .hgsigs
 |   1 +
 .hgtags
 |   1 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  
 |   2 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   4 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ReceivedFromPaymentMethodActionHandler.java
 |  13 -
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
  |   6 ++-
 
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml   
 |   2 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
   |   2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   8 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
|   2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   2 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml   
 |   2 +-
 
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   6 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml 
 |   2 +-
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   4 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml 
|   2 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml  
 |   2 +-
 
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
  |   2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
   |   2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
   |   2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|  10 ++--
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/85dfde8b2f9e
changeset: 26930:85dfde8b2f9e
user:  Jorge Garcia jorge.garcia at openbravo.com
date:  Mon Jun 08 12:52:28 2015 +0200
summary:   Related to issue 30123: Export module scripts changes of sample data

The changes made in the ant update.database command has been
exported from the sample data and commited.

details:   https://code.openbravo.com/erp/devel/pi/rev/4741905d5ddf
changeset: 26931:4741905d5ddf
user:  Jorge Garcia jorge.garcia at openbravo.com
date:  Mon Jun 08 13:17:31 2015 +0200
summary:   Related to issue 30123: Export Log Clean Up process changes of 
sample data

The changes made in the process has been exported from the sample data
and commited.

details:   https://code.openbravo.com/erp/devel/pi/rev/1006e1dfcc14
changeset: 26932:1006e1dfcc14
user:  Jorge Garcia jorge.garcia at openbravo.com
date:  Mon Jun 08 15:29:38 2015 +0200
summary:   Related to issue 30123: Delete fact_acct rows of sample data

Some rows of the table fact_acct has been removed. The last two years
of this table is still used for some reports.

details:   https://code.openbravo.com/erp/devel/pi/rev/334db37192ed
changeset: 26933:334db37192ed
user:  Jorge Garcia jorge.garcia at openbravo.com
date:  Tue Jun 09 17:47:06 2015 +0200
summary:   Fixed issue 30123: Sample data (FB International Group Client) for 
PR15Q03

Updated sample data for PR15Q3

diffstat:

 referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml  
 |   71274 -
 referencedata/sampledata/F_B_International_Group/AD_PINSTANCE_PARA.xml 
 |   31200 -
 referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml 
 | 140 +
 referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml   
 |  62 +-
 referencedata/sampledata/F_B_International_Group/AD_USER.xml   
 |  48 +-
 referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml  
 | 294 +
 referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml
 |  66 +-
 referencedata/sampledata/F_B_International_Group/C_INVOICE.xml 
 |3958 +-
 referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml 
 |9687 +
 referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml  
 |4698 +
 referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml  
 |1020 +
 referencedata/sampledata/F_B_International_Group/C_ORDER.xml   
 |2232 +
 referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml   
 |   10396 +
 referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml
 |4029 +
 referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml
 | 576 +
 referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml  
 | 180 +
 referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml 
 |  415514 +
 referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml 
 |  46 +-
 referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml 
 |1008 +
 referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml
 |1608 +
 referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml 
 |   8 +-
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml   
 |1812 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml
 | 896 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml  
 | 174 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml   
 | 660 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml  
 |2370 +-
 
referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml 
|1332 +-
 referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml
 | 116 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml
 | 216 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml   
 |  78 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml
 |1512 +
 referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml
 | 120 +
 referencedata/sampledata/F_B_International_Group/M_COSTING.xml 
 |1976 +-
 referencedata/sampledata/F_B_International_Group/M_INOUT.xml   
 |1548 +
 referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml   
 |5178 +
 referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml
 |1482 +
 referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml 
 |2964 +
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/45083853c520
changeset: 26918:45083853c520
user:  Martin Taal martin.taal at openbravo.com
date:  Mon Jun 15 06:34:08 2015 +0200
summary:   Related to issue 29766: Retail Operations Buffer: store all 
transactions in operations table before processing
Small re-ordering so that code uses loop instead of recursive call

details:   https://code.openbravo.com/erp/devel/pi/rev/38ef59dd8c24
changeset: 26919:38ef59dd8c24
user:  Martin Taal martin.taal at openbravo.com
date:  Mon Jun 15 06:38:50 2015 +0200
summary:   Merged Heads

details:   https://code.openbravo.com/erp/devel/pi/rev/98cb1ce1537d
changeset: 26920:98cb1ce1537d
user:  Martin Taal martin.taal at openbravo.com
date:  Mon Jun 15 08:45:40 2015 +0200
summary:   Related to issue 30174: Triggers temporarily disabled for whole 
application through webpos
Added check/test code in OBDal to prevent disabling triggers 'globally'

details:   https://code.openbravo.com/erp/devel/pi/rev/1cd2ebb5fb20
changeset: 26921:1cd2ebb5fb20
user:  Martin Taal martin.taal at openbravo.com
date:  Mon Jun 15 10:43:38 2015 +0200
summary:   Merged heads

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  
   |2 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |4 +-
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml   
   |2 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
 |2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |8 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
 |9 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
  |2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |2 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml   
   |2 +-
 
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |6 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml 
   |2 +-
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |4 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml 
  |2 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|2 +-
 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml  
   |2 +-
 
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
|2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
 |2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
 |2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   10 +-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
 |2 +-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |4 +-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
 |2 +-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |2 +-
 modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
   |2 +-
 
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
 |2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/209da9cda816
changeset: 26907:209da9cda816
user:  Jorge Garcia jorge.garcia at openbravo.com
date:  Wed Jun 10 10:52:18 2015 +0200
summary:   Fixed issue 29972: Outstanding amount of sales order payment plan is 
not updated

The problem was that the outstanding amount of sales order payment plan is not
updated when payment method is set as automatic receipt.

Before the commit which introduces this regression,  the function checked the
status of the payment. With the changes,  the function checks if the payment
schedule detail is paid.

The problem was in the update of the payment plan of the sales order,
specifically in WHERE clause for outstanding amount.

Now, the where clause works as expected, and the outstanding amount is updated
properly.

details:   https://code.openbravo.com/erp/devel/pi/rev/70a9d6732cc5
changeset: 26908:70a9d6732cc5
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Fri Jun 12 12:05:42 2015 +0200
summary:   Related to issue 29972: code review improvements
Reduced useless query complexity to update outstanding amount.
It's only necessary to check fin_payment_detail_id is null (not associated 
payment) or isinvoicepaid='N' (associated payment but in a non paid yet status)

details:   https://code.openbravo.com/erp/devel/pi/rev/99cc73c54bf0
changeset: 26909:99cc73c54bf0
user:  Jorge Garcia jorge.garcia at openbravo.com
date:  Wed Jun 10 13:09:56 2015 +0200
summary:   Fixed issue 30082: Payment plan is updating wrong in some 
circumstances

Payment plan is updating wrong if Payment Method is set as Automatic Receipt
and a sales order is partially paid.

The problem was that the function duplicates the value of the received amount
created in the Complete process of the invoice, because the function searches
all the payment details of the payment plan that has an invoice paid
(invoicepaid column).

The solution is to search those payment details that are not pre-paid and then
update the payment plan.

Now, the values are filled correctly.

details:   https://code.openbravo.com/erp/devel/pi/rev/ab5e14425861
changeset: 26910:ab5e14425861
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Fri Jun 12 12:49:18 2015 +0200
summary:   Related to issue 30082: code review improvements

The invoice's payment schedules and payment monitor is only updated when all 
the payment schedule details are paid.

This changeset covers the scenario where an order is partially paid. Before 
this change, the invoice's payment schedules and payment monitor were wrongly 
updated considering that the payment schedule was fully paid when any of its 
payment schedule details was paid. That asumption may be wrong in some 
scenarios, for example when the order is associated to one or more payment 
schedule details not yet paid (isinvoicepaid=N) and at least one already paid.

diffstat:

 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
 |  28 +++--
 1 files changed, 10 insertions(+), 18 deletions(-)

diffs (60 lines):

diff -r 91f6d8a87c92 -r ab5e14425861 
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
 Fri Jun 12 11:48:26 2015 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
 Fri Jun 12 12:49:18 2015 +0200
@@ -904,7 +904,7 @@
   END IF;
 END IF;
 
-  IF (cur_finaccpaymentmethod.ExecutionType'A') THEN
+IF (cur_finaccpaymentmethod.ExecutionType'A') THEN
   UPDATE FIN_PAYMENT_SCHEDULE
   SET PAIDAMT = (SELECT COALESCE(sum(amount + 
COALESCE(writeoffamt, 0)), 0)
  FROM fin_payment_scheduledetail
@@ -919,13 +919,7 @@
   OUTSTANDINGAMT = (SELECT COALESCE(sum(amount), 0)
 FROM fin_payment_scheduledetail
 WHERE 
fin_payment_schedule_order=cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER 
AND
-  (fin_payment_detail_id is null OR
-   exists (SELECT 1
-   FROM fin_payment, 
fin_payment_detail
-   WHERE 
fin_payment.fin_payment_id = fin_payment_detail.fin_payment_id
-  and 
fin_payment.processed='Y' 
-  and 
fin_payment_scheduledetail.isinvoicepaid='Y'
-  and 
fin_payment_detail.fin_payment_detail_id = 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/4f00f31f65e1
changeset: 26282:4f00f31f65e1
user:  Reinaldo Guerra reinaldo.guerra at peoplewalking.com
date:  Wed Mar 25 12:25:21 2015 -0500
summary:   Fixed bug 28907, fixed bug 27848, fixed bug 29003

The following changes was made in Stock Reservation pick and edit:
When filters are executed, a Reservation entity is created from the json 
parameter @MaterialMgmtReservation.id@. This works fine when the pop-up is 
called from Stock Reservation window, but from Sales Order, this parameter does 
not exists, and the filter process fails. Now is included a code line that puts 
a @MaterialMgmtReservation.id@ into the json parameters before the filters 
are applied.
Array critera filtering was bad created when getting grid's data, so was 
changed, to allow filter's multiple selection.
An hibernate exception is launched when typing wrong filters and the expression 
in () is included in the query to be executed. So this expression was 
replaced by one which returns a false value: 1 = 2.
Were included also, changes to allow filtering quantity's column. Other changes 
were included to avoid exceptions comparing to null values.

details:   https://code.openbravo.com/erp/devel/pi/rev/621618711608
changeset: 26283:621618711608
user:  Reinaldo Guerra reinaldo.guerra at peoplewalking.com
date:  Thu Mar 26 12:49:23 2015 -0500
summary:   Related to issue 28907: Empty filter when there is no attribute set 
value.

When records are created in Stock Reservation pick and edit, the 0 value 
retrieved from default attribute set instance, defined in reservation's tables, 
is now set to null, when creating filter criteria.
Now if there is no attribute set defined for reservation's products, the 
attribute set value filter is empty.

details:   https://code.openbravo.com/erp/devel/pi/rev/12e2fb2008f2
changeset: 26284:12e2fb2008f2
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Thu Mar 26 13:56:32 2015 +0100
summary:   Related to 29003: Avoid exception

Avoid exceptions in getOrderLineSetValueFilterData and 
getAttributeSetValueFilterData methods

details:   https://code.openbravo.com/erp/devel/pi/rev/bb85cbd52ff0
changeset: 26285:bb85cbd52ff0
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Thu Mar 26 14:17:07 2015 +0100
summary:   Related to 29003: Avoid exception when filtering by number

Avoid exceptions when retrieving the value of the filter in number-type columns 
and the value is not a number

diffstat:

 src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java 
|  616 +++--
 1 files changed, 471 insertions(+), 145 deletions(-)

diffs (truncated from 892 to 300 lines):

diff -r 60a8ed1b0650 -r bb85cbd52ff0 
src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java
--- 
a/src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java
Fri Mar 27 01:11:08 2015 +
+++ 
b/src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java
Thu Mar 26 14:17:07 2015 +0100
@@ -142,7 +142,10 @@
   JSONArray criterias = (JSONArray) 
JsonUtils.buildCriteria(parameters).get(criteria);
   for (int i = 0; i  criterias.length(); i++) {
 final JSONObject criteria = criterias.getJSONObject(i);
-filterCriteria.put(criteria.getString(fieldName), 
criteria.getString(value));
+if (criteria.has(fieldName)) {
+  filterCriteria.put(criteria.getString(fieldName),
+  criteria.has(value) ? criteria.getString(value) : 
criteria.toString());
+}
   }
 } catch (JSONException e) {
   log4j.error(Error while building the criteria, e);
@@ -170,12 +173,14 @@
   ids.add((String) record.get(purchaseOrderLine));
 }
 OBCriteriaOrderLine obc = 
OBDal.getInstance().createCriteria(OrderLine.class);
-obc.add(Restrictions.in(OrderLine.PROPERTY_ID, ids));
-obc.setFilterOnReadableClients(false);
-obc.setFilterOnReadableOrganization(false);
-obc.setFilterOnActive(false);
-obc.addOrderBy(OrderLine.PROPERTY_SALESORDER, false);
-obc.addOrderBy(OrderLine.PROPERTY_LINENO, true);
+if (ids.size()  0) {
+  obc.add(Restrictions.in(OrderLine.PROPERTY_ID, ids));
+  obc.setFilterOnReadableClients(false);
+  obc.setFilterOnReadableOrganization(false);
+  obc.setFilterOnActive(false);
+  obc.addOrderBy(OrderLine.PROPERTY_SALESORDER, false);
+  obc.addOrderBy(OrderLine.PROPERTY_LINENO, true);
+}
 return obc.list();
   }
 
@@ -187,7 +192,8 @@
   JSONArray criterias = (JSONArray) 
JsonUtils.buildCriteria(parameters).get(criteria);
   for (int i = 0; i  criterias.length(); i++) {
 final JSONObject criteria = criterias.getJSONObject(i);
-filterCriteria.put(criteria.getString(fieldName), 
criteria.getString(value));
+filterCriteria.put(criteria.getString(fieldName),
+criteria.has(value) ? criteria.getString(value) 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/e087d572eed7
changeset: 25653:e087d572eed7
user:  Unai Martirena unai.martirena at openbravo.com
date:  Wed Dec 31 11:03:15 2014 +0100
summary:   Fixes bug 28502: Inv Amt Update takes into account Costing Rule 
warehouse dim

The problem was that the process was checking if the warehouse in Inventory 
Amount Update is null or not, and if not, it uses it. This is correct when the 
Costing Rule is set as Warehouse Dimension, but if is not, it should not use 
it, and even if the Costing Rule is not set as Warehouse Dimension and the 
warehouse field is hidden in Inventory Amount Lines, it is filled with the 
Warehouse set in session value.

details:   https://code.openbravo.com/erp/devel/pi/rev/5d9b7b151669
changeset: 25654:5d9b7b151669
user:  Unai Martirena unai.martirena at openbravo.com
date:  Wed Dec 31 13:50:58 2014 +0100
summary:   Fixes bug 28509: Inventory Amt Update now works with negative stock.

In this case the Qty Count and Qty Book have been reverted in the Physical 
Inventory Lines and negate them to make them positive, maintaining the 
difference between them to create the same transaction quantity.

Also getInventoryClosingCost function in AverageAlgorithm has been changed to 
negate the cost obtained from an inventory closing when the movement qty is 
positive (closing from negative to 0), because the cost obtained was negative, 
and this is wrong.

details:   https://code.openbravo.com/erp/devel/pi/rev/2161bdf91225
changeset: 25655:2161bdf91225
user:  Unai Martirena unai.martirena at openbravo.com
date:  Wed Dec 31 16:16:00 2014 +0100
summary:   Fixes Bug 28487: Fixed Null Pointer Exception.

The problem was that in updateBDCostingTimeRange function inside 
AverageCostAdjustment class, the code was trying to get the movement date of a 
Inventory Transaction related to a Costing record. But not all costing have 
Inventory Transaction, so it was giving a NPE.
Now, if there is a previous Costing record than the one created due to a 
backdated transaction, this Costing will be shortened till transaction process 
date, and the new Backdated costing record will start at that moment.
This only happens the first time that a related transaction is found that is 
not a backdated transaction, because if is done with a backdated transaction 
time overlap can happen.

details:   https://code.openbravo.com/erp/devel/pi/rev/e96a15e0c289
changeset: 25656:e96a15e0c289
user:  Unai Martirena unai.martirena at openbravo.com
date:  Fri Jan 02 13:01:06 2015 +0100
summary:   Fixed bug 28052: Wrong message processing a Shipment with a partial 
reservation.

Reallocation function executed when trying to complete a Goods Shipment, was 
changed to launch a not enough stock error if the quantity pending to release 
exceeds the available existent in the line's storage bin.

diffstat:

 src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml |   4 +
 src/org/openbravo/costing/AverageAlgorithm.java  |   3 +
 src/org/openbravo/costing/AverageCostAdjustment.java |  33 ---
 src/org/openbravo/costing/InventoryAmountUpdateProcess.java  |   8 +-
 4 files changed, 35 insertions(+), 13 deletions(-)

diffs (112 lines):

diff -r c778327fb6eb -r e96a15e0c289 
src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml
--- a/src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml  Tue Dec 
30 22:17:38 2014 +
+++ b/src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml  Fri Jan 
02 13:01:06 2015 +0100
@@ -156,6 +156,10 @@
 p_message := '@MoreQuantityToReleaseThanPending@'||' @of@'||' @Product@: 
'||v_product_value||', @AttributeSetInstance@: '||COALESCE(v_attr_description, 
'-')|| ', @UOM@: '||v_uom_value||' @And@'||' @StorageBin@: 
'||COALESCE(v_locator_value, '-');
   END IF;
 
+  IF (v_pendingtoreallocate  v_stock_onhand) THEN
+RAISE_APPLICATION_ERROR(-2, '@NotEnoughAvailableStock@'||' @of@'||' 
@Product@: '||v_product_value||', @AttributeSetInstance@: 
'||COALESCE(v_attr_description, '-')|| ', @UOM@: '||v_uom_value||' @And@'||' 
@StorageBin@: '||COALESCE(v_locator_value, '-'));
+  END IF;
+
   -- Check that quantity to release is lower than available quantity 
considering other reservations allocated stock.
   IF (v_pendingtoreallocate  v_stock_onhand - (v_stock_alloc - 
v_this_sd_alloc)) THEN
 RAISE_APPLICATION_ERROR(-2, '@CannotReallocateAllQuantity@'||' 
@of@'||' @Product@: '||v_product_value||', @AttributeSetInstance@: 
'||COALESCE(v_attr_description, '-')|| ', @UOM@: '||v_uom_value||' @And@'||' 
@StorageBin@: '||COALESCE(v_locator_value, '-'));
diff -r c778327fb6eb -r e96a15e0c289 
src/org/openbravo/costing/AverageAlgorithm.java
--- a/src/org/openbravo/costing/AverageAlgorithm.java   Tue Dec 30 22:17:38 
2014 +
+++ b/src/org/openbravo/costing/AverageAlgorithm.java   Fri Jan 02 13:01:06 
2015 +0100
@@ -104,6 +104,9 @@
 transaction.getProduct(), 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/9cd37b3b7a69
changeset: 25586:9cd37b3b7a69
user:  Unai Martirena unai.martirena at openbravo.com
date:  Mon Dec 22 10:17:32 2014 +0100
summary:   Fixes bug 28461: Fix Backdated From field should be equal to 
Starting Date field

Fix Backdated From date column reference in Costing Rule has been changed from 
Date to DateTime.

details:   https://code.openbravo.com/erp/devel/pi/rev/d94b15f193e6
changeset: 25587:d94b15f193e6
user:  Unai Martirena unai.martirena at openbravo.com
date:  Mon Dec 22 17:21:27 2014 +0100
summary:   Related to Issue 27831: Add copyright header to new file

details:   https://code.openbravo.com/erp/devel/pi/rev/01f0864830c8
changeset: 25588:01f0864830c8
user:  Unai Martirena unai.martirena at openbravo.com
date:  Mon Dec 22 18:30:10 2014 +0100
summary:   Fixes Issue 28417: Warehouse in Return Material Receipt properly 
filtered.

The warehouse selector in the Return Material Receipt window is not filtering 
any more by warehouses on hand. The filter expression on On Hand Warehouse 
selector has been modified to fix this problem.

details:   https://code.openbravo.com/erp/devel/pi/rev/57da281af0de
changeset: 25589:57da281af0de
user:  Unai Martirena unai.martirena at openbravo.com
date:  Mon Dec 22 19:12:07 2014 +0100
summary:   Fixes Issue 26511: Display correct error message while deleting the 
orderline.

The problem on this issue is that the trigger is not able to delete the related 
reservation of the orderline and the given error is displayed. So in this case 
the error message displayed has been improved to warn the user that needs to 
remove the reservation manually before deleting the Sales Order Line.

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java
 |  25 -
 src-db/database/model/triggers/C_ORDERLINE_TRG.xml 
 |   8 +--
 src-db/database/sourcedata/AD_COLUMN.xml   
 |   2 +-
 src-db/database/sourcedata/AD_MESSAGE.xml  
 |  12 
 src-db/database/sourcedata/OBUISEL_SELECTOR.xml
 |   2 +-
 5 files changed, 37 insertions(+), 12 deletions(-)

diffs (106 lines):

diff -r 3e74f819198d -r 57da281af0de 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java
   Mon Dec 22 12:06:48 2014 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java
   Mon Dec 22 19:12:07 2014 +0100
@@ -1,3 +1,22 @@
+/*
+ *
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  License),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an AS IS
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2014 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  __.
+ 
+ */
+
 package org.openbravo.advpaymentmngt.hqlinjections;
 
 import java.util.Map;
@@ -11,12 +30,12 @@
   @Override
   public String transformHqlQuery(String hqlQuery, MapString, String 
requestParameters,
   MapString, Object queryNamedParameters) {
-
+
 String transformedHQL = hqlQuery.replace(@selectClause@,  );
 transformedHQL = transformedHQL.replace(@joinClause@,  );
-transformedHQL = transformedHQL.replace(@whereClause@, 
+transformedHQL = transformedHQL.replace(@whereClause@,
 getWhereClause(requestParameters, queryNamedParameters));
-
+
 return transformedHQL;
   }
 
diff -r 3e74f819198d -r 57da281af0de 
src-db/database/model/triggers/C_ORDERLINE_TRG.xml
--- a/src-db/database/model/triggers/C_ORDERLINE_TRG.xmlMon Dec 22 
12:06:48 2014 +0100
+++ b/src-db/database/model/triggers/C_ORDERLINE_TRG.xmlMon Dec 22 
19:12:07 2014 +0100
@@ -86,13 +86,7 @@
 FROM m_reservation 
 WHERE c_orderline_id = :OLD.c_orderline_id;
 IF (v_count  0) THEN
-  SELECT 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/9a54bcd074e8
changeset: 25547:9a54bcd074e8
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Thu Dec 11 14:13:06 2014 +0100
summary:   Fixes bug 28387 BillofMaterialsAccounting should always be created 
in the same order

In order to help JUnit tests assert Bill of Materials Production accounting, an 
orderBy clause has been added when creating Bill of Materials Production 
Accounting lines, to be created always in the same order

details:   https://code.openbravo.com/erp/devel/pi/rev/3b18b7807c27
changeset: 25548:3b18b7807c27
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Fri Dec 12 13:15:47 2014 +0100
summary:   Fixes issue 28398 OBBaseTest should initialize DalLayer in a 
BeforeClass method

In order to be able to use DAL in a BeforeClass method of any JUnit test, 
OBBaseTest superclass should initialize Dal layer in a BeforeClass method 
instead of in a Before method.

details:   https://code.openbravo.com/erp/devel/pi/rev/b2a6c840d544
changeset: 25549:b2a6c840d544
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Fri Dec 12 14:35:09 2014 +0100
summary:   Fixes bug 28406: RescheduleProcess should get requestId from request 
parameters

In order to be able to execute a process request from a JUnit test, 
RescheduleProcess java class should be able to get requestId from request 
parameters if session value is empty.

details:   https://code.openbravo.com/erp/devel/pi/rev/59b8162c18c0
changeset: 25550:59b8162c18c0
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Fri Dec 12 14:39:16 2014 +0100
summary:   Fixes bug 28407 BaseDataSourceTestDal should make requests with the 
contentType

In order to be able to make a request specifying the content type from a JUnit 
test, BaseDataSourceTestDal java class and also BaseDataSourceTestNoDal java 
class should have an extra doRequest method adding a contentType parameter.

diffstat:

 src-test/src/org/openbravo/test/base/OBBaseTest.java|  20 
+---
 src-test/src/org/openbravo/test/datasource/BaseDataSourceTestDal.java   |  23 
+++--
 src-test/src/org/openbravo/test/datasource/BaseDataSourceTestNoDal.java |  23 
+++--
 src/org/openbravo/erpCommon/ad_forms/DocLineProduction_data.xsql|   1 +
 src/org/openbravo/erpCommon/ad_process/RescheduleProcess.java   |   4 
+-
 5 files changed, 51 insertions(+), 20 deletions(-)

diffs (154 lines):

diff -r 2c1d1e0f0fb7 -r 59b8162c18c0 
src-test/src/org/openbravo/test/base/OBBaseTest.java
--- a/src-test/src/org/openbravo/test/base/OBBaseTest.java  Tue Nov 11 
18:08:41 2014 -0500
+++ b/src-test/src/org/openbravo/test/base/OBBaseTest.java  Fri Dec 12 
14:39:16 2014 +0100
@@ -31,6 +31,7 @@
 import org.hibernate.criterion.Restrictions;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
@@ -155,17 +156,22 @@
   protected static final String TEST_LOCATION_ID = 
A21EF1AB822149BEB65D055CD91F261B;
 
   /**
-   * Overridden to initialize the Dal layer, sets the current user to the the 
User:
-   * {@link #TEST_USER_ID}
+   * Overridden to initialize the Dal layer
* 
*/
+  @BeforeClass
+  public static void setDalUp() throws Exception {
+if (new OBBaseTest().getClass().getResource(/log4j.lcf) != null) {
+  PropertyConfigurator.configure(new 
OBBaseTest().getClass().getResource(/log4j.lcf));
+}
+new OBBaseTest().initializeDalLayer();
+  }
+
+  /**
+   * Sets the current user to the {@link #TEST_USER_ID} user.
+   */
   @Before
   public void setUp() throws Exception {
-if (this.getClass().getResource(/log4j.lcf) != null) {
-  
PropertyConfigurator.configure(this.getClass().getResource(/log4j.lcf));
-}
-
-initializeDalLayer();
 // clear the session otherwise it keeps the old model
 setTestUserContext();
 // be negative is set back to false at the end of a successfull test.
diff -r 2c1d1e0f0fb7 -r 59b8162c18c0 
src-test/src/org/openbravo/test/datasource/BaseDataSourceTestDal.java
--- a/src-test/src/org/openbravo/test/datasource/BaseDataSourceTestDal.java 
Tue Nov 11 18:08:41 2014 -0500
+++ b/src-test/src/org/openbravo/test/datasource/BaseDataSourceTestDal.java 
Fri Dec 12 14:39:16 2014 +0100
@@ -44,23 +44,34 @@
* Performs a request to Openbravo returning its response and asserting the 
response code matches
* expectedResponse.
*/
-  protected String doRequest(String wsPart, MapString, String params, int 
expectedResponse,
-  String method) throws Exception {
-return doRequest(wsPart, DatasourceTestUtil.getParamsContent(params), 
expectedResponse, method);
+  protected String doRequest(String wsPart, String content, int 
expectedResponse, String method)
+  throws Exception {
+return doRequest(wsPart, content, 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/1f26de8763c0
changeset: 25493:1f26de8763c0
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Mon Dec 01 16:49:43 2014 +0100
summary:   Fixes bug 28286 LandedCostLineAmt should always be created in the 
same order

In order to help JUnit tests assert landed cost, an orderBy clause has been 
added when creating Landed Cost Receipt Line Amount lines, to be always created 
in the same order.

details:   https://code.openbravo.com/erp/devel/pi/rev/4ae6c365fd3e
changeset: 25494:4ae6c365fd3e
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Mon Dec 01 16:50:51 2014 +0100
summary:   Fixes bug 28308 LandedCost Accounting should always be created in 
the same order

In order to help JUnit tests assert landed cost accounting, an orderBy clause 
has been added when creating Landed Cost Accounting lines, to be created always 
in the same order

details:   https://code.openbravo.com/erp/devel/pi/rev/51adc29c2514
changeset: 25495:51adc29c2514
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Mon Dec 01 16:54:02 2014 +0100
summary:   Fixes bug 28266 ParentCostAdjustmentLine should always be assigned 
in the same order

In order to help JUnit tests assert Cost Adjustment lines, an orderBy clause 
has been added when assigning the field Parent Cost Adjustment Line to follow 
always the same order

details:   https://code.openbravo.com/erp/devel/pi/rev/5bb50e44ea69
changeset: 25496:5bb50e44ea69
user:  Alvaro Ferraz alvaro.ferraz at openbravo.com
date:  Mon Dec 01 16:55:05 2014 +0100
summary:   Related to Issue 28148 Cost Adjustment Lines created ordered by 
trxprocessdate

In order to help JUnit tests assert Cost Adjustment lines, an orderBy clause 
has been added when creating cost adjustment lines of type Landed Cost to 
follow always the same order

diffstat:

 src/org/openbravo/costing/CostAdjustmentProcess.java |  3 ++-
 src/org/openbravo/costing/LCMatchingProcess.java |  5 +
 src/org/openbravo/costing/LandedCostDistributionByAmount.java|  3 ++-
 src/org/openbravo/costing/LandedCostProcess.java |  5 -
 src/org/openbravo/erpCommon/ad_forms/DocLineLandedCost_data.xsql |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diffs (73 lines):

diff -r 107d831cf383 -r 5bb50e44ea69 
src/org/openbravo/costing/CostAdjustmentProcess.java
--- a/src/org/openbravo/costing/CostAdjustmentProcess.java  Thu Dec 04 
16:58:28 2014 +0100
+++ b/src/org/openbravo/costing/CostAdjustmentProcess.java  Mon Dec 01 
16:55:05 2014 +0100
@@ -249,8 +249,9 @@
 critLines.createAlias(CostAdjustmentLine.PROPERTY_COSTADJUSTMENT, ca);
 critLines.add(Restrictions.eq(ca.id, strCostAdjustmentId));
 
critLines.add(Restrictions.eq(CostAdjustmentLine.PROPERTY_ISRELATEDTRANSACTIONADJUSTED,
 false));
+critLines.addOrder(Order.asc(trx. + 
MaterialTransaction.PROPERTY_TRANSACTIONPROCESSDATE));
+
critLines.addOrder(Order.asc(CostAdjustmentLine.PROPERTY_ADJUSTMENTAMOUNT));
 critLines.addOrder(Order.asc(trx. + 
MaterialTransaction.PROPERTY_MOVEMENTDATE));
-critLines.addOrder(Order.asc(trx. + 
MaterialTransaction.PROPERTY_TRANSACTIONPROCESSDATE));
 critLines.setMaxResults(1);
 return (CostAdjustmentLine) critLines.uniqueResult();
   }
diff -r 107d831cf383 -r 5bb50e44ea69 
src/org/openbravo/costing/LCMatchingProcess.java
--- a/src/org/openbravo/costing/LCMatchingProcess.java  Thu Dec 04 16:58:28 
2014 +0100
+++ b/src/org/openbravo/costing/LCMatchingProcess.java  Mon Dec 01 16:55:05 
2014 +0100
@@ -152,10 +152,15 @@
 StringBuffer hql = new StringBuffer();
 hql.append( select sum(rla. + LCReceiptLineAmt.PROPERTY_AMOUNT + ) as 
amt);
 hql.append(   , rla. + LCReceipt.PROPERTY_GOODSSHIPMENTLINE + .id as 
receipt);
+hql.append(   , (select  + 
MaterialTransaction.PROPERTY_TRANSACTIONPROCESSDATE +  from 
++ MaterialTransaction.ENTITY_NAME +  as transaction where 
++ MaterialTransaction.PROPERTY_GOODSSHIPMENTLINE + .id = rla.
++ LCReceipt.PROPERTY_GOODSSHIPMENTLINE + .id) as trxprocessdate);
 hql.append( from  + LCReceiptLineAmt.ENTITY_NAME +  as rla);
 hql.append( where rla. + LCReceiptLineAmt.PROPERTY_LANDEDCOSTCOST +  = 
:lcc);
 hql.append(   and rla. + LCReceiptLineAmt.PROPERTY_ISMATCHINGADJUSTMENT 
+  = true );
 hql.append( group by rla. + LCReceipt.PROPERTY_GOODSSHIPMENTLINE + 
.id);
+hql.append( order by trxprocessdate, amt);
 
 Query qryLCRLA = 
OBDal.getInstance().getSession().createQuery(hql.toString());
 qryLCRLA.setParameter(lcc, lcCost);
diff -r 107d831cf383 -r 5bb50e44ea69 
src/org/openbravo/costing/LandedCostDistributionByAmount.java
--- a/src/org/openbravo/costing/LandedCostDistributionByAmount.java Thu Dec 
04 16:58:28 2014 +0100
+++ b/src/org/openbravo/costing/LandedCostDistributionByAmount.java Mon Dec 
01 16:55:05 2014 +0100
@@ -145,7 +145,8 @@
 qry.append(   and 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/138134afe781
changeset: 25310:138134afe781
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Mon Nov 24 13:05:08 2014 +0100
summary:   Related with issue 28188: Handle better the records with validation 
errors

When a record is saved and it has a validation errors, its _hasValidationErrors 
flag is set to true. At no point this flag was set to false when the validation 
errors were solved (either by cancelling the
changes or by saving the record again after fixing the data).

Now the handling of the validation errores is done using the 
addRecordToValidationErrorList and removeRecordFromValidationErrorList 
functions. This functions not only set to true or false the _hasValidatio
nErrors flag, but also keep a list of the ids of the records that have 
validation errors. This allows to know at any point what records have 
validation errors without having to iterate the whole grid local
 data. Also a function has been added to check if the grid has any validation 
errors.

details:   https://code.openbravo.com/erp/devel/pi/rev/bc62931cf7f8
changeset: 25311:bc62931cf7f8
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Mon Nov 24 13:13:22 2014 +0100
summary:   Related with issue 28188: Disable refresh button if grid has 
validation errors

If any record of the grid has validation errors, disable the refresh toolbar 
button. If the user were to refresh the record while it had validation errors, 
the unsaved data would be lost.

details:   https://code.openbravo.com/erp/devel/pi/rev/b1d40e3d4f77
changeset: 25312:b1d40e3d4f77
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Mon Nov 24 15:44:51 2014 +0100
summary:   Related with bug 28188:Enable the Cancel button if selected record 
has errors

The Cancel Changes toolbar button should be enabled if the selected record has 
validation errors, even if the record is not being currently edited. In this 
case, if the button is pushed then the local chan
ges of that record should be canceled.

details:   https://code.openbravo.com/erp/devel/pi/rev/5275962066ba
changeset: 25313:5275962066ba
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Mon Nov 24 15:49:17 2014 +0100
summary:   Fixes issue 28188: Backs out original fix, another approach is used

When the grid has data that has not been saved due to having validation errors, 
instead of allowing the user to refresh the record and get rid of the local 
changes, now the refresh button is disabled. The cancel button can be used to 
restore the data to the state it had before the validation errors, and once 
there are no more invalid records the refresh button will be enabled again.

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
  |  50 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
 |  10 +-
 2 files changed, 56 insertions(+), 4 deletions(-)

diffs (127 lines):

diff -r 31a1f49e05a8 -r 5275962066ba 
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
 Mon Nov 24 11:09:01 2014 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
 Mon Nov 24 15:49:17 2014 +0100
@@ -1733,7 +1733,6 @@
 }
 this.actionAfterDataArrived = callback;
 this.invalidateCache();
-this.discardAllEdits();
 
 var context = {
   showPrompt: false
@@ -2895,7 +2894,7 @@
 // set the default error message,
 // is possibly overridden in the next call
 if (record) {
-  record._hasValidationErrors = true;
+  this.addRecordToValidationErrorList(record);
   if (!record[isc.OBViewGrid.ERROR_MESSAGE_PROP]) {
 this.setRecordErrorMessage(rowNum, 
OB.I18N.getLabel('OBUIAPP_ErrorInFields'));
 // do not automatically remove this message
@@ -2927,6 +2926,45 @@
 }
   },
 
+  addRecordToValidationErrorList: function (record) {
+if (!record) {
+  return;
+}
+record._hasValidationErrors = true;
+this.recordIdsWithValidationError = this.recordIdsWithValidationError || 
[];
+if (!this.recordIdsWithValidationError.contains(record[OB.Constants.ID])) {
+  this.recordIdsWithValidationError.push(record[OB.Constants.ID]);
+}
+  },
+
+  removeRecordFromValidationErrorList: function (record) {
+if (!record) {
+  return;
+}
+delete record._hasValidationErrors;
+this.recordIdsWithValidationError = this.recordIdsWithValidationError || 
[];
+this.recordIdsWithValidationError.remove(record[OB.Constants.ID]);
+  },
+
+  selectedRecordHasValidationErrors: function () {
+var record;
+// if the number of selected records is not 1, return false
+if 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/67db68052e38
changeset: 25091:67db68052e38
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Fri Oct 24 09:05:56 2014 +0200
summary:   Related to issue 27913

fix convertDateToUTC method and match statement force name process

details:   https://code.openbravo.com/erp/devel/pi/rev/b6a6eab1a584
changeset: 25092:b6a6eab1a584
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Fri Oct 24 09:07:03 2014 +0200
summary:   Fixed bug 27972 Landed cost field should be readonly in landed cost 
tab

details:   https://code.openbravo.com/erp/devel/pi/rev/204a51e9e87c
changeset: 25093:204a51e9e87c
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Fri Oct 24 09:39:25 2014 +0200
summary:   Fixed bug 27971 Process matching should not be shown in Goods 
Receipt window

details:   https://code.openbravo.com/erp/devel/pi/rev/ec9704fba4ee
changeset: 25094:ec9704fba4ee
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Fri Oct 24 09:57:22 2014 +0200
summary:   Fixed bug 27950 Unit Cost of the Inventory Amount Update window is 
not calculated

Currency is not mandatory in organization, if currency in organization is null
the reference currency should be client currency.

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml 
|  4 ++--
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml   
|  2 +-
 src-db/database/sourcedata/AD_FIELD.xml
|  4 ++--
 src/org/openbravo/erpCommon/ad_callouts/SL_InvAmtUpd_AmtUnitCost.java  
|  7 +--
 src/org/openbravo/erpCommon/utility/OBDateUtils.java   
|  4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diffs (93 lines):

diff -r e6566a390dba -r ec9704fba4ee 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
Fri Oct 24 09:56:21 2014 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
Fri Oct 24 09:57:22 2014 +0200
@@ -1528,8 +1528,8 @@
 !--F79620AE1CC041308045C23E661BD907--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--F79620AE1CC041308045C23E661BD907--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--F79620AE1CC041308045C23E661BD907--  
COLUMNNAME![CDATA[EM_APRM_MatchTrans_Force]]/COLUMNNAME
-!--F79620AE1CC041308045C23E661BD907--  
NAME![CDATA[EM_APRM_MatchTransactions_Force]]/NAME
-!--F79620AE1CC041308045C23E661BD907--  
PRINTNAME![CDATA[EM_APRM_MatchTransactions_Force]]/PRINTNAME
+!--F79620AE1CC041308045C23E661BD907--  NAME![CDATA[Match Transactions 
Force]]/NAME
+!--F79620AE1CC041308045C23E661BD907--  PRINTNAME![CDATA[Match 
Transactions Force]]/PRINTNAME
 !--F79620AE1CC041308045C23E661BD907--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
 !--F79620AE1CC041308045C23E661BD907--  ISGLOSSARY![CDATA[N]]/ISGLOSSARY
 !--F79620AE1CC041308045C23E661BD907--/AD_ELEMENT
diff -r e6566a390dba -r ec9704fba4ee 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml  
Fri Oct 24 09:56:21 2014 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml  
Fri Oct 24 09:57:22 2014 +0200
@@ -17032,7 +17032,7 @@
 !--B7C06E2CD9EC460FBA493804E274ACC7--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
 !--B7C06E2CD9EC460FBA493804E274ACC7--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--B7C06E2CD9EC460FBA493804E274ACC7--  ISACTIVE![CDATA[Y]]/ISACTIVE
-!--B7C06E2CD9EC460FBA493804E274ACC7--  
NAME![CDATA[EM_APRM_MatchTransactions_Force]]/NAME
+!--B7C06E2CD9EC460FBA493804E274ACC7--  NAME![CDATA[Match Transactions 
Force]]/NAME
 !--B7C06E2CD9EC460FBA493804E274ACC7--  
ISCENTRALLYMAINTAINED![CDATA[Y]]/ISCENTRALLYMAINTAINED
 !--B7C06E2CD9EC460FBA493804E274ACC7--  
AD_TAB_ID![CDATA[2845D761A8394468BD3BA4710AA888D4]]/AD_TAB_ID
 !--B7C06E2CD9EC460FBA493804E274ACC7--  
AD_COLUMN_ID![CDATA[9DC8500B414640E09BF61A3D14FE13D1]]/AD_COLUMN_ID
diff -r e6566a390dba -r ec9704fba4ee src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml   Fri Oct 24 09:56:21 2014 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml   Fri Oct 24 09:57:22 2014 +0200
@@ -176305,7 +176305,7 @@
 !--00568254CC048733E050007F01000513--  
IGNOREINWAD![CDATA[N]]/IGNOREINWAD
 !--00568254CC048733E050007F01000513--  
ISDISPLAYED![CDATA[Y]]/ISDISPLAYED
 !--00568254CC048733E050007F01000513--  
DISPLAYLENGTH![CDATA[32]]/DISPLAYLENGTH
-!--00568254CC048733E050007F01000513--  ISREADONLY![CDATA[N]]/ISREADONLY
+!--00568254CC048733E050007F01000513--  ISREADONLY![CDATA[Y]]/ISREADONLY
 !--00568254CC048733E050007F01000513--  SEQNO![CDATA[80]]/SEQNO
 !--00568254CC048733E050007F01000513--  ISSAMELINE![CDATA[N]]/ISSAMELINE
 !--00568254CC048733E050007F01000513--  
ISFIELDONLY![CDATA[N]]/ISFIELDONLY
@@ -178524,7 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/43554c8adcf5
changeset: 25018:43554c8adcf5
user:  Stefan Hühner stefan.huehner at openbravo.com
date:  Tue Oct 07 18:21:15 2014 +0200
summary:   Fixed 27433. Delete trigger without content: S_RESOURCEASSIGNMENT_TRG
This trigger has all of its useful body commented out.
Checking hg history shows that to be the case since revision 0.

details:   https://code.openbravo.com/erp/devel/pi/rev/f65eeca4b228
changeset: 25019:f65eeca4b228
user:  Stefan Hühner stefan.huehner at openbravo.com
date:  Tue Oct 07 18:25:57 2014 +0200
summary:   Fixed 27434. Deleted useless trigger C_DP_MANAGEMENTLINE_TRG.
All code for this trigger is inside an if :new.status_from == null check
Checking definition of that status_from column in the c_dp_managementline table
shows that it is defined as not null (as has been since hg revision 0).

So that condition can never be true so all the trigger is not useful.

details:   https://code.openbravo.com/erp/devel/pi/rev/18d447125911
changeset: 25020:18d447125911
user:  Stefan Hühner stefan.huehner at openbravo.com
date:  Tue Oct 07 18:31:19 2014 +0200
summary:   Fixed 27442. Fix uuid bug. redefine v_billto variable as 
varchar2(32).
The variable v_billto is used to store a uuid (value of c_order.billto_id)
so define it as such and not as a number type.

details:   https://code.openbravo.com/erp/devel/pi/rev/c860b3092ded
changeset: 25021:c860b3092ded
user:  Stefan Hühner stefan.huehner at openbravo.com
date:  Tue Oct 07 18:35:13 2014 +0200
summary:   Fix 27443. Fix uuid bug in pl-function m_inout_updatequantities
The variable v_lines_aux in that pl-function is defined as numeric(10) but is
clearly used to hold uuid.
Redefine it to have correct datatype.

diffstat:

 src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml  |   2 +-
 src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml |   2 +-
 src-db/database/model/triggers/C_DP_MANAGEMENTLINE_TRG.xml   |  52 -
 src-db/database/model/triggers/S_RESOURCEASSIGNMENT_TRG.xml  |  69 
 4 files changed, 2 insertions(+), 123 deletions(-)

diffs (153 lines):

diff -r 553b2d6a7722 -r c860b3092ded 
src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml
--- a/src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml   Wed Oct 
08 12:10:58 2014 +0200
+++ b/src-db/database/model/functions/M_COPY_PRODUCT_TEMPLATE.xml   Tue Oct 
07 18:35:13 2014 +0200
@@ -38,7 +38,7 @@
 v_Org VARCHAR2(32);
 v_Createdby VARCHAR2(32);
 v_Dateordered DATE;
-v_BillTo NUMBER;
+v_BillTo VARCHAR2(32);
 v_BpartnerLocation VARCHAR2(32);
 v_Pricelist VARCHAR2(32);
 v_Pricelimit NUMBER;
diff -r 553b2d6a7722 -r c860b3092ded 
src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml
--- a/src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml  Wed Oct 
08 12:10:58 2014 +0200
+++ b/src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml  Tue Oct 
07 18:35:13 2014 +0200
@@ -114,7 +114,7 @@
   DECLARE
 Cur_Lines RECORD;
 v_Lines VARCHAR2(4000):='';
-v_Lines_Aux NUMBER(10) ;
+v_Lines_Aux VARCHAR2(32);
 v_StrSQL VARCHAR2(4000):='';
   BEGIN
 FOR Cur_Lines IN
diff -r 553b2d6a7722 -r c860b3092ded 
src-db/database/model/triggers/C_DP_MANAGEMENTLINE_TRG.xml
--- a/src-db/database/model/triggers/C_DP_MANAGEMENTLINE_TRG.xmlWed Oct 
08 12:10:58 2014 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,52 +0,0 @@
-?xml version=1.0?
-  database name=TRIGGER C_DP_MANAGEMENTLINE_TRG
-trigger name=C_DP_MANAGEMENTLINE_TRG table=C_DP_MANAGEMENTLINE 
fires=before insert=true update=true delete=false foreach=row
-  body![CDATA[
-
-
-
-
-/*
-* The contents of this file are subject to the Openbravo  Public  License
-* Version  1.1  (the  License),  being   the  Mozilla   Public  License
-* Version 1.1  with a permitted attribution clause; you may not  use this
-* file except in compliance with the License. You  may  obtain  a copy of
-* the License at http://www.openbravo.com/legal/license.html
-* Software distributed under the License  is  distributed  on  an AS IS
-* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-* License for the specific  language  governing  rights  and  limitations
-* 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-2006 Openbravo SLU
-* All Rights Reserved.
-* Contributor(s):  __.
-/
-
-BEGIN
-
-IF AD_isTriggerEnabled()='N' THEN RETURN;
-END IF;
-
-
-  IF (INSERTING) THEN
-IF (:NEW.status_from IS NULL) THEN
-BEGIN
-
-SELECT status
-  INTO :NEW.status_from
-  FROM 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/e057bc476021
changeset: 23888:e057bc476021
user:  Rafa Roda Palacios rafa.roda at ubiquads.com
date:  Wed Jun 25 11:31:41 2014 +0200
summary:   Fixes issue 26935 Feature request to make Sales Invoice Dimensional 
Report exportable to excel

details:   https://code.openbravo.com/erp/devel/pi/rev/b2afbb7336eb
changeset: 23889:b2afbb7336eb
user:  Rafa Roda Palacios rafa.roda at ubiquads.com
date:  Wed Jun 25 16:32:45 2014 +0200
summary:   Related to issue 26935 Corrects conversion and ordering

details:   https://code.openbravo.com/erp/devel/pi/rev/4896738282ea
changeset: 23890:4896738282ea
user:  Rafa Roda Palacios rafa.roda at ubiquads.com
date:  Wed Jun 25 18:00:57 2014 +0200
summary:   Fixes issue 26936 Feature request to make Purchase Invoice 
Dimensional Report exportable to excel

details:   https://code.openbravo.com/erp/devel/pi/rev/c913011f56a4
changeset: 23891:c913011f56a4
user:  Rafa Roda Palacios rafa.roda at ubiquads.com
date:  Thu Jun 26 08:12:31 2014 +0200
summary:   Fixes issue 26943 Feature request to add a multiple locations 
selector filter to the Stock Report

diffstat:

 src-db/database/sourcedata/AD_MESSAGE.xml  
  |   25 +
 src-db/database/sourcedata/AD_MODEL_OBJECT.xml 
  |   13 +
 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml 
  |   30 +
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml   
  |  176 
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
   |  175 ++-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
 |   42 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
  |   71 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.html
  |   71 +
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.xml
   |   44 +
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
   |   40 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java
 |  152 ++-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
|   50 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.html
|   55 +
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.xml
 |   36 +
 src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html   
  |   97 ++-
 src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.java   
  |  112 +-
 src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.xml
  |   11 +-
 src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartner_data.xsql
  |3 +-
 src/org/openbravo/erpCommon/info/LocatorMultiple.html  
  |  379 
 src/org/openbravo/erpCommon/info/LocatorMultiple.java  
  |  423 ++
 src/org/openbravo/erpCommon/info/LocatorMultiple.xml   
  |   38 +
 src/org/openbravo/erpCommon/info/LocatorMultiple_data.xsql 
  |   88 ++
 src/org/openbravo/erpCommon/info/SelectorUtility_data.xsql 
  |   16 +-
 23 files changed, 1938 insertions(+), 209 deletions(-)

diffs (truncated from 2705 to 300 lines):

diff -r 23c896bf9a39 -r c913011f56a4 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jun 26 14:24:16 2014 +0530
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jun 26 08:12:31 2014 +0200
@@ -19325,6 +19325,19 @@
 !--5C378E87605D42C9BE2D9069D681DD02--  
ISINCLUDEINI18N![CDATA[N]]/ISINCLUDEINI18N
 !--5C378E87605D42C9BE2D9069D681DD02--/AD_MESSAGE
 
+!--5C8DE651AA9D427399258704DF015CB4--AD_MESSAGE
+!--5C8DE651AA9D427399258704DF015CB4--  
AD_MESSAGE_ID![CDATA[5C8DE651AA9D427399258704DF015CB4]]/AD_MESSAGE_ID
+!--5C8DE651AA9D427399258704DF015CB4--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--5C8DE651AA9D427399258704DF015CB4--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--5C8DE651AA9D427399258704DF015CB4--  ISACTIVE![CDATA[Y]]/ISACTIVE
+!--5C8DE651AA9D427399258704DF015CB4--  
VALUE![CDATA[LS_ORGANIZATION]]/VALUE
+!--5C8DE651AA9D427399258704DF015CB4--  
MSGTEXT![CDATA[Organization]]/MSGTEXT
+!--5C8DE651AA9D427399258704DF015CB4--  MSGTIP![CDATA[Used for column name 
translation in Locator Selector]]/MSGTIP
+!--5C8DE651AA9D427399258704DF015CB4--  MSGTYPE![CDATA[I]]/MSGTYPE
+!--5C8DE651AA9D427399258704DF015CB4--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--5C8DE651AA9D427399258704DF015CB4--  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/4f28eb432b29
changeset: 23893:4f28eb432b29
user:  Rafa Roda Palacios rafa.roda at ubiquads.com
date:  Thu Jun 26 14:35:32 2014 +0200
summary:   Backed out of changeset 23891:c913011f56a4

details:   https://code.openbravo.com/erp/devel/pi/rev/3e175c44e3f3
changeset: 23894:3e175c44e3f3
user:  Rafa Roda Palacios rafa.roda at ubiquads.com
date:  Thu Jun 26 14:37:44 2014 +0200
summary:   Backed out of changeset 23890:4896738282ea

details:   https://code.openbravo.com/erp/devel/pi/rev/35f3362ee6a7
changeset: 23895:35f3362ee6a7
user:  Rafa Roda Palacios rafa.roda at ubiquads.com
date:  Thu Jun 26 14:39:23 2014 +0200
summary:   Backed out of changeset 23889:b2afbb7336eb

details:   https://code.openbravo.com/erp/devel/pi/rev/174b96a6fa01
changeset: 23896:174b96a6fa01
user:  Rafa Roda Palacios rafa.roda at ubiquads.com
date:  Thu Jun 26 14:41:14 2014 +0200
summary:   Backed out of changeset 23888:e057bc476021

diffstat:

 src-db/database/sourcedata/AD_MESSAGE.xml  
  |   25 -
 src-db/database/sourcedata/AD_MODEL_OBJECT.xml 
  |   13 -
 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml 
  |   30 -
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml   
  |  176 
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
   |  175 +--
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
 |   42 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
  |   71 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.html
  |   70 -
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesXLS.xml
   |   43 -
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
   |   40 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java
 |  152 +--
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR_data.xsql
|   50 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.html
|   54 -
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesXLS.xml
 |   35 -
 src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.html   
  |   97 +--
 src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.java   
  |  112 +-
 src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.xml
  |   11 +-
 src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartner_data.xsql
  |3 +-
 src/org/openbravo/erpCommon/info/LocatorMultiple.html  
  |  378 
 src/org/openbravo/erpCommon/info/LocatorMultiple.java  
  |  423 --
 src/org/openbravo/erpCommon/info/LocatorMultiple.xml   
  |   37 -
 src/org/openbravo/erpCommon/info/LocatorMultiple_data.xsql 
  |   87 --
 src/org/openbravo/erpCommon/info/SelectorUtility_data.xsql 
  |   16 +-
 23 files changed, 209 insertions(+), 1931 deletions(-)

diffs (truncated from 2705 to 300 lines):

diff -r 25c4c60e7c2d -r 174b96a6fa01 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jun 26 13:09:05 2014 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jun 26 14:41:14 2014 +0200
@@ -19325,19 +19325,6 @@
 !--5C378E87605D42C9BE2D9069D681DD02--  
ISINCLUDEINI18N![CDATA[N]]/ISINCLUDEINI18N
 !--5C378E87605D42C9BE2D9069D681DD02--/AD_MESSAGE
 
-!--5C8DE651AA9D427399258704DF015CB4--AD_MESSAGE
-!--5C8DE651AA9D427399258704DF015CB4--  
AD_MESSAGE_ID![CDATA[5C8DE651AA9D427399258704DF015CB4]]/AD_MESSAGE_ID
-!--5C8DE651AA9D427399258704DF015CB4--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
-!--5C8DE651AA9D427399258704DF015CB4--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
-!--5C8DE651AA9D427399258704DF015CB4--  ISACTIVE![CDATA[Y]]/ISACTIVE
-!--5C8DE651AA9D427399258704DF015CB4--  
VALUE![CDATA[LS_ORGANIZATION]]/VALUE
-!--5C8DE651AA9D427399258704DF015CB4--  
MSGTEXT![CDATA[Organization]]/MSGTEXT
-!--5C8DE651AA9D427399258704DF015CB4--  MSGTIP![CDATA[Used for column name 
translation in Locator Selector]]/MSGTIP
-!--5C8DE651AA9D427399258704DF015CB4--  MSGTYPE![CDATA[I]]/MSGTYPE
-!--5C8DE651AA9D427399258704DF015CB4--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
-!--5C8DE651AA9D427399258704DF015CB4--  
ISINCLUDEINI18N![CDATA[N]]/ISINCLUDEINI18N
-!--5C8DE651AA9D427399258704DF015CB4--/AD_MESSAGE
-
 !--5D3624FE019649CCB3B5900F32E59E17--AD_MESSAGE
 !--5D3624FE019649CCB3B5900F32E59E17--  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/85730acf7b16
changeset: 23405:85730acf7b16
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Wed May 28 13:23:22 2014 +0200
summary:   Fixed bug 26719 Stock reservation pick lines does not keep selected 
lines

details:   https://code.openbravo.com/erp/devel/pi/rev/eece3bb3d696
changeset: 23406:eece3bb3d696
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Thu May 29 12:35:15 2014 +0200
summary:   Fixed bug 26689 Return from customer pick lines does not keep 
selected lines

details:   https://code.openbravo.com/erp/devel/pi/rev/2b23a4e38022
changeset: 23407:2b23a4e38022
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Wed May 28 13:24:31 2014 +0200
summary:   Fixed bug 26688 Return to vendor pick lines does not keep selected 
lines

details:   https://code.openbravo.com/erp/devel/pi/rev/6deeeb7a363e
changeset: 23408:6deeeb7a363e
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Thu May 29 15:32:20 2014 +0200
summary:   Related to issue 26689

diffstat:

 
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
 |2 +-
 src-db/database/sourcedata/AD_TAB.xml  
 |1 +
 src-db/database/sourcedata/AD_TABLE.xml
 |3 +-
 src-db/database/sourcedata/OBUIAPP_PARAMETER.xml   
 |2 +-
 src/org/openbravo/common/datasource/ResultMapCriteriaUtils.java
 |  520 ++
 
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
   |   51 +-
 src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineRow.java 
 |4 +
 src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java   
 |  164 ++-
 src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java 
 |  258 +++-
 9 files changed, 853 insertions(+), 152 deletions(-)

diffs (truncated from 1332 to 300 lines):

diff -r b99f3051275b -r 6deeeb7a363e 
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
--- 
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
   Thu May 29 21:00:40 2014 +
+++ 
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
   Thu May 29 15:32:20 2014 +0200
@@ -1230,7 +1230,7 @@
* 
* @return a valid order by clause (or an empty string if no sorting)
*/
-  protected String getOrderByClause() {
+  public String getOrderByClause() {
 if (orderByClause != null) {
   return orderByClause;
 }
diff -r b99f3051275b -r 6deeeb7a363e src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml Thu May 29 21:00:40 2014 +
+++ b/src-db/database/sourcedata/AD_TAB.xml Thu May 29 15:32:20 2014 +0200
@@ -18104,6 +18104,7 @@
 !--F4204696A73647E2AA9700106C00C7A5--  
DISABLE_PARENT_KEY_PROPERTY![CDATA[N]]/DISABLE_PARENT_KEY_PROPERTY
 !--F4204696A73647E2AA9700106C00C7A5--  
ISREADONLYTREE![CDATA[N]]/ISREADONLYTREE
 !--F4204696A73647E2AA9700106C00C7A5--  
ISSHOWTREENODEICONS![CDATA[Y]]/ISSHOWTREENODEICONS
+!--F4204696A73647E2AA9700106C00C7A5--  
EM_OBUIAPP_SELECTION![CDATA[OB.RM.RMOrderSelectionChange]]/EM_OBUIAPP_SELECTION
 !--F4204696A73647E2AA9700106C00C7A5--  
EM_OBUIAPP_CAN_ADD![CDATA[N]]/EM_OBUIAPP_CAN_ADD
 !--F4204696A73647E2AA9700106C00C7A5--  
EM_OBUIAPP_CAN_DELETE![CDATA[N]]/EM_OBUIAPP_CAN_DELETE
 !--F4204696A73647E2AA9700106C00C7A5--  
EM_OBUIAPP_SHOW_SELECT![CDATA[Y]]/EM_OBUIAPP_SHOW_SELECT
diff -r b99f3051275b -r 6deeeb7a363e src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml   Thu May 29 21:00:40 2014 +
+++ b/src-db/database/sourcedata/AD_TABLE.xml   Thu May 29 15:32:20 2014 +0200
@@ -11031,7 +11031,8 @@
 !--A9BC62219E644720867F6402B0C25933--  
TABLENAME![CDATA[C_RM_RFC_PE_LINES]]/TABLENAME
 !--A9BC62219E644720867F6402B0C25933--  
CLASSNAME![CDATA[C_RM_RFC_PE_LINES]]/CLASSNAME
 !--A9BC62219E644720867F6402B0C25933--  ISVIEW![CDATA[N]]/ISVIEW
-!--A9BC62219E644720867F6402B0C25933--  
ACCESSLEVEL![CDATA[3]]/ACCESSLEVEL
+!--A9BC62219E644720867F6402B0C25933--  
ACCESSLEVEL![CDATA[1]]/ACCESSLEVEL
+!--A9BC62219E644720867F6402B0C25933--  
AD_WINDOW_ID![CDATA[FF808081330213E60133021822E40007]]/AD_WINDOW_ID
 !--A9BC62219E644720867F6402B0C25933--  
ISSECURITYENABLED![CDATA[N]]/ISSECURITYENABLED
 !--A9BC62219E644720867F6402B0C25933--  
ISDELETEABLE![CDATA[Y]]/ISDELETEABLE
 !--A9BC62219E644720867F6402B0C25933--  
ISHIGHVOLUME![CDATA[N]]/ISHIGHVOLUME
diff -r b99f3051275b -r 6deeeb7a363e 
src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
--- a/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml  Thu May 29 21:00:40 
2014 +
+++ b/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml  Thu May 29 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/ed6df2f35307
changeset: 21977:ed6df2f35307
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Feb 07 12:46:29 2014 +0100
summary:   related to bug 25684: solves case a
  don't compute unneeded combos on CHANGE mode when visibleProperties is null

details:   https://code.openbravo.com/erp/devel/pi/rev/6198177e1c61
changeset: 21978:6198177e1c61
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Feb 07 13:00:18 2014 +0100
summary:   related to issue 25684: solves case b

  do not compute inactive combos if they are not required

details:   https://code.openbravo.com/erp/devel/pi/rev/82bb222117bc
changeset: 21979:82bb222117bc
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Feb 07 13:01:43 2014 +0100
summary:   related to issue 25684: solves case 3

  don't generate complete JSON for combos when only one value is required

details:   https://code.openbravo.com/erp/devel/pi/rev/001ce480684b
changeset: 21980:001ce480684b
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Tue Feb 11 10:55:13 2014 +0100
summary:   related to issue 25684: solves case 3

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 |  60 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
|  11 +
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
   |  12 +
 src/org/openbravo/erpCommon/utility/ComboTableData.java
   |  85 +-
 4 files changed, 151 insertions(+), 17 deletions(-)

diffs (truncated from 322 to 300 lines):

diff -r 4988331796f2 -r 001ce480684b 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 Wed Feb 12 16:37:31 2014 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 Tue Feb 11 10:55:13 2014 +0100
@@ -545,6 +545,18 @@
 
   }
 
+  private boolean isNotActiveOrVisible(Field field, ListString 
visibleProperties) {
+return ((visibleProperties == null || !visibleProperties.contains(inp
++ Sqlc.TransformaNombreColumna(field.getColumn().getDBColumnName(
+ !field.isDisplayed()  !field.isShowInGridView()  
!field.isShownInStatusBar())
+|| !field.isActive();
+  }
+
+  private boolean isNotActiveOrVisibleAndNotNeeded(Field field, ListString 
visibleProperties) {
+return isNotActiveOrVisible(field, visibleProperties)
+ field.getColumn().getDefaultValue() == null  
!field.getColumn().isMandatory();
+  }
+
   private void computeColumnValues(String mode, Tab tab, ListString 
allColumns,
   MapString, JSONObject columnValues, BaseOBObject parentRecord, String 
parentId,
   String changedColumn, JSONObject jsContent, ListString changeEventCols,
@@ -554,6 +566,7 @@
 if (mode.equals(CHANGE)  changedColumn != null) {
   RequestContext.get().setRequestParameter(donotaddcurrentelement, 
true);
 }
+log.debug(computeColumnValues - forceComboReload:  + forceComboReload);
 HashMapString, Field columnsOfFields = new HashMapString, Field();
 for (Field field : getADFieldList(tab.getId())) {
   if (field.getColumn() == null) {
@@ -595,17 +608,20 @@
 value = uiDef.getFieldProperties(field, true);
   } else {
 // Else, the default is used
-if (visibleProperties != null
- !visibleProperties.contains(inp + 
Sqlc.TransformaNombreColumna(col))
- !field.isDisplayed()  !field.isShowInGridView()  
!field.isShownInStatusBar()
- field.getColumn().getDefaultValue() == null  
!field.getColumn().isMandatory()) {
+if (isNotActiveOrVisibleAndNotNeeded(field, visibleProperties)) {
   // If the column is not currently visible, and its not 
mandatory, we don't need to
   // compute the combo.
   // If a column is mandatory then the combo needs to be computed, 
because the selected
   // value can depend on the computation if there is no default 
value
+  log.debug(Not calculating combo in  + mode +  mode for column 
 + col);
   value = uiDef.getFieldPropertiesWithoutCombo(field, false);
 } else {
-  value = uiDef.getFieldProperties(field, false);
+  if (isNotActiveOrVisible(field, visibleProperties)) {
+log.debug(Only first combo record in  + mode +  mode for 
column  + col);
+value = uiDef.getFieldPropertiesFirstRecord(field, false);
+  } else {
+ 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/99c58f9b3fe1
changeset: 21985:99c58f9b3fe1
user:  Atul Gaware atul.gaware at openbravo.com
date:  Wed Feb 05 15:11:08 2014 +0530
summary:   Fixes Issue 25445 Error when using Manage Variants under some 
circumstances

details:   https://code.openbravo.com/erp/devel/pi/rev/9da401159803
changeset: 21986:9da401159803
user:  Atul Gaware atul.gaware at openbravo.com
date:  Tue Feb 04 14:58:17 2014 +0530
summary:   Fixes Issue 25114 RequisitionToOrder maintains order of requisition 
lines

details:   https://code.openbravo.com/erp/devel/pi/rev/c32dee722007
changeset: 21987:c32dee722007
user:  Atul Gaware atul.gaware at openbravo.com
date:  Mon Feb 10 18:05:01 2014 +0530
summary:   Fixes Issue 25262: Account filter in trial balance is not working as 
expected

details:   https://code.openbravo.com/erp/devel/pi/rev/083d67ea235a
changeset: 21988:083d67ea235a
user:  Atul Gaware atul.gaware at openbravo.com
date:  Wed Feb 12 23:36:09 2014 +0530
summary:   Fixes Issue 25587 PendingGoodsReceipt fails if warehouse is not set 
in OrgWH tab

diffstat:

 src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java  |   5 +-
 src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql |  21 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html|   6 +-
 src/org/openbravo/erpCommon/info/AccountElementValue.java |   4 +-
 src/org/openbravo/event/ProductEventHandler.java  |  33 
+-
 5 files changed, 58 insertions(+), 11 deletions(-)

diffs (179 lines):

diff -r 9d50bf45a6c9 -r 083d67ea235a 
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java
--- a/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java  Wed Feb 
12 18:42:08 2014 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java  Wed Feb 
12 23:36:09 2014 +0530
@@ -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) 2001-2013 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2014 Openbravo SLU
  * All Rights Reserved. 
  * Contributor(s):  __.
  
@@ -302,7 +302,8 @@
   continue;
 }
   }
-  if (!warehouseBelongsToOrg) {
+  String strIsSoTrx = vars.getSessionValue(isSOTrx);
+  if (!warehouseBelongsToOrg  (Y).equals(strIsSoTrx)) {
 OrderLine ol = OBDal.getInstance().get(OrderLine.class, 
strOrderlineId);
 myMessage.setType(Error);
 myMessage.setTitle(Utility.messageBD(this, Error, 
vars.getLanguage()));
diff -r 9d50bf45a6c9 -r 083d67ea235a 
src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql Wed Feb 
12 18:42:08 2014 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder_data.xsql Wed Feb 
12 23:36:09 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) 2008-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2008-2014 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  __.
  
@@ -68,7 +68,11 @@
   AND M_REQUISITION.AD_CLIENT_ID IN ('1')
   AND M_REQUISITIONLINE.AD_ORG_ID IN ('1')
   AND 1=1
-ORDER BY M_REQUISITIONLINE.NEEDBYDATE, M_REQUISITIONLINE.M_PRODUCT_ID, 
M_REQUISITIONLINE.M_ATTRIBUTESETINSTANCE_ID
+GROUP BY M_REQUISITIONLINE.M_REQUISITIONLINE_ID, 
M_REQUISITIONLINE.NEEDBYDATE, M_REQUISITIONLINE.QTY, 
M_REQUISITIONLINE.ORDEREDQTY,
+QUANTITYORDER, C_UOM1.NAME, C_UOM.NAME, pl.istaxincluded, 
M_REQUISITIONLINE.GROSS_UNIT_PRICE, M_REQUISITIONLINE.PRICEACTUAL,
+M_REQUISITIONLINE.C_BPARTNER_ID, M_REQUISITION.C_BPARTNER_ID, 
M_REQUISITIONLINE.M_PRICELIST_ID, M_REQUISITION.M_PRICELIST_ID,
+M_REQUISITIONLINE.M_PRODUCT_ID, 
M_REQUISITIONLINE.M_ATTRIBUTESETINSTANCE_ID, M_REQUISITION.AD_USER_ID
+ORDER BY MIN(M_REQUISITIONLINE.LINE), M_REQUISITIONLINE.NEEDBYDATE, 
M_REQUISITIONLINE.M_PRODUCT_ID, M_REQUISITIONLINE.M_ATTRIBUTESETINSTANCE_ID
   ]]/Sql
 Field name=rownum value=count/
 Parameter name=language/
@@ -113,7 +117,12 @@
   AND M_REQUISITIONLINE.LOCKDATE = (now()-3)
   AND M_REQUISITION.AD_CLIENT_ID IN ('1')
   AND M_REQUISITIONLINE.AD_ORG_ID IN ('1')
-ORDER BY VENDOR_ID, M_PRICELIST_ID
+GROUP BY M_REQUISITIONLINE.M_REQUISITIONLINE_ID, 
M_REQUISITIONLINE.NEEDBYDATE, M_REQUISITIONLINE.QTY,
+M_REQUISITIONLINE.ORDEREDQTY, M_REQUISITIONLINE.PRICELIST, 
C_UOM1.NAME, C_UOM.NAME, 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/b1e739866c09
changeset: 20847:b1e739866c09
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Thu Jul 18 12:45:16 2013 +0200
summary:   [rest webservices with selected properties] First commit

This changeset implements the functionality that enables to specify the list of 
properties that will be exported in a XML Rest Webservice call (this 
functionality was already implemented for Json Rest Webservices).

Changes done:
- DalWebService.java: If the _selectedProperties is included in the request 
parameters the string is parsed to obtain two maps (propertiesToBeFeched and 
childPropertiesToBeFeched) that will contain the list of child and non child 
property for each entity being exported (i.e. when an entity is beign exported 
its child entities can also be exported in the process). Then these two maps 
are passed to the EntityXMLConverter.
- EntityXMLConverter.java: Filters out the properties not included in the 
propertiesToBeFetched or childPropertiesToBeFetched maps, but only if they are 
not empty. If they are empty (because the _selectedProperties parameter was not 
included in the URL) then all properties are returned (the child properties 
will only be returned if the includeChildren parameter is not set to false).

Example:
Let's suppose that someone wants to retrieve the list of all windows, including 
its tabs and its fields. Only these properties are required:
- ADWindow: id, name
- ADTab: id, name, tabLevel
- ADField: id, name, description

The request to the xml webservice should be like this:

http://localhost:8080/openbravo/ws/dal/ADWindow/100?_selectedProperties=id,name,aDTabList,aDTabList.id,aDTabList.name,aDTabList.tabLevel,aDTabList.aDFieldList,aDTabList.aDFieldList.id,aDTabList.aDFieldList.name,aDTabList.aDFieldList.description

'id', 'name' and 'aDTabList' are properties of the ADWindow entity. The 
aDTabList property is a child entity of ADWindow. If no more properties were 
specified, then only the id and the identifier of each tab would be returned.
'aDTabList.id','aDTabList.name','aDTabList.tabLevel' and 
'aDTabList.aDFieldList' are properties of the adTabList entity.
'aDTabList.aDFieldList.id','aDTabList.aDFieldList.name' and 
'aDTabList.aDFieldList.description'

When the _selectedProperties parameter is parsed, these two maps will be 
generated:
- properties: a map with the list of not child properties to be exported for 
each entity:
  {_top=[id, name],aDTabList=[id, name, tabLevel], 
aDTabList.aDFieldList=[id, name, description]}
- childProperties: a map with the list of child properties to be exported for 
each entity:
  {_top=[id, aDTabList],aDTabList=[id, aDFieldList]}

details:   https://code.openbravo.com/erp/devel/pi/rev/a2f50431bea5
changeset: 20848:a2f50431bea5
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Thu Jul 18 13:47:31 2013 +0200
summary:   [rest webservices with selected properties] Prevents Java API change

details:   https://code.openbravo.com/erp/devel/pi/rev/a71ec7122273
changeset: 20849:a71ec7122273
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Fri Jul 26 10:04:18 2013 +0200
summary:   [rest webservices with selected properties] Fix access to 3rd-level 
properties

details:   https://code.openbravo.com/erp/devel/pi/rev/cf8dd73ff55a
changeset: 20850:cf8dd73ff55a
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Tue Aug 06 16:42:40 2013 +0200
summary:   merged back DAL ws included properties

diffstat:

 .hgsigs
  |  2 +
 .hgtags
  |  2 +
 build.xml  
  |  7 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
| 22 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
| 78 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml
   |  2 +-
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml   
  | 54 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml 
  | 12 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  
  |  2 +-
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/05633177afdf
changeset: 20838:05633177afdf
user:  Pandeeswari Ramakrishnan pandeeswari.ramakrishnan at 
openbravo.com
date:  Thu Aug 01 15:05:46 2013 +0530
summary:   Fixes Issue 24056: User can not unpost purchase invoices
When the role does not have access to Fiscal Calendar window, the user is not 
able to post or unpost the purchase invoice

details:   https://code.openbravo.com/erp/devel/pi/rev/314e8a452f5a
changeset: 20839:314e8a452f5a
user:  Pandeeswari Ramakrishnan pandeeswari.ramakrishnan at 
openbravo.com
date:  Thu Aug 01 14:39:20 2013 +0530
summary:   Fixes Issue 24057: Pending Goods Receipt can not be performed
When the role does not have access to organization window, pending goods 
receipt throws ProcessRunError

details:   https://code.openbravo.com/erp/devel/pi/rev/bd9b63b3ac09
changeset: 20840:bd9b63b3ac09
user:  Pandeeswari Ramakrishnan pandeeswari.ramakrishnan at 
openbravo.com
date:  Tue Jul 30 19:25:11 2013 +0530
summary:   Fixes Issue 24059: Users can not add transactions in financial 
account window
When the role does not have access to organization window, Add Transaction in 
Financial Account window throws error

details:   https://code.openbravo.com/erp/devel/pi/rev/cfbd7f663288
changeset: 20841:cfbd7f663288
user:  Pandeeswari Ramakrishnan pandeeswari.ramakrishnan at 
openbravo.com
date:  Thu Aug 01 16:13:26 2013 +0530
summary:   Fixes Issue 24362: When voiding an invoice, Invoice Tax Date is 
wrongly set to today date

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
 |   28 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
|   45 +-
 src-db/database/model/functions/C_INVOICE_POST.xml 
  |2 +-
 src/org/openbravo/erpCommon/ad_forms/AcctServer.java   
  |  172 +
 src/org/openbravo/erpCommon/ad_forms/FactLine.java 
  |   36 +-
 src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java   
  |6 +-
 src/org/openbravo/financial/ResetAccounting.java   
  |   15 +-
 7 files changed, 167 insertions(+), 137 deletions(-)

diffs (truncated from 428 to 300 lines):

diff -r 55ec33cf0efe -r cfbd7f663288 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
  Fri Aug 02 22:03:09 2013 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
  Thu Aug 01 16:13:26 2013 +0530
@@ -901,18 +901,22 @@
 if (!isReceipt) {
   return false;
 }
-OBCriteriaPreference obCriteria = 
OBDal.getInstance().createCriteria(Preference.class);
-obCriteria.add(Restrictions.eq(Preference.PROPERTY_ATTRIBUTE, 
Doubtful_Debt_Visibility));
-obCriteria.add(Restrictions.eq(Preference.PROPERTY_CLIENT, 
OBContext.getOBContext()
-.getCurrentClient()));
-obCriteria.add(Restrictions.in(Preference.PROPERTY_ORGANIZATION + .id, 
OBContext
-.getOBContext().getReadableOrganizations()));
-Preference preference = (Preference) obCriteria.uniqueResult();
-if (preference != null) {
-  return Y.equals(preference.getSearchKey());
-} else {
-  return false;
+OBContext.setAdminMode();
+try {
+  OBCriteriaPreference obCriteria = 
OBDal.getInstance().createCriteria(Preference.class);
+  obCriteria.add(Restrictions.eq(Preference.PROPERTY_ATTRIBUTE, 
Doubtful_Debt_Visibility));
+  obCriteria.add(Restrictions.eq(Preference.PROPERTY_CLIENT, 
OBContext.getOBContext()
+  .getCurrentClient()));
+  obCriteria.add(Restrictions.in(Preference.PROPERTY_ORGANIZATION + .id, 
OBContext
+  .getOBContext().getReadableOrganizations()));
+  Preference preference = (Preference) obCriteria.uniqueResult();
+  if (preference != null) {
+return Y.equals(preference.getSearchKey());
+  } else {
+return false;
+  }
+} finally {
+  OBContext.restorePreviousMode();
 }
-
   }
 }
diff -r 55ec33cf0efe -r cfbd7f663288 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
 Fri Aug 02 22:03:09 2013 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
 Thu Aug 01 16:13:26 2013 +0530
@@ -11,7 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/0175279b4dbe
changeset: 20176:0175279b4dbe
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Tue Apr 23 10:54:40 2013 +0200
summary:   Related to issue 20422: Adds the new Insert Audits fields

This changeset contains all the changes related to the addition of the new 
Insert Audits field:
- Creation of the new column in the database
- Changes in the Application Dictionary (AD_COLUMN, AD_FIELD; AD_ELEMENT)
- It is a mandatory column, so it has been created in all AD_TABLES with its 
default value ('Y')

details:   https://code.openbravo.com/erp/devel/pi/rev/d8c6a9c2b6ac
changeset: 20177:d8c6a9c2b6ac
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Tue Apr 23 11:03:37 2013 +0200
summary:   Related to issue 20422: Updates the ad_create_audit_triggers SQL 
function

The ad_create_audit_triggers SQL function has been updated to use the new 
AD_TABLE.ISAUDITINSERTS column,

The behaviour of the triggers when a record is updated or deleted has not been 
changed. When a record is inserted, if the ISAUDITINSERTS column of the audit 
column is'Y' (default value), the behaviour will be the same as the previous 
one. If ISAUDITINSERTS is 'N', then only the key column of the audited table 
will be inserted in the audit table.

details:   https://code.openbravo.com/erp/devel/pi/rev/c33d0871c1d8
changeset: 20178:c33d0871c1d8
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Tue Apr 23 11:08:42 2013 +0200
summary:   Related to issue 20422: Updates AD_TABLE_MOD_TRG trigger

The AD_TABLE_MOD_TRG has been updated, so that the Updated column of the table 
is not changed if the only modified column is ISFULLYAUDITED or ISAUDITINSERTS.

details:   https://code.openbravo.com/erp/devel/pi/rev/c0c3d4e9feab
changeset: 20179:c0c3d4e9feab
user:  Augusto Mauch augusto.mauch at openbravo.com
date:  Tue Apr 23 11:12:29 2013 +0200
summary:   Fixes issue 20422: Updates the AuditTrailPopup to consider show ID 
column

The AuditTrailPopup has been updated to show the ID column of the audit table. 
This is needed because now if an audited table is flagged as 
ISAUDITINSERTS='N', only the ID column of the table will be inserted in the 
audit table. Originally the popup did not show the records of the audit table 
belonging to its id column.

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml   
  |7 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml
 |   13 +
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TABLE.xml
  |4 +
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TABLE.xml  
  |9 +
 modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_TABLE.xml 
  |3 +
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_TABLE.xml
 |2 +
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TABLE.xml
 |1 +
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TABLE.xml
 |1 +
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_TABLE.xml
 |4 +
 src-db/database/model/postscript-Oracle.sql
  |   14 +
 src-db/database/model/postscript-PostgreSql.sql
  |   14 +
 src-db/database/model/tables/AD_TABLE.xml  
  |5 +
 src-db/database/model/triggers/AD_TABLE_MOD_TRG.xml
  |2 +-
 src-db/database/sourcedata/AD_COLUMN.xml   
  |   36 +
 src-db/database/sourcedata/AD_ELEMENT.xml  
  |   14 +
 src-db/database/sourcedata/AD_FIELD.xml
  |   29 +
 src-db/database/sourcedata/AD_TABLE.xml
  |  483 ++
 src/org/openbravo/erpCommon/businessUtility/AuditTrailPopup.java   
  |3 +-
 18 files changed, 641 insertions(+), 3 deletions(-)

diffs (truncated from 4464 to 300 lines):

diff -r 191b774fbb86 -r c0c3d4e9feab 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml  
Mon Apr 22 19:17:06 2013 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml  
Tue Apr 23 11:12:29 2013 +0200
@@ -19,6 +19,7 @@
 !--0DFF5BACFB964FDABAA5042C8809C813--  
ISDEFAULTACCT![CDATA[N]]/ISDEFAULTACCT
 !--0DFF5BACFB964FDABAA5042C8809C813--  
DEVELOPMENTSTATUS![CDATA[RE]]/DEVELOPMENTSTATUS
 !--0DFF5BACFB964FDABAA5042C8809C813--  
AD_PACKAGE_ID![CDATA[AC33B2262748414A816510545755435A]]/AD_PACKAGE_ID
+!--0DFF5BACFB964FDABAA5042C8809C813--  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/46bf40360c73
changeset: 20099:46bf40360c73
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Tue Apr 09 17:45:00 2013 +0200
summary:   fixed issue 23518: Restrict Access to Portal sessions

-Web Services: json and xml webservices shouldn't be accessible to portal 
sessions
-ActionHandlers: only the ones that are explicitly set to be accessible by 
portal should be executable
-Datasources: only the ones that are explicitly set to be accessible by portal 
should be executable. Specially default one used to retrieve grid data 
shouldn't be accessible
-Query List widget datasources: They should be accessible

details:   https://code.openbravo.com/erp/devel/pi/rev/08d5a13b722b
changeset: 20100:08d5a13b722b
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Wed Apr 10 10:01:55 2013 +0200
summary:   fixed issue 23520: Restrict access to query list widgets

details:   https://code.openbravo.com/erp/devel/pi/rev/896e36129e9a
changeset: 20101:896e36129e9a
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon Apr 15 08:17:58 2013 +0200
summary:   related to issue 23518: added missing file

details:   https://code.openbravo.com/erp/devel/pi/rev/b69625663ccc
changeset: 20102:b69625663ccc
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon Apr 15 13:49:03 2013 +0200
summary:   fixed issue 23550: improved MenuManager resources consumption

Now GlobalMenu is application scoped sharing a global generic menu among
different sessions, preventing menu computation for each of them.

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
  |3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java
  |  289 ++
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java
 |3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/LogOutActionHandler.java
 |5 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
 |  439 +++--
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParametersActionHandler.java
 |3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/StorePropertyActionHandler.java
  |3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/MenuCacheHandler.java
  |  104 ++
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
 |3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java
  |5 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
 |   13 +
 
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
  |3 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MESSAGE.xml
   |   12 +
 
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
 |   34 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
   |   12 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonRestServlet.java
 |8 +
 src/org/openbravo/dal/core/OBContext.java  
|7 +
 src/org/openbravo/erpCommon/utility/WindowTree.java
|   14 +-
 src/org/openbravo/portal/PortalAccessible.java 
|   31 +
 src/org/openbravo/service/web/BaseWebServiceServlet.java   
|7 +
 20 files changed, 692 insertions(+), 306 deletions(-)

diffs (truncated from 1500 to 300 lines):

diff -r 466f47a126b4 -r b69625663ccc 
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
 Mon Apr 15 13:39:38 2013 +0200
+++ 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/2aebd20a2cf7
changeset: 18517:2aebd20a2cf7
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Mon Nov 05 13:13:27 2012 +0100
summary:   Fixes issue 21795: Product selector on asset,
should not restrict to products that belong to a sales price list.

details:   https://code.openbravo.com/erp/devel/pi/rev/531ae77d6e5d
changeset: 18518:531ae77d6e5d
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Tue Nov 06 17:54:19 2012 +0100
summary:   Fixes issue 21895: Create Invoice From PO should show a warning 
message.

details:   https://code.openbravo.com/erp/devel/pi/rev/76d2cbdf6d39
changeset: 18519:76d2cbdf6d39
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Thu Nov 08 13:36:24 2012 +0100
summary:   Fixes issue 21722: Is impossible to create 2 invoices from one 
shipment.

details:   https://code.openbravo.com/erp/devel/pi/rev/acd485beec84
changeset: 18520:acd485beec84
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Fri Oct 26 13:01:57 2012 +0200
summary:   Fixes issue 21820: Wrong calculation of a journal entry under some 
circumstancies

diffstat:

 src-db/database/sourcedata/AD_COLUMN.xml |   2 
+-
 src-db/database/sourcedata/AD_MESSAGE.xml|  11 
+
 src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml|   2 
+-
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java  |   5 
+
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql |  70 
-
 src/org/openbravo/erpCommon/ad_forms/Fact.java   |   3 
+
 src/org/openbravo/erpCommon/ad_forms/FactLine.java   |  33 
++--
 7 files changed, 97 insertions(+), 29 deletions(-)

diffs (275 lines):

diff -r 2d71f02d8f3b -r acd485beec84 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml  Mon Nov 12 10:38:27 2012 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml  Fri Oct 26 13:01:57 2012 +0200
@@ -101100,7 +101100,7 @@
 !--8047--  COLUMNNAME![CDATA[M_Product_ID]]/COLUMNNAME
 !--8047--  AD_TABLE_ID![CDATA[539]]/AD_TABLE_ID
 !--8047--  AD_REFERENCE_ID![CDATA[30]]/AD_REFERENCE_ID
-!--8047--  AD_REFERENCE_VALUE_ID![CDATA[800060]]/AD_REFERENCE_VALUE_ID
+!--8047--  AD_REFERENCE_VALUE_ID![CDATA[800011]]/AD_REFERENCE_VALUE_ID
 !--8047--  FIELDLENGTH![CDATA[60]]/FIELDLENGTH
 !--8047--  ISKEY![CDATA[N]]/ISKEY
 !--8047--  ISPARENT![CDATA[N]]/ISPARENT
diff -r 2d71f02d8f3b -r acd485beec84 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Nov 12 10:38:27 2012 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Oct 26 13:01:57 2012 +0200
@@ -21036,6 +21036,17 @@
 !--ECB4FC6A311C4CCA984087945E10FC6E--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
 !--ECB4FC6A311C4CCA984087945E10FC6E--/AD_MESSAGE
 
+!--ED29E885BB414C1FB9716A4C12FC--AD_MESSAGE
+!--ED29E885BB414C1FB9716A4C12FC--  
AD_MESSAGE_ID![CDATA[ED29E885BB414C1FB9716A4C12FC]]/AD_MESSAGE_ID
+!--ED29E885BB414C1FB9716A4C12FC--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--ED29E885BB414C1FB9716A4C12FC--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--ED29E885BB414C1FB9716A4C12FC--  ISACTIVE![CDATA[Y]]/ISACTIVE
+!--ED29E885BB414C1FB9716A4C12FC--  
VALUE![CDATA[CreateFromMatchPOQtys]]/VALUE
+!--ED29E885BB414C1FB9716A4C12FC--  MSGTEXT![CDATA[The quantities that 
are going to be copied to the lines may not be the ones shown here. If the 
invoice has a related order and goods receipt, the copied quantity will be the 
shipped quantity minus the related invoiced. If there is no related shipment, 
the copied quantity will be the ordered quantity minus the related invoiced 
quantities.]]/MSGTEXT
+!--ED29E885BB414C1FB9716A4C12FC--  MSGTYPE![CDATA[I]]/MSGTYPE
+!--ED29E885BB414C1FB9716A4C12FC--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--ED29E885BB414C1FB9716A4C12FC--/AD_MESSAGE
+
 !--ED94DA7D967E401B93DDFFE86C9715A9--AD_MESSAGE
 !--ED94DA7D967E401B93DDFFE86C9715A9--  
AD_MESSAGE_ID![CDATA[ED94DA7D967E401B93DDFFE86C9715A9]]/AD_MESSAGE_ID
 !--ED94DA7D967E401B93DDFFE86C9715A9--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
diff -r 2d71f02d8f3b -r acd485beec84 
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Mon Nov 12 
10:38:27 2012 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Fri Oct 26 
13:01:57 2012 +0200
@@ -1762,7 +1762,7 @@
 !--FF8080812E77708D012E7796A94B0017--  SORTNO![CDATA[110]]/SORTNO
 !--FF8080812E77708D012E7796A94B0017--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--FF8080812E77708D012E7796A94B0017--  ISOUTFIELD![CDATA[N]]/ISOUTFIELD
-!--FF8080812E77708D012E7796A94B0017--  DEFAULT_EXPRESSION![CDATA[if 
(OB.getWindowId() == '800051' ||  OB.getWindowId() == '800052' || 
OB.getWindowId() == '800096') {false} else {if (OB.isSalesTransaction() == 
true) { true } else {false}}]]/DEFAULT_EXPRESSION

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/bb001f31f53a
changeset: 18494:bb001f31f53a
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Mon Oct 29 15:34:43 2012 +0100
summary:   Fixed bug 22181 Add document name  when JER opens when post

details:   https://code.openbravo.com/erp/devel/pi/rev/87312a271f13
changeset: 18495:87312a271f13
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Tue Nov 06 19:56:01 2012 +0100
summary:   Fixed issue 22136 add description column in pdf JER

details:   https://code.openbravo.com/erp/devel/pi/rev/d47a1afe85fd
changeset: 18496:d47a1afe85fd
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Tue Nov 06 19:58:39 2012 +0100
summary:   Fixed bug 22182 after post show a tab for each general ledger

details:   https://code.openbravo.com/erp/devel/pi/rev/22b019b64170
changeset: 18497:22b019b64170
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Tue Nov 06 19:38:59 2012 +0100
summary:   Related to issue 22182 Changes to run the automated test

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java
 |   58 +
 src/org/openbravo/erpCommon/ad_actionButton/Posted.java
|   68 +-
 src/org/openbravo/erpCommon/ad_actionButton/Posted_data.xsql   
|   34 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html 
|   59 +
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java 
|   60 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml
|  558 ++---
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml  
|5 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
|   46 +-
 8 files changed, 663 insertions(+), 225 deletions(-)

diffs (truncated from 1211 to 300 lines):

diff -r ee78cde70ebb -r 22b019b64170 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java
Tue Nov 06 19:38:59 2012 +0100
@@ -0,0 +1,58 @@
+/*
+ *
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  License),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an AS IS
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * 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 Rights Reserved. 
+ * Contributor(s):  __.
+ 
+ */
+package org.openbravo.client.application.window;
+
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.client.kernel.BaseActionHandler;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.financialmgmt.accounting.coa.AcctSchema;
+
+public class GetNameGeneralLedger extends BaseActionHandler {
+
+  private static final Logger log = 
Logger.getLogger(GetNameGeneralLedger.class);
+
+  @Override
+  protected JSONObject execute(MapString, Object parameters, String content) 
{
+OBContext.setAdminMode();
+try {
+  if (parameters.get(Command).equals(GETNAME)) {
+String glId = parameters.get(glId).toString();
+AcctSchema acctSchema = OBDal.getInstance().get(AcctSchema.class, 
glId);
+JSONObject obj = new JSONObject();
+try {
+  obj.put(id, acctSchema.getId());
+  obj.put(name, acctSchema.getName());
+} catch (Exception e) {
+  throw new OBException(Error while reading attachments:, e);
+}
+return obj;
+  } else {
+return new JSONObject();
+  }
+
+} finally {
+  OBContext.restorePreviousMode();
+}
+  }
+}
diff -r ee78cde70ebb -r 22b019b64170 
src/org/openbravo/erpCommon/ad_actionButton/Posted.java
--- 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/0e5a0a310e6e
changeset: 18445:0e5a0a310e6e
user:  Eduardo Argal Guibert eduardo.argal at openbravo.com
date:  Mon Nov 05 13:11:21 2012 +0100
summary:   Fixes issue 22124: Deferred functionality should be just available 
when product is selected

details:   https://code.openbravo.com/erp/devel/pi/rev/0fea55f4bab1
changeset: 18446:0fea55f4bab1
user:  Eduardo Argal Guibert eduardo.argal at openbravo.com
date:  Mon Nov 05 13:16:10 2012 +0100
summary:   Related to Issue 22124: Fixes demo data.

details:   https://code.openbravo.com/erp/devel/pi/rev/02f1129b497f
changeset: 18447:02f1129b497f
user:  Eduardo Argal Guibert eduardo.argal at openbravo.com
date:  Mon Nov 05 13:17:31 2012 +0100
summary:   Related to issue 22124. Fixes C_INVOICE_CREATE.

details:   https://code.openbravo.com/erp/devel/pi/rev/06923e2b9a96
changeset: 18448:06923e2b9a96
user:  Eduardo Argal Guibert eduardo.argal at openbravo.com
date:  Mon Nov 05 13:36:04 2012 +0100
summary:   Related to issue 22124.Missing files in previous commit.

diffstat:

 referencedata/sampledata/F_B_International_Group.xml |  
17142 +++--
 referencedata/sampledata/QA_Testing.xml  |   
2014 +-
 src-db/database/model/functions/C_COMMISSIONRUN_PROCESS.xml  | 
36 +-
 src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml  | 
34 +-
 src-db/database/model/functions/C_GET_DEFAULT_PERIOD.xml | 
75 +
 src-db/database/model/functions/C_INVOICE_CREATE.xml |
118 +-
 src-db/database/model/functions/C_INVOICE_POST.xml   | 
86 +-
 src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml| 
33 +-
 src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml  | 
54 +-
 src-db/database/model/tables/C_INVOICELINE.xml   | 
32 +-
 src-db/database/model/tables/M_PRODUCT.xml   | 
12 +-
 src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml| 
 8 +-
 src-db/database/sourcedata/AD_COLUMN.xml |
226 +-
 src-db/database/sourcedata/AD_ELEMENT.xml| 
43 +-
 src-db/database/sourcedata/AD_FIELD.xml  | 
88 +-
 src-db/database/sourcedata/AD_REFERENCE.xml  | 
14 +
 src-db/database/sourcedata/AD_REF_LIST.xml   | 
36 +
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice_data.xsql| 
 6 +-
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java  |
109 +-
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 
14 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java  | 
90 +-
 src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 
22 +-
 src/org/openbravo/erpCommon/ad_forms/DocLineInvoice_data.xsql| 
 9 +-
 src/org/openbravo/erpCommon/ad_forms/DocLine_Invoice.java| 
64 +-
 src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice.java | 
21 +-
 src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice_data.xsql| 
14 +-
 src/org/openbravo/erpCommon/utility/AccDefUtility.java   |
171 +
 27 files changed, 7677 insertions(+), 12894 deletions(-)

diffs (truncated from 37363 to 300 lines):

diff -r 3b7ece7dc2c1 -r 06923e2b9a96 
referencedata/sampledata/F_B_International_Group.xml
--- a/referencedata/sampledata/F_B_International_Group.xml  Fri Nov 02 
13:56:59 2012 +0100
+++ b/referencedata/sampledata/F_B_International_Group.xml  Mon Nov 05 
13:36:04 2012 +0100
@@ -29220,7 +29220,7 @@
 aprmModifPaymentINPlanfalse/aprmModifPaymentINPlan
 aprmModifPaymentOUTPlanfalse/aprmModifPaymentOUTPlan
 expectedDate2012-10-26T00:00:00.0Z/expectedDate
-daysOverdue5/daysOverdue
+daysOverdue7/daysOverdue
 lastPaymentDate xsi:nil=true/
 numberOfPayments0/numberOfPayments
   /FIN_Payment_Schedule
@@ -29436,7 +29436,7 @@
 aprmModifPaymentINPlanfalse/aprmModifPaymentINPlan
 aprmModifPaymentOUTPlanfalse/aprmModifPaymentOUTPlan
 expectedDate2012-10-25T00:00:00.0Z/expectedDate
-daysOverdue6/daysOverdue
+daysOverdue8/daysOverdue
 lastPaymentDate xsi:nil=true/
 numberOfPayments0/numberOfPayments
   /FIN_Payment_Schedule
@@ -30012,7 +30012,7 @@
 aprmModifPaymentINPlanfalse/aprmModifPaymentINPlan
 aprmModifPaymentOUTPlanfalse/aprmModifPaymentOUTPlan
 expectedDate2012-10-25T00:00:00.0Z/expectedDate
-daysOverdue6/daysOverdue
+daysOverdue8/daysOverdue
 lastPaymentDate xsi:nil=true/
 numberOfPayments0/numberOfPayments
   /FIN_Payment_Schedule
@@ -30636,7 +30636,7 @@
 aprmModifPaymentINPlanfalse/aprmModifPaymentINPlan
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/7ce4dfeab79a
changeset: 18053:7ce4dfeab79a
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Wed Sep 26 10:18:22 2012 +0200
summary:   Fixed issue 21623 Sample data (FB client) monthly update

details:   https://code.openbravo.com/erp/devel/pi/rev/540a94d0cfd2
changeset: 18054:540a94d0cfd2
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Wed Sep 26 10:41:34 2012 +0200
summary:   Fixed bug 21651 Changed the chart of accounts of FB España

details:   https://code.openbravo.com/erp/devel/pi/rev/f00a4d59bf8e
changeset: 18055:f00a4d59bf8e
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Wed Sep 26 10:50:52 2012 +0200
summary:   Fixed bug 21564 Change Account Sign setup on Acc. Depreciation 
accounts

details:   https://code.openbravo.com/erp/devel/pi/rev/5ccca2d6ab45
changeset: 18056:5ccca2d6ab45
user:  David Miguelez david.miguelez at openbravo.com
date:  Wed Sep 26 16:53:21 2012 +0200
summary:   Related to Issue21623: Removes Matching Algorithm.

diffstat:

 referencedata/sampledata/F_B_International_Group.xml |  49907 -
 1 files changed, 48583 insertions(+), 1324 deletions(-)

diffs (truncated from 65628 to 300 lines):

diff -r 8a0aed9bd90d -r 5ccca2d6ab45 
referencedata/sampledata/F_B_International_Group.xml
--- a/referencedata/sampledata/F_B_International_Group.xml  Wed Sep 26 
17:26:55 2012 +0200
+++ b/referencedata/sampledata/F_B_International_Group.xml  Wed Sep 26 
16:53:21 2012 +0200
@@ -1,14 +1,5 @@
 ?xml version=1.0 encoding=UTF-8?
 ob:Openbravo xmlns:ob=http://www.openbravo.com; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-  FinancialMgmtMatchingAlgorithm id=03266D6AD5B949F8B6231E158CE5D9A2
-id03266D6AD5B949F8B6231E158CE5D9A2/id
-client id=23C59575B9CF467C9620760EB255B389/
-organization id=0/
-activetrue/active
-nameAdvanced Matching Algorithm/name
-descriptionThe Advanced Matching Algorithm adds the possibility to match 
a bank statement line with a payment if the financial account transaction is 
not found; or with an invoice payment plan line if a payment is not found; or 
with an order payment plan line if an invoice payment plan lines is not 
found; and finally to generate a credit for a Business Partner in case there 
are no transaction to match found. Advanced Matching Algorithm also creates 
the corresponding financial accounts transactions while matching and finally it 
adds unmatching at any time. /description
-
javaClassNameorg.openbravo.module.invoicematchingalgorithm.algorithm.InvoiceMatchingAlgorithm/javaClassName
-  /FinancialMgmtMatchingAlgorithm
   FinancialMgmtMatchingAlgorithm id=B98D193328B84DB89E50164A3ADD2B82
 idB98D193328B84DB89E50164A3ADD2B82/id
 client id=23C59575B9CF467C9620760EB255B389/
@@ -750,6 +741,30 @@
 gLItem xsi:nil=true/
 isprepaymentfalse/isprepayment
   /FIN_Payment_Detail
+  FIN_Payment_Detail id=310160E3BD2A46DF8A7979C570B4C6FE
+id310160E3BD2A46DF8A7979C570B4C6FE/id
+client id=23C59575B9CF467C9620760EB255B389/
+organization id=B843C30461EA4501935CB1D125C9C25A/
+finPayment id=510E9AA4B0FB49BF8B89017FCED173D3/
+amount1957.62/amount
+refundfalse/refund
+activetrue/active
+writeoffAmount0.00/writeoffAmount
+gLItem xsi:nil=true/
+isprepaymentfalse/isprepayment
+  /FIN_Payment_Detail
+  FIN_Payment_Detail id=32363A066B3042FF8FDB4110EBEAFD4F
+id32363A066B3042FF8FDB4110EBEAFD4F/id
+client id=23C59575B9CF467C9620760EB255B389/
+organization id=B843C30461EA4501935CB1D125C9C25A/
+finPayment id=9DF42D5AF4B842409A623D5FB5539CF0/
+amount25/amount
+refundfalse/refund
+activetrue/active
+writeoffAmount0/writeoffAmount
+gLItem id=A4087A1F6F954E0BBF23B721A7773D7D/
+isprepaymentfalse/isprepayment
+  /FIN_Payment_Detail
   FIN_Payment_Detail id=32384B981A974B399413C76071F01703
 id32384B981A974B399413C76071F01703/id
 client id=23C59575B9CF467C9620760EB255B389/
@@ -762,6 +777,18 @@
 gLItem xsi:nil=true/
 isprepaymentfalse/isprepayment
   /FIN_Payment_Detail
+  FIN_Payment_Detail id=329A312A7FA840A6861E0517009A7971
+id329A312A7FA840A6861E0517009A7971/id
+client id=23C59575B9CF467C9620760EB255B389/
+organization id=2E60544D37534C0B89E765FE29BC0B43/
+finPayment id=0FF8ED84EECF44BC8EDB760961BE32D5/
+amount741050/amount
+refundfalse/refund
+activetrue/active
+writeoffAmount0.00/writeoffAmount
+gLItem xsi:nil=true/
+isprepaymentfalse/isprepayment
+  /FIN_Payment_Detail
   FIN_Payment_Detail id=341F2200DDF44983A87B4968083B864A
 id341F2200DDF44983A87B4968083B864A/id
 client id=23C59575B9CF467C9620760EB255B389/
@@ -822,6 +849,18 @@
 gLItem xsi:nil=true/
 isprepaymentfalse/isprepayment
   /FIN_Payment_Detail
+  FIN_Payment_Detail id=36CC9E16E308447DA8B9AC5049E9D1F2
+id36CC9E16E308447DA8B9AC5049E9D1F2/id
+client 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/06932c2df6ca
changeset: 18006:06932c2df6ca
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Tue Sep 25 08:26:44 2012 +0200
summary:   Fixed bug 21665: Bank Account Format redesign
The Financial Account window and Business Partner | Bank tab have the same 
structure
Show * checkboxes hidden and deprecated. We use a list instead that can be 
easily extended
by modularity.
Added retrocompatibility for modules that use the checkboxes logic
Included oncreatedefault clauses to ensure old clients are properly migrated
Extracted IBAN validator to a db function
Included IBAN validation in Financial Account

details:   https://code.openbravo.com/erp/devel/pi/rev/f80e308e3177
changeset: 18007:f80e308e3177
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Mon Sep 24 13:48:56 2012 +0200
summary:   Related to bug 21665: Exported sampledata before including the new 
changes

details:   https://code.openbravo.com/erp/devel/pi/rev/e4335bcdfc62
changeset: 18008:e4335bcdfc62
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Mon Sep 24 14:03:19 2012 +0200
summary:   Fixed issue 21665: Sampledata includes new changes related to banks

details:   https://code.openbravo.com/erp/devel/pi/rev/84a0b15c82c5
changeset: 18009:84a0b15c82c5
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Tue Sep 25 08:29:41 2012 +0200
summary:   Fixed bug 21665: fixed dbcons due to manual merge

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml   
|12 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/BusinessPartnerBankAccountHandler.java
 |87 +
 modules/org.openbravo.v3/src-db/database/configScript.xml  
| 4 -
 referencedata/sampledata/F_B_International_Group.xml   
|  2072 +
 referencedata/sampledata/QA_Testing.xml
|   184 +-
 src-db/database/model/functions/C_GET_IBAN_DISPLAYED_ACCOUNT.xml   
|82 +
 src-db/database/model/tables/C_BP_BANKACCOUNT.xml  
|12 +-
 src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml 
|21 +-
 src-db/database/model/triggers/C_BP_BANKACCOUNTIBAN_TRG.xml
|83 +-
 src-db/database/model/triggers/FIN_FINANCIAL_ACCOUNT_TRG2.xml  
|34 +-
 src-db/database/sourcedata/AD_COLUMN.xml   
|   204 +-
 src-db/database/sourcedata/AD_ELEMENT.xml  
|54 +-
 src-db/database/sourcedata/AD_FIELD.xml
|   278 +-
 src-db/database/sourcedata/AD_FIELDGROUP.xml   
| 9 +
 src-db/database/sourcedata/AD_MESSAGE.xml  
|   112 +-
 src-db/database/sourcedata/AD_REFERENCE.xml
|12 +
 src-db/database/sourcedata/AD_REF_LIST.xml 
|48 +
 src-db/database/sourcedata/AD_VAL_RULE.xml 
|22 +
 18 files changed, 2161 insertions(+), 1169 deletions(-)

diffs (truncated from 8666 to 300 lines):

diff -r 6e892b588e49 -r 84a0b15c82c5 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml  
Mon Sep 24 19:26:43 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml  
Tue Sep 25 08:29:41 2012 +0200
@@ -7820,9 +7820,9 @@
 !--8420366B8591339CE040007F010023A9--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
 !--8420366B8591339CE040007F010023A9--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--8420366B8591339CE040007F010023A9--  ISACTIVE![CDATA[Y]]/ISACTIVE
-!--8420366B8591339CE040007F010023A9--  NAME![CDATA[Account No.]]/NAME
-!--8420366B8591339CE040007F010023A9--  DESCRIPTION![CDATA[Account 
Number]]/DESCRIPTION
-!--8420366B8591339CE040007F010023A9--  HELP![CDATA[The Account Number 
indicates the Number assigned to this account]]/HELP

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/717cfc93ba9b
changeset: 17987:717cfc93ba9b
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Tue Sep 18 13:02:56 2012 +0200
summary:   Fixes issue 21671: User can change the organization when the invoice 
has lines.

details:   https://code.openbravo.com/erp/devel/pi/rev/86e3a64ee722
changeset: 17988:86e3a64ee722
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Tue Sep 18 18:38:18 2012 +0200
summary:   Fixes issue 21670: Some M_transaction 'movement types' are not used.

details:   https://code.openbravo.com/erp/devel/pi/rev/9681ae1efd04
changeset: 17989:9681ae1efd04
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Tue Sep 18 18:39:03 2012 +0200
summary:   Fixes issue 21678: Match Statement process button shows an error
if the user does not have access to Matching algorithm window or table.

details:   https://code.openbravo.com/erp/devel/pi/rev/a11f82799fbf
changeset: 17990:a11f82799fbf
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Wed Sep 19 12:48:16 2012 +0200
summary:   Fixes issue 21686: Wrong 'Paid Out' amount after reactivate a 
Payment In.

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
 |   6 ++--
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
  |  15 -
 src-db/database/sourcedata/AD_COLUMN.xml   
  |   4 +-
 src-db/database/sourcedata/AD_REF_LIST.xml 
  |   4 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

diffs (100 lines):

diff -r ce64e9cc6a7d -r a11f82799fbf 
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
  Tue Sep 18 12:38:05 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
  Wed Sep 19 12:48:16 2012 +0200
@@ -468,12 +468,12 @@
 // Amounts
 if (payment.isReceipt()) {
   glItem.put(glitemPaidOutAmt, psdGLItem.getAmount().signum()  0 ? 
psdGLItem.getAmount()
-  : BigDecimal.ZERO);
+  .abs() : BigDecimal.ZERO);
   glItem.put(glitemReceivedInAmt,
   psdGLItem.getAmount().signum()  0 ? psdGLItem.getAmount() : 
BigDecimal.ZERO);
 } else {
-  glItem.put(glitemReceivedInAmt,
-  psdGLItem.getAmount().signum()  0 ? psdGLItem.getAmount() : 
BigDecimal.ZERO);
+  glItem.put(glitemReceivedInAmt, psdGLItem.getAmount().signum()  0 
? psdGLItem
+  .getAmount().abs() : BigDecimal.ZERO);
   glItem.put(glitemPaidOutAmt, psdGLItem.getAmount().signum()  0 ? 
psdGLItem.getAmount()
   : BigDecimal.ZERO);
 }
diff -r ce64e9cc6a7d -r a11f82799fbf 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
   Tue Sep 18 12:38:05 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
   Wed Sep 19 12:48:16 2012 +0200
@@ -372,6 +372,7 @@
 FIN_FinancialAccount financial = 
OBDal.getInstance().get(FIN_FinancialAccount.class,
 strFinancialAccountId);
 try {
+  OBContext.setAdminMode(true);
   new 
FIN_MatchingTransaction(financial.getMatchingAlgorithm().getJavaClassName());
 } catch (Exception ex) {
   OBDal.getInstance().rollbackAndClose();
@@ -380,6 +381,8 @@
   vars.setMessage(strTabId, message);
   printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, R, 
true));
   return;
+} finally {
+  OBContext.restorePreviousMode();
 }
 try {
   ComboTableData comboTableData = new ComboTableData(vars, this, LIST, 
,
@@ -408,8 +411,16 @@
 XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
 
org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid).createXmlDocument();
 
-FieldProvider[] data = getMatchedBankStatementLinesData(vars, 
strFinancialAccountId,
-strReconciliationId, strPaymentTypeFilter, strShowCleared, 
strHideDate);
+FieldProvider[] data = null;
+try {
+  OBContext.setAdminMode(true);
+  data = getMatchedBankStatementLinesData(vars, strFinancialAccountId, 
strReconciliationId,
+  strPaymentTypeFilter, strShowCleared, strHideDate);
+} catch (Exception e) {
+  log4j.debug(Output: Exception ocurred while retrieving Bank Statement 
Lines.);
+} finally {
+  OBContext.restorePreviousMode();
+}
 
 xmlDocument.setData(structure, data);
 
diff -r 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/8839b720e9f9
changeset: 16904:8839b720e9f9
user:  Martin Taal martin.taal at openbravo.com
date:  Fri Jun 22 14:58:32 2012 +0200
summary:   Fixes issue 20841: Prevent null pointer exception in the FIC 
component
Prevent NPE by adding an if statement and treating null differently

details:   https://code.openbravo.com/erp/devel/pi/rev/4d7158b8b0d4
changeset: 16905:4d7158b8b0d4
user:  Martin Taal martin.taal at openbravo.com
date:  Fri Jun 22 15:00:41 2012 +0200
summary:   Fixes issue 20840: Product selector in Product Bill of Material does 
not work
If the warehouse is not defined in the session then the default value 
expression evaluation returns a '', handle this case.
Note this has not worked for a long while, it does not work in main either

details:   https://code.openbravo.com/erp/devel/pi/rev/c5c63ab2d60e
changeset: 16906:c5c63ab2d60e
user:  Martin Taal martin.taal at openbravo.com
date:  Fri Jun 22 15:02:39 2012 +0200
summary:   Related to 20829: BB.DD rrror when executing Bill of Materials 
Production process
Only do left join fetching if explicitly set, in other cases uses normal left 
join handling

details:   https://code.openbravo.com/erp/devel/pi/rev/d41c49f86b66
changeset: 16907:d41c49f86b66
user:  Martin Taal martin.taal at openbravo.com
date:  Fri Jun 22 23:24:09 2012 +0200
summary:   Merged branches

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 |   9 +++--
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
 |   2 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
   |  10 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/DataEntityQueryService.java
 |   7 +++
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
 |   4 +++-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
   |  10 --
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
 |   2 +-
 7 files changed, 36 insertions(+), 8 deletions(-)

diffs (147 lines):

diff -r fee596d84bb3 -r d41c49f86b66 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 Fri Jun 22 11:12:39 2012 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 Fri Jun 22 23:24:09 2012 +0200
@@ -1033,8 +1033,13 @@
   if (currentValue != null  currentValue.equals(null)) {
 currentValue = null;
   }
-  RequestContext.get().setRequestParameter(inp + 
Sqlc.TransformaNombreColumna(columnName),
-  currentValue.toString());
+  if (currentValue == null) {
+RequestContext.get().setRequestParameter(inp + 
Sqlc.TransformaNombreColumna(columnName),
+null);
+  } else {
+RequestContext.get().setRequestParameter(inp + 
Sqlc.TransformaNombreColumna(columnName),
+currentValue.toString());
+  }
 }
   }
 
diff -r fee596d84bb3 -r d41c49f86b66 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
 Fri Jun 22 11:12:39 2012 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
 Fri Jun 22 23:24:09 2012 +0200
@@ -293,7 +293,7 @@
 OB.Utilities.Number.JSToOBMasked = function (number, maskNumeric, 
decSeparator, groupSeparator, groupInterval) {
   var isANumber = Object.prototype.toString.call(number) === '[object Number]';
   if (!isANumber) {
-return null;
+return number;
   }
   var formattedNumber = number;
   formattedNumber = formattedNumber.toString();
diff -r fee596d84bb3 -r d41c49f86b66 
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
--- 
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
   Fri Jun 22 11:12:39 2012 +0200
+++ 
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
   Fri Jun 22 23:24:09 2012 +0200
@@ -1253,7 +1253,7 @@
 private Property property;
 private String joinAlias = getNewUniqueJoinAlias();
 private String ownerAlias;
-private boolean fetchJoin = true;
+private 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/d37ba4a63306
changeset: 16861:d37ba4a63306
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Tue Jun 12 17:25:20 2012 +0200
summary:   Fixed bug 20735 Display correctly currency in add payment from 
transactions

details:   https://code.openbravo.com/erp/devel/pi/rev/7d4e36b9162b
changeset: 16862:7d4e36b9162b
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Wed Jun 13 10:42:53 2012 +0200
summary:   Fixed bug 20738 Add logic to catch NaN in Add payment from 
transactions
Add logic to catch NaN in Add payment from transactions when
using multicurrency.

details:   https://code.openbravo.com/erp/devel/pi/rev/938edd27d05b
changeset: 16863:938edd27d05b
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Mon Jun 18 18:50:42 2012 +0200
summary:   Related to issue 20738: empty string in js is false

details:   https://code.openbravo.com/erp/devel/pi/rev/2a58516b70ca
changeset: 16864:2a58516b70ca
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Mon Jun 18 19:07:58 2012 +0200
summary:   Related to issue 20735: do not force a loadGrid, only apply readonly 
logic

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
 |  13 -
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
   |  12 +++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diffs (64 lines):

diff -r ba2db048e983 -r 2a58516b70ca 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
  Mon Jun 18 16:06:45 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
  Mon Jun 18 19:07:58 2012 +0200
@@ -627,12 +627,12 @@
 
 function currencyOnChange() {
   if( isPaymentMethodMulticurrency() ) {
-changeClass('paramCurrencyId','ComboKeyReadOnly ', 'ComboKey 
dojoValidateValid required ')
+changeClass('paramCurrencyId','ComboKeyReadOnly ', 'ComboKey 
dojoValidateValid required ',true);
 loadGridList();
 return refreshExchangeRate();
   } else {
 // Reset currency
-changeClass('paramCurrencyId', 'ComboKey dojoValidateValid required ', 
'ComboKeyReadOnly ');
+changeClass('paramCurrencyId', 'ComboKey dojoValidateValid required ', 
'ComboKeyReadOnly ',true);
 selectCombo(document.getElementById('paramCurrencyId'), 
document.getElementById('paramFinancialAccountCurrencyId').value);
 document.getElementById('paramExchangeRate').value='1';
 updateConvertedAmounts();
@@ -641,6 +641,14 @@
   }
 }
 
+function currencyOnChangeOnLoad() {
+  if( isPaymentMethodMulticurrency() ) {
+changeClass('paramCurrencyId','ComboKeyReadOnly ', 'ComboKey 
dojoValidateValid required ',true);
+  } else {
+changeClass('paramCurrencyId', 'ComboKey dojoValidateValid required ', 
'ComboKeyReadOnly ',true);
+  }
+}
+
 function callBackExchangeRate(paramXMLParticular, XMLHttpRequestObj) {
   if (getReadyStateHandler(XMLHttpRequestObj)) {
 try {
@@ -718,6 +726,7 @@
   displayLogicElement('sectionDifference', false);
   displayLogicElement('sectionDifferenceBox', false);
   displayLogicForCredit();
+  currencyOnChangeOnLoad();
   displayMulticurrencyControls();
 
   resizeAreaCreateFrom();
diff -r ba2db048e983 -r 2a58516b70ca 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
--- 
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Mon Jun 18 16:06:45 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Mon Jun 18 19:07:58 2012 +0200
@@ -290,9 +290,17 @@
 exchangeRate.value = '';
   }
 } else {
-  actualConverted.value = formattedNumberOpTemp(actualPayment.value, '*', 
exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator, 
globalGroupInterval);
+  if (exchangeRate.value) {
+actualConverted.value = formattedNumberOpTemp(actualPayment.value, 
'*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator, 
globalGroupInterval);
+  } else {
+actualConverted.value = applyFormat('0');
+  }
 }
-expectedConverted.value = formattedNumberOpTemp(expectedPayment.value, 
'*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator, 
globalGroupInterval);
+if (exchangeRate.value  expectedPayment.value) {
+  expectedConverted.value = formattedNumberOpTemp(expectedPayment.value, 
'*', exchangeRate.value, roundedMask, globalDecSeparator, globalGroupSeparator, 
globalGroupInterval);
+} else {
+  expectedConverted.value = applyFormat('0');
+}
   }
 }
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/ca313a1ecdf8
changeset: 16802:ca313a1ecdf8
user:  Naiara Martinez naiara.martinez at openbravo.com
date:  Thu May 31 17:10:45 2012 +0200
summary:   fixed bug 20647 Remove duplicated constraint

details:   https://code.openbravo.com/erp/devel/pi/rev/0f8fd9baa16e
changeset: 16803:0f8fd9baa16e
user:  Naiara Martinez naiara.martinez at openbravo.com
date:  Fri Jun 01 14:53:40 2012 +0200
summary:   fixed bug 20589 JS and Java error trying to convert string in number

details:   https://code.openbravo.com/erp/devel/pi/rev/299e47c77f04
changeset: 16804:299e47c77f04
user:  Sandra Huguet sandra.huguet at openbravo.com
date:  Fri Jun 01 10:43:35 2012 +0200
summary:   Fixed bug 19819 Add logic to catch division by 0 in Add details
Add logic to catch division by 0 when change actual converted
in Add Details in Payment In window.

details:   https://code.openbravo.com/erp/devel/pi/rev/a6672f4c6903
changeset: 16805:a6672f4c6903
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Tue Jun 12 10:18:59 2012 +0200
summary:   Related to issue 19819: code review, use js compare method

diffstat:

 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
 |  4 +++-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
 |  5 -
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java
  |  7 ++-
 src-db/database/model/tables/FIN_PAYMENT_RUN_PARA.xml  
|  1 -
 4 files changed, 13 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 8b8886e76823 -r a6672f4c6903 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
--- 
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Mon Jun 11 20:52:58 2012 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Tue Jun 12 10:18:59 2012 +0200
@@ -283,7 +283,9 @@
   if (actualConverted  expectedConverted  exchangeRate) {
 if (recalcExchangeRate) {
   if (actualConverted.value  actualPayment.value) {
-exchangeRate.value = formattedNumberOpTemp(actualConverted.value, '/', 
actualPayment.value, roundedMask, globalDecSeparator, globalGroupSeparator, 
globalGroupInterval);
+if (compare(actualPayment.value, '!=', 0)) {
+  exchangeRate.value = formattedNumberOpTemp(actualConverted.value, 
'/', actualPayment.value, roundedMask, globalDecSeparator, 
globalGroupSeparator, globalGroupInterval);
+}
   } else {
 exchangeRate.value = '';
   }
diff -r 8b8886e76823 -r a6672f4c6903 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
Mon Jun 11 20:52:58 2012 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js
Tue Jun 12 10:18:59 2012 +0200
@@ -23,6 +23,9 @@
  * Check that entered return quantity is less than original inout qty.
  */
 OB.RM.RMOrderQtyValidate = function (item, validator, value, record) {
+  if (!isc.isA.Number(value)){
+return false;
+  }
   // Check if record has related shipment to skip check.
   if (record.goodsShipmentLine === null || record.goodsShipmentLine === '') {
 return value !== null  value  0;
@@ -137,4 +140,4 @@
   record.movementQuantity = availableQty.toString();
 }
   }
-};
\ No newline at end of file
+};
diff -r 8b8886e76823 -r a6672f4c6903 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java
--- 
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java
 Mon Jun 11 20:52:58 2012 +0200
+++ 
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java
 Tue Jun 12 10:18:59 2012 +0200
@@ -162,7 +162,12 @@
 valueStr = valueStr.replace(
 variables.getSessionValue(#GroupSeparator| + 
getFormat()).substring(0, 1), ).replace(
 variables.getSessionValue(#DecimalSeparator| + 
getFormat()).substring(0, 1), .);
-return new BigDecimal(valueStr);
+try {
+  return new BigDecimal(valueStr);
+} catch (Exception e) {
+  return null;
+}
+
   }
 
   @Override
diff -r 8b8886e76823 -r a6672f4c6903 
src-db/database/model/tables/FIN_PAYMENT_RUN_PARA.xml
--- a/src-db/database/model/tables/FIN_PAYMENT_RUN_PARA.xml Mon Jun 11 
20:52:58 2012 +0200
+++ b/src-db/database/model/tables/FIN_PAYMENT_RUN_PARA.xml Tue Jun 12 
10:18:59 2012 +0200
@@ -62,6 +62,5 @@
 reference 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/f1020da0f395
changeset: 16814:f1020da0f395
user:  Naiara Martinez naiara.martinez at openbravo.com
date:  Mon Jun 11 11:50:57 2012 +0200
summary:   fixed bug 19806 Change labels in General Ledger Journal

details:   https://code.openbravo.com/erp/devel/pi/rev/cda4d76f5cd2
changeset: 16815:cda4d76f5cd2
user:  Naiara Martinez naiara.martinez at openbravo.com
date:  Fri Jun 08 11:05:44 2012 +0200
summary:   fixed bug 20687 Currency show always. Set this field before product

details:   https://code.openbravo.com/erp/devel/pi/rev/124efb216006
changeset: 16816:124efb216006
user:  Naiara Martinez naiara.martinez at openbravo.com
date:  Mon Jun 11 10:53:01 2012 +0200
summary:   fixed bug 20700 hide Reply-to field when more than one sales rep.

details:   https://code.openbravo.com/erp/devel/pi/rev/f35c55cdedf5
changeset: 16817:f35c55cdedf5
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Tue Jun 12 18:59:06 2012 +0200
summary:   Related to issue 20700: fix typo

diffstat:

 src-db/database/sourcedata/AD_FIELD.xml |  
 3 +-
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml|  
66 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html  |  
 8 +-
 src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java |  
 5 +-
 4 files changed, 42 insertions(+), 40 deletions(-)

diffs (161 lines):

diff -r 0b5e6502cd76 -r f35c55cdedf5 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml   Wed May 23 10:55:08 2012 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml   Tue Jun 12 18:59:06 2012 +0200
@@ -115875,10 +115875,9 @@
 !--801458--  AD_TAB_ID![CDATA[800078]]/AD_TAB_ID
 !--801458--  AD_COLUMN_ID![CDATA[801065]]/AD_COLUMN_ID
 !--801458--  ISDISPLAYED![CDATA[Y]]/ISDISPLAYED
-!--801458--  DISPLAYLOGIC![CDATA[@IsDepreciated@='Y']]/DISPLAYLOGIC
 !--801458--  DISPLAYLENGTH![CDATA[44]]/DISPLAYLENGTH
 !--801458--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--801458--  SEQNO![CDATA[80]]/SEQNO
+!--801458--  SEQNO![CDATA[69]]/SEQNO
 !--801458--  ISSAMELINE![CDATA[Y]]/ISSAMELINE
 !--801458--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--801458--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
diff -r 0b5e6502cd76 -r f35c55cdedf5 
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml  Wed May 23 10:55:08 
2012 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml  Tue Jun 12 18:59:06 
2012 +0200
@@ -12791,6 +12791,17 @@
 !--02E4CF0415C84120B759B7E2E5146558--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
 !--02E4CF0415C84120B759B7E2E5146558--/AD_TEXTINTERFACES
 
+!--03FF12EC8B584FE093B398181957431A--AD_TEXTINTERFACES
+!--03FF12EC8B584FE093B398181957431A--  
AD_TEXTINTERFACES_ID![CDATA[03FF12EC8B584FE093B398181957431A]]/AD_TEXTINTERFACES_ID
+!--03FF12EC8B584FE093B398181957431A--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--03FF12EC8B584FE093B398181957431A--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--03FF12EC8B584FE093B398181957431A--  ISACTIVE![CDATA[Y]]/ISACTIVE
+!--03FF12EC8B584FE093B398181957431A--  TEXT![CDATA[Show PL Closing 
Entries]]/TEXT
+!--03FF12EC8B584FE093B398181957431A--  
FILENAME![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]/FILENAME
+!--03FF12EC8B584FE093B398181957431A--  ISUSED![CDATA[Y]]/ISUSED
+!--03FF12EC8B584FE093B398181957431A--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--03FF12EC8B584FE093B398181957431A--/AD_TEXTINTERFACES
+
 !--043304C07CB44C50B8FE73C57A3D157F--AD_TEXTINTERFACES
 !--043304C07CB44C50B8FE73C57A3D157F--  
AD_TEXTINTERFACES_ID![CDATA[043304C07CB44C50B8FE73C57A3D157F]]/AD_TEXTINTERFACES_ID
 !--043304C07CB44C50B8FE73C57A3D157F--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
@@ -14055,6 +14066,17 @@
 !--50AAFE528283409E997BA000F7C61ABF--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
 !--50AAFE528283409E997BA000F7C61ABF--/AD_TEXTINTERFACES
 
+!--518C5EF886394397BDE1550839DED433--AD_TEXTINTERFACES
+!--518C5EF886394397BDE1550839DED433--  
AD_TEXTINTERFACES_ID![CDATA[518C5EF886394397BDE1550839DED433]]/AD_TEXTINTERFACES_ID
+!--518C5EF886394397BDE1550839DED433--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--518C5EF886394397BDE1550839DED433--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--518C5EF886394397BDE1550839DED433--  ISACTIVE![CDATA[Y]]/ISACTIVE
+!--518C5EF886394397BDE1550839DED433--  TEXT![CDATA[Show Closing 
Entries]]/TEXT
+!--518C5EF886394397BDE1550839DED433--  
FILENAME![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]/FILENAME
+!--518C5EF886394397BDE1550839DED433--  ISUSED![CDATA[Y]]/ISUSED
+!--518C5EF886394397BDE1550839DED433--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--518C5EF886394397BDE1550839DED433--/AD_TEXTINTERFACES
+
 !--520A3E4E01744392BBBD82F6DD1D8A7E--AD_TEXTINTERFACES
 !--520A3E4E01744392BBBD82F6DD1D8A7E--  
AD_TEXTINTERFACES_ID![CDATA[520A3E4E01744392BBBD82F6DD1D8A7E]]/AD_TEXTINTERFACES_ID
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/2bf4f16d601b
changeset: 16740:2bf4f16d601b
user:  Javier Etxarri javier.echarri at openbravo.com
date:  Fri Jun 01 12:59:58 2012 +0200
summary:   Fixes issue 20434: Process failed during execution when post a 
Matched Invoice

details:   https://code.openbravo.com/erp/devel/pi/rev/b438f3afeb4e
changeset: 16741:b438f3afeb4e
user:  Javier Etxarri javier.echarri at openbravo.com
date:  Mon Jun 04 10:07:52 2012 +0200
summary:   Fixes issue 20440: Error without information in the PE of Return To 
Vendor

details:   https://code.openbravo.com/erp/devel/pi/rev/7c7695051a48
changeset: 16742:7c7695051a48
user:  Javier Etxarri javier.echarri at openbravo.com
date:  Mon Jun 04 12:34:26 2012 +0200
summary:   Fixes issue 20663: In java SRMOPickEditLines.java can fail when is 
getting the tax

details:   https://code.openbravo.com/erp/devel/pi/rev/20e7cfac32dd
changeset: 16743:20e7cfac32dd
user:  Javier Etxarri javier.echarri at openbravo.com
date:  Tue Jun 05 09:59:33 2012 +0200
summary:   Fixes issue 20640: Quick lunch short for specific names of some menu

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
 |   2 +-
 src-db/database/sourcedata/AD_MESSAGE.xml  

 |  11 ++
 src/org/openbravo/common/actionhandler/SRMOPickEditLines.java  

 |  38 ++---
 src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java  

 |   9 +-
 4 files changed, 43 insertions(+), 17 deletions(-)

diffs (133 lines):

diff -r 5644f97bda6e -r 20e7cfac32dd 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
   Fri Jun 01 14:18:28 2012 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
   Tue Jun 05 09:59:33 2012 +0200
@@ -129,7 +129,7 @@
   // is 20
   pickListCellHeight: 22,
 
-  quickRunWidth: 210,
+  quickRunWidth: 267,
   // fixes issue https://issues.openbravo.com/view.php?id=15105
   quickRunPickListCellHeight: 22,
   pickListHeight: 200,
diff -r 5644f97bda6e -r 20e7cfac32dd src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Fri Jun 01 14:18:28 2012 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Tue Jun 05 09:59:33 2012 +0200
@@ -19688,6 +19688,17 @@
 !--D3FE17DEC49F4FC3BAE381FDAAA00D52--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
 !--D3FE17DEC49F4FC3BAE381FDAAA00D52--/AD_MESSAGE
 
+!--D40805953F4042C293C2390B6B36034E--AD_MESSAGE
+!--D40805953F4042C293C2390B6B36034E--  
AD_MESSAGE_ID![CDATA[D40805953F4042C293C2390B6B36034E]]/AD_MESSAGE_ID
+!--D40805953F4042C293C2390B6B36034E--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--D40805953F4042C293C2390B6B36034E--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--D40805953F4042C293C2390B6B36034E--  ISACTIVE![CDATA[Y]]/ISACTIVE
+!--D40805953F4042C293C2390B6B36034E--  
VALUE![CDATA[NoTaxFoundForProduct]]/VALUE
+!--D40805953F4042C293C2390B6B36034E--  MSGTEXT![CDATA[With current 
product configuration and order it is not possible to found a valid tax for 
product @product@. Please change the tax and product configuration.]]/MSGTEXT
+!--D40805953F4042C293C2390B6B36034E--  MSGTYPE![CDATA[E]]/MSGTYPE
+!--D40805953F4042C293C2390B6B36034E--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--D40805953F4042C293C2390B6B36034E--/AD_MESSAGE
+
 !--D4208AC7E8B348D08F0D621DB273F257--AD_MESSAGE
 !--D4208AC7E8B348D08F0D621DB273F257--  
AD_MESSAGE_ID![CDATA[D4208AC7E8B348D08F0D621DB273F257]]/AD_MESSAGE_ID
 !--D4208AC7E8B348D08F0D621DB273F257--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
diff -r 5644f97bda6e -r 20e7cfac32dd 
src/org/openbravo/common/actionhandler/SRMOPickEditLines.java
--- a/src/org/openbravo/common/actionhandler/SRMOPickEditLines.java Fri Jun 
01 14:18:28 2012 +0200
+++ b/src/org/openbravo/common/actionhandler/SRMOPickEditLines.java Tue Jun 
05 09:59:33 2012 +0200
@@ -38,6 +38,7 @@
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.model.common.order.Order;
@@ -190,6 +191,12 @@
   parameters.add(Y);
 
   

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/9500d6d28f8e
changeset: 16199:9500d6d28f8e
user:  Naiara Martinez naiara.martinez at openbravo.com
date:  Mon Apr 23 09:52:34 2012 +0200
summary:   fixed bug 9518 set max length for Initial Client Setup username to 60

details:   https://code.openbravo.com/erp/devel/pi/rev/a1787a1d8fd0
changeset: 16200:a1787a1d8fd0
user:  Naiara Martinez naiara.martinez at openbravo.com
date:  Mon Apr 23 15:27:42 2012 +0200
summary:   fixed bug 13955 Compare if the variable is null for avoiding the 
exception

details:   https://code.openbravo.com/erp/devel/pi/rev/75e7d7376b75
changeset: 16201:75e7d7376b75
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Tue Apr 24 19:58:03 2012 +0200
summary:   Related to issue 9518: update license text year

details:   https://code.openbravo.com/erp/devel/pi/rev/26d0c484a5ca
changeset: 16202:26d0c484a5ca
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Tue Apr 24 19:58:20 2012 +0200
summary:   Related to issue 13955: update license text year

diffstat:

 src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java |  7 
+--
 src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html|  4 
++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r f723ed823d4f -r 26d0c484a5ca 
src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java   
Tue Apr 24 12:22:57 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java   
Tue Apr 24 19:58:20 2012 +0200
@@ -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) 2008-2010 Openbravo SLU 
+ * All portions are Copyright (C) 2008-2012 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  __.
  
@@ -92,7 +92,10 @@
 OBContext.setAdminMode(true);
 try {
   PriceList pList = OBDal.getInstance().get(PriceList.class, 
strPriceListId);
-  strResult.append(new Array(\inpcCurrencyId\, \ + 
pList.getCurrency().getId() + \),\n);
+  if (pList != null) {
+strResult.append(new Array(\inpcCurrencyId\, \ + 
pList.getCurrency().getId()
++ \),\n);
+  }
 } finally {
   OBContext.restorePreviousMode();
 }
diff -r f723ed823d4f -r 26d0c484a5ca 
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html
--- a/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html  Tue Apr 
24 12:22:57 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html  Tue Apr 
24 19:58:20 2012 +0200
@@ -13,7 +13,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) 2001-2011 Openbravo SLU
+ * All portions are Copyright (C) 2001-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  __.
  
@@ -386,7 +386,7 @@
 tr
   td class=TitleCellspan class=LabelTextClient 
Username/span/td
   td class=TextBox_ContentCell colspan=2
-input dojoType=openbravo:ValidationTextbox 
required=true class=TextBox_TwoCells_width required type=text 
name=inpClientUser id=paramClientUser maxlength=30 
value=ClienteAdmin/inputscriptdjConfig.searchIds.push(paramClientUser);/script
+input dojoType=openbravo:ValidationTextbox 
required=true class=TextBox_TwoCells_width required type=text 
name=inpClientUser id=paramClientUser maxlength=60 
value=ClienteAdmin/inputscriptdjConfig.searchIds.push(paramClientUser);/script
   /td
   td class=TitleCellspan class=LabelTextConfirm 
Password/span/td
   td class=TextBox_ContentCell colspan=2

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/045701c888f7
changeset: 15776:045701c888f7
user:  Unai Martirena unai.martirena at openbravo.com
date:  Mon Mar 12 16:10:02 2012 +0100
summary:   Fixes Issue: 0019668: wrong product selector in Manufacturing plan

details:   https://code.openbravo.com/erp/devel/pi/rev/c7b6bcb8148b
changeset: 15777:c7b6bcb8148b
user:  Unai Martirena unai.martirena at openbravo.com
date:  Mon Mar 12 16:41:10 2012 +0100
summary:   Fixes Issue 0019493: Production Daily Work Requirements Report 
should be removed

details:   https://code.openbravo.com/erp/devel/pi/rev/3aac5dcbf74c
changeset: 15778:3aac5dcbf74c
user:  Unai Martirena unai.martirena at openbravo.com
date:  Mon Mar 12 17:03:36 2012 +0100
summary:   Fixes Issue 0019613: Withholding field in GL Journal Line should be 
hidden

details:   https://code.openbravo.com/erp/devel/pi/rev/a6bab35a4fbe
changeset: 15779:a6bab35a4fbe
user:  Unai Martirena unai.martirena at openbravo.com
date:  Mon Mar 12 18:18:04 2012 +0100
summary:   Fixes Issue 0019891: Incorrect org. can be selected in the 
accounting dim. tab

diffstat:

 modules/org.openbravo.v3/src-db/database/configScript.xml |  8 
 src-db/database/sourcedata/AD_COLUMN.xml  |  5 +++--
 src-db/database/sourcedata/OBUISEL_SELECTOR.xml   |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diffs (66 lines):

diff -r cf59a36b6772 -r a6bab35a4fbe 
modules/org.openbravo.v3/src-db/database/configScript.xml
--- a/modules/org.openbravo.v3/src-db/database/configScript.xml Fri Mar 09 
09:43:26 2012 +0100
+++ b/modules/org.openbravo.v3/src-db/database/configScript.xml Mon Mar 12 
18:18:04 2012 +0100
@@ -21,6 +21,10 @@
   oldValue![CDATA[Y]]/oldValue
   newValue![CDATA[N]]/newValue
 /columnDataChange
+columnDataChange tablename=AD_MENU columnname=ISACTIVE pkRow=800281
+  oldValue![CDATA[Y]]/oldValue
+  newValue![CDATA[N]]/newValue
+/columnDataChange
 columnDataChange tablename=AD_COLUMN columnname=DEFAULTVALUE 
pkRow=17FDE34256AC11DE8CD0DFCC30CA23CC
   oldValue![CDATA[]]/oldValue
   newValue![CDATA[ ]]/newValue
@@ -1753,6 +1757,10 @@
   oldValue![CDATA[Y]]/oldValue
   newValue![CDATA[N]]/newValue
 /columnDataChange
+columnDataChange tablename=AD_FIELD columnname=SHOWINRELATION 
pkRow=98C38D2E56AC11DE8275F3BADDEF3F7F
+  oldValue![CDATA[Y]]/oldValue
+  newValue![CDATA[N]]/newValue
+/columnDataChange
 columnDataChange tablename=AD_FIELD columnname=ISDISPLAYED 
pkRow=98C3C53256AC11DE9989D70F7DF0A574
   oldValue![CDATA[Y]]/oldValue
   newValue![CDATA[N]]/newValue
diff -r cf59a36b6772 -r a6bab35a4fbe src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml  Fri Mar 09 09:43:26 2012 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml  Mon Mar 12 18:18:04 2012 +0100
@@ -144257,6 +144257,7 @@
 !--801044--  COLUMNNAME![CDATA[AD_Org_ID]]/COLUMNNAME
 !--801044--  AD_TABLE_ID![CDATA[800059]]/AD_TABLE_ID
 !--801044--  AD_REFERENCE_ID![CDATA[19]]/AD_REFERENCE_ID
+!--801044--  
AD_VAL_RULE_ID![CDATA[53AE60A473D2460D8663D7A1BC5BA732]]/AD_VAL_RULE_ID
 !--801044--  FIELDLENGTH![CDATA[12]]/FIELDLENGTH
 !--801044--  DEFAULTVALUE![CDATA[@AD_ORG_ID@]]/DEFAULTVALUE
 !--801044--  ISKEY![CDATA[N]]/ISKEY
@@ -199386,7 +199387,7 @@
 !--803614--  COLUMNNAME![CDATA[M_Product_ID]]/COLUMNNAME
 !--803614--  AD_TABLE_ID![CDATA[800218]]/AD_TABLE_ID
 !--803614--  AD_REFERENCE_ID![CDATA[30]]/AD_REFERENCE_ID
-!--803614--  
AD_REFERENCE_VALUE_ID![CDATA[800060]]/AD_REFERENCE_VALUE_ID
+!--803614--  
AD_REFERENCE_VALUE_ID![CDATA[800011]]/AD_REFERENCE_VALUE_ID
 !--803614--  FIELDLENGTH![CDATA[60]]/FIELDLENGTH
 !--803614--  ISKEY![CDATA[N]]/ISKEY
 !--803614--  ISPARENT![CDATA[N]]/ISPARENT
@@ -200028,7 +200029,7 @@
 !--803632--  COLUMNNAME![CDATA[M_Product_ID]]/COLUMNNAME
 !--803632--  AD_TABLE_ID![CDATA[800219]]/AD_TABLE_ID
 !--803632--  AD_REFERENCE_ID![CDATA[30]]/AD_REFERENCE_ID
-!--803632--  
AD_REFERENCE_VALUE_ID![CDATA[800060]]/AD_REFERENCE_VALUE_ID
+!--803632--  
AD_REFERENCE_VALUE_ID![CDATA[800011]]/AD_REFERENCE_VALUE_ID
 !--803632--  FIELDLENGTH![CDATA[60]]/FIELDLENGTH
 !--803632--  ISKEY![CDATA[N]]/ISKEY
 !--803632--  ISPARENT![CDATA[N]]/ISPARENT
diff -r cf59a36b6772 -r a6bab35a4fbe 
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml   Fri Mar 09 09:43:26 
2012 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml   Mon Mar 12 18:18:04 
2012 +0100
@@ -54,7 +54,7 @@
 !--4C8BC3E8E56441F4B8C98C684A0C9212--  NAME![CDATA[Product 
Complete]]/NAME
 !--4C8BC3E8E56441F4B8C98C684A0C9212--  
AD_REFERENCE_ID![CDATA[800011]]/AD_REFERENCE_ID
 !--4C8BC3E8E56441F4B8C98C684A0C9212--  
AD_TABLE_ID![CDATA[FF8080812E381D1E012E3898C5DD0010]]/AD_TABLE_ID
-!--4C8BC3E8E56441F4B8C98C684A0C9212--  FILTER_EXPRESSION![CDATA[( 
(\'+OB.getWindowId()+\' in (\'800051\', \'800052\') and e.product.production 
= 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/fa9695556f74
changeset: 15342:fa9695556f74
user:  Unai Martirena unai.martirena at openbravo.com
date:  Tue Jan 31 09:48:07 2012 +0100
summary:   Fixes Issue 0019523: Waiting period in Periodic Qual. Control must 
be redefined

details:   https://code.openbravo.com/erp/devel/pi/rev/6c718a7b08ef
changeset: 15343:6c718a7b08ef
user:  Unai Martirena unai.martirena at openbravo.com
date:  Mon Jan 30 13:15:06 2012 +0100
summary:   Fixes Issue 0019528: Service Project should be hidden by the conf. 
script

details:   https://code.openbravo.com/erp/devel/pi/rev/904bb8800753
changeset: 15344:904bb8800753
user:  Unai Martirena unai.martirena at openbravo.com
date:  Tue Jan 31 10:45:08 2012 +0100
summary:   Fixes Issue 0019591: Amounts in xls are not exported as amounts.

details:   https://code.openbravo.com/erp/devel/pi/rev/33cb80a95949
changeset: 15345:33cb80a95949
user:  Unai Martirena unai.martirena at openbravo.com
date:  Thu Feb 02 10:54:32 2012 +0100
summary:   Fixes Issue 0019590: To void a good shipment, *R* is not added to 
description

diffstat:

 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
 |   4 +-
 src-db/database/model/functions/M_INOUT_POST.xml   
   |  20 -
 src-db/database/sourcedata/AD_COLUMN.xml   
   |   2 +-
 src-db/database/sourcedata/AD_ELEMENT.xml  
   |   4 +-
 src-db/database/sourcedata/AD_FIELD.xml
   |   4 +-
 src-db/database/sourcedata/AD_MENU.xml 
   |   6 +-
 6 files changed, 27 insertions(+), 13 deletions(-)

diffs (136 lines):

diff -r b5951ec3a1ad -r 33cb80a95949 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
--- 
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
 Thu Feb 02 19:42:28 2012 +0100
+++ 
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml
 Thu Feb 02 10:54:32 2012 +0100
@@ -345,7 +345,7 @@
textElement textAlignment=Right
font size=8/
/textElement
-   textFieldExpression 
class=java.lang.String![CDATA[($F{BASE_AMOUNT}== null ?   : 
$F{BASE_AMOUNT}.toString())]]/textFieldExpression
+   textFieldExpression 
class=java.math.BigDecimal![CDATA[$F{BASE_AMOUNT}]]/textFieldExpression
/textField
textField isBlankWhenNull=true
reportElement key=textField-14 
style=Report_Footer x=1451 y=0 width=46 height=25/
@@ -360,7 +360,7 @@
textElement textAlignment=Right
font size=8/
/textElement
-   textFieldExpression 
class=java.lang.String![CDATA[$F{TRANS_AMOUNT}.toString() +  
]]/textFieldExpression
+   textFieldExpression 
class=java.math.BigDecimal![CDATA[$F{TRANS_AMOUNT}]]/textFieldExpression
/textField
textField isBlankWhenNull=true
reportElement key=textField-16 
style=Report_Footer x=1311 y=0 width=60 height=25/
diff -r b5951ec3a1ad -r 33cb80a95949 
src-db/database/model/functions/M_INOUT_POST.xml
--- a/src-db/database/model/functions/M_INOUT_POST.xml  Thu Feb 02 19:42:28 
2012 +0100
+++ b/src-db/database/model/functions/M_INOUT_POST.xml  Thu Feb 02 10:54:32 
2012 +0100
@@ -632,7 +632,7 @@
   v_RInOut_ID, Cur_InOut.C_Order_ID, Cur_InOut.IsSOTrx, 
Cur_InOut.AD_Client_ID,
   Cur_InOut.AD_Org_ID, 'Y', now(), v_User,
   now(), v_User, v_RDocumentNo, v_DoctypeReversed_ID,
-   '(*R*: ' || Cur_InOut.DocumentNo || ') ' || 
Cur_InOut.Description, 'N', Cur_InOut.MovementType, Cur_InOut.MovementDate,
+   '(*R*: ' || Cur_InOut.DocumentNo || ') ' || 
COALESCE(TO_CHAR(Cur_InOut.Description), ''), 'N', Cur_InOut.MovementType, 
Cur_InOut.MovementDate,
   Cur_InOut.DateAcct, Cur_InOut.C_BPartner_ID, 
Cur_InOut.C_BPartner_Location_ID, Cur_InOut.AD_User_ID,
   Cur_InOut.M_Warehouse_ID, Cur_InOut.POReference, 
Cur_InOut.DateOrdered, Cur_InOut.DeliveryRule,
   

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/2a89a27e0ed1
changeset: 15061:2a89a27e0ed1
user:  David Baz Fayos david.baz at openbravo.com
date:  Fri Dec 30 19:51:57 2011 +0100
summary:   [email] fixed JS errors

details:   https://code.openbravo.com/erp/devel/pi/rev/d895851f84c2
changeset: 15062:d895851f84c2
user:  David Baz Fayos david.baz at openbravo.com
date:  Fri Dec 30 21:49:17 2011 +0100
summary:   [email] fixed style problems

details:   https://code.openbravo.com/erp/devel/pi/rev/da9ac3c4fcbe
changeset: 15063:da9ac3c4fcbe
user:  David Baz Fayos david.baz at openbravo.com
date:  Mon Jan 02 13:31:03 2012 +0100
summary:   [email] Fixed issue 19344: Added more audit capabilities

details:   https://code.openbravo.com/erp/devel/pi/rev/f8a00d1435e7
changeset: 15064:f8a00d1435e7
user:  David Baz Fayos david.baz at openbravo.com
date:  Tue Jan 03 21:28:22 2012 +0100
summary:   Merge from pi

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  
   |   2 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   4 +-
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml   
   |   2 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   8 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
  |   2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   2 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml   
   |   2 +-
 
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   6 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml 
   |   2 +-
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   4 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml 
  |   2 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   2 +-
 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml  
   |   2 +-
 
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
|   2 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |  10 +-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   4 +-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |   2 +-
 modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
   |   2 +-
 
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|   2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
 |   2 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  |  12 +-
 
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
|   2 +-
 
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
 |   2 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
  |   2 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
   |   6 +-
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/54a304b3a7ab
changeset: 14837:54a304b3a7ab
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Thu Nov 24 11:47:05 2011 +0100
summary:   fixed bug 18561: Time reference showed incorrectly in Process 
Request window

Setting isc.DataSource.serializeTimeAsDatetime=true so time references are sent 
as complete
UTC date time rather than just truncating timezone information.

Formatting it properly in the FIC response.

details:   https://code.openbravo.com/erp/devel/pi/rev/a9240f520945
changeset: 14838:a9240f520945
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Thu Dec 01 10:09:16 2011 +0100
summary:   fixed bug 19158: Incorrect processes are not failing in smartbuild
  -smartbuild detects now processes not in menu
  -new build validation complains about Standard UI processes without java

details:   https://code.openbravo.com/erp/devel/pi/rev/f5b8096eafc0
changeset: 14839:f5b8096eafc0
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Thu Dec 01 10:34:43 2011 +0100
summary:   fixed bug 11541: Defer button in registration popup has no identifier

details:   https://code.openbravo.com/erp/devel/pi/rev/27caa9812cd1
changeset: 14840:27caa9812cd1
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Thu Dec 01 10:54:12 2011 +0100
summary:   fixed bug 19111: Filters in query widgets shouldn't be shown in 
workspace

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
 |  18 ++-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
  |   3 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TimeUIDefinition.java
|  12 +
 
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
|  11 ++--
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java
   |  11 +
 
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
   |   2 +
 src-wad/src/org/openbravo/wad/ActionButton_Relation_data.xsql  
|   2 -
 src-wad/src/org/openbravo/wad/validation/WADValidationResult.java  
|   3 +-
 src-wad/src/org/openbravo/wad/validation/WADValidator.java 
|  18 
 src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql
|  22 ++
 src/org/openbravo/erpCommon/ad_forms/Heartbeat.html
|   1 +
 11 files changed, 80 insertions(+), 23 deletions(-)

diffs (237 lines):

diff -r 516b2ef77059 -r 27caa9812cd1 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
Fri Dec 09 20:49:26 2011 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
Thu Dec 01 10:54:12 2011 +0100
@@ -30,16 +30,26 @@
   shortTimeFormat: 'HH:MM:SS',
   long24TimeFormat: 'HH:MM:SS',
   longTimeFormat: 'HH:MM:SS',
+ 
   
   // make sure that the undo/save buttons get enabled, needs to be done like
-  // this because changeOnKeypress is false
+  // this because changeOnKeypress is false. Activating changeOnKeypress makes 
the
+  // item not editable as it is reformatted on keyStroke, the same happens 
calling
+  // from this method form.itemChangeActions
   keyPress: function(item, form, keyName, characterValue){
+var i, f = this.form,
+toolBarButtons = f.view.toolBar.leftMembers;
+
 if (characterValue || keyName === 'Backspace' || keyName === 'Delete') {
-  if (this.form.itemChangeActions) {
-this.form.itemChangeActions();
+  f.setHasChanged(true);
+  f.view.messageBar.hide();
+  for (i = 0; i  toolBarButtons.leftMembers.length; i++) {
+if (toolBarButtons.leftMembers[i].updateState) {
+  toolBarButtons.leftMembers[i].updateState();
+}
   }
 }
-return this.Super('keyPress', arguments);
+   this.Super('keyPress', arguments);
   }
 });
 
diff -r 516b2ef77059 -r 27caa9812cd1 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
 Fri Dec 09 20:49:26 2011 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
 Thu Dec 01 10:54:12 2011 +0100
@@ -899,7 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/b92d77dfa7d3
changeset: 14366:b92d77dfa7d3
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Mon Nov 21 09:38:04 2011 +0100
summary:   Fixes issue 18752: FIN_AddPayment - savePayment method
not managing properly exceptions.

details:   https://code.openbravo.com/erp/devel/pi/rev/45ee9420aa7b
changeset: 14367:45ee9420aa7b
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Tue Nov 22 11:54:06 2011 +0100
summary:   Fixes issue 18612: Assets - create amortization process
not calculating properly percetages/amounts.

details:   https://code.openbravo.com/erp/devel/pi/rev/e3c5594a2f2f
changeset: 14368:e3c5594a2f2f
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Wed Nov 23 13:34:12 2011 +0100
summary:   Fixes issue 18542: Asset: The currency can be updated
in the main tab while the Asset Amortization is already created.

details:   https://code.openbravo.com/erp/devel/pi/rev/26cf9de39021
changeset: 14369:26cf9de39021
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Wed Nov 23 13:35:29 2011 +0100
summary:   Fixes issue 18725: Business partner selector in Purchasing Plan
is filtering by customers by default.

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
 |  65 -
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
|   6 +-
 src-db/database/model/functions/A_ASSET_POST.xml   
  |   2 +-
 src-db/database/sourcedata/AD_AUXILIARINPUT.xml
  |  11 +
 src-db/database/sourcedata/AD_COLUMN.xml   
  |   1 +
 src-db/database/sourcedata/AD_WINDOW.xml   
  |   2 +-
 6 files changed, 49 insertions(+), 38 deletions(-)

diffs (151 lines):

diff -r 039b15326db9 -r 26cf9de39021 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
  Thu Nov 24 00:36:22 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
  Wed Nov 23 13:35:29 2011 +0100
@@ -219,45 +219,40 @@
 
 if (strAction.equals(PRP) || strAction.equals(PPP) || 
strAction.equals(PRD)
 || strAction.equals(PPW)) {
-  try {
-message = FIN_AddPayment.processPayment(vars, this,
-(strAction.equals(PRP) || strAction.equals(PPP)) ? P : 
D, payment);
-String strNewPaymentMessage = Utility.parseTranslation(this, vars, 
vars.getLanguage(),
-@PaymentCreated@ +   + payment.getDocumentNo()) + .;
-message.setMessage(strNewPaymentMessage +   + 
message.getMessage());
-if (strDifferenceAction.equals(refund)) {
-  Boolean newPayment = 
!payment.getFINPaymentDetailList().isEmpty();
-  FIN_Payment refundPayment = 
FIN_AddPayment.createRefundPayment(this, vars, payment,
-  refundAmount.negate(), exchangeRate);
-  OBError auxMessage = FIN_AddPayment.processPayment(vars, this,
-  (strAction.equals(PRP) || strAction.equals(PPP)) ? P : 
D, refundPayment);
-  if (newPayment) {
-final String strNewRefundPaymentMessage = 
Utility.parseTranslation(this, vars,
-vars.getLanguage(),
-@APRM_RefundPayment@ + :  + 
refundPayment.getDocumentNo())
-+ .;
-message.setMessage(strNewRefundPaymentMessage +   + 
message.getMessage());
-if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) != 
0) {
-  payment.setDescription(payment.getDescription() + 
strNewRefundPaymentMessage
-  + \n);
-  OBDal.getInstance().save(payment);
-  OBDal.getInstance().flush();
-}
-  } else {
-message = auxMessage;
+
+  message = FIN_AddPayment.processPayment(vars, this,
+  (strAction.equals(PRP) || strAction.equals(PPP)) ? P : 
D, payment);
+  String strNewPaymentMessage = Utility.parseTranslation(this, vars, 
vars.getLanguage(),
+  @PaymentCreated@ +   + payment.getDocumentNo()) + .;
+  message.setMessage(strNewPaymentMessage +   + 
message.getMessage());
+  if (strDifferenceAction.equals(refund)) {
+Boolean newPayment = !payment.getFINPaymentDetailList().isEmpty();
+FIN_Payment refundPayment = 
FIN_AddPayment.createRefundPayment(this, vars, payment,
+refundAmount.negate(), 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/b73666f4a286
changeset: 14244:b73666f4a286
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon Nov 14 15:29:09 2011 +0100
summary:   Added AD_ELement.isGlossary for wiki doc

details:   https://code.openbravo.com/erp/devel/pi/rev/412c47a296fc
changeset: 14245:412c47a296fc
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon Nov 14 15:29:32 2011 +0100
summary:   AD_ELement.isGlossary defaulted to N

details:   https://code.openbravo.com/erp/devel/pi/rev/a9512eab94be
changeset: 14246:a9512eab94be
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon Nov 14 15:29:38 2011 +0100
summary:   AD_ELement.isGlossary defaulted to N

details:   https://code.openbravo.com/erp/devel/pi/rev/538dbb30856a
changeset: 14247:538dbb30856a
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon Nov 14 15:40:16 2011 +0100
summary:   AD_ELement.isGlossary defaulted to N

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml 
|41 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
 |22 +
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_ELEMENT.xml
  | 6 +
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml  
|10 +
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml
|27 +
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_ELEMENT.xml
   |34 +
 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_ELEMENT.xml 
| 9 +
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_ELEMENT.xml
 | 5 +
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_ELEMENT.xml
 | 2 +
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_ELEMENT.xml
 | 2 +
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_ELEMENT.xml
 |25 +
 src-db/database/model/functions/AD_SYNCHRONIZE.xml 
| 4 +-
 src-db/database/model/tables/AD_ELEMENT.xml
| 4 +
 src-db/database/sourcedata/AD_COLUMN.xml   
|37 +
 src-db/database/sourcedata/AD_ELEMENT.xml  
|  2042 ++
 src-db/database/sourcedata/AD_FIELD.xml
|43 +-
 16 files changed, 2305 insertions(+), 8 deletions(-)

diffs (truncated from 17907 to 300 lines):

diff -r 538d7ee6ec93 -r 538dbb30856a 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
Sat Nov 12 23:33:26 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
Mon Nov 14 15:40:16 2011 +0100
@@ -9,6 +9,7 @@
 !--093017D15DE649259C329641ADC41321--  
NAME![CDATA[FIN_Finacc_Transaction_Acct_ID]]/NAME
 !--093017D15DE649259C329641ADC41321--  
PRINTNAME![CDATA[FIN_Finacc_Transaction_Acct_ID]]/PRINTNAME
 !--093017D15DE649259C329641ADC41321--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
+!--093017D15DE649259C329641ADC41321--  ISGLOSSARY![CDATA[N]]/ISGLOSSARY
 !--093017D15DE649259C329641ADC41321--/AD_ELEMENT
 
 !--36C60E53F1274EDA827ED5146A2B13D1--AD_ELEMENT
@@ -20,6 +21,7 @@
 !--36C60E53F1274EDA827ED5146A2B13D1--  NAME![CDATA[Process 
Proposal]]/NAME
 !--36C60E53F1274EDA827ED5146A2B13D1--  PRINTNAME![CDATA[Process 
Proposal]]/PRINTNAME
 !--36C60E53F1274EDA827ED5146A2B13D1--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
+!--36C60E53F1274EDA827ED5146A2B13D1--  ISGLOSSARY![CDATA[N]]/ISGLOSSARY
 !--36C60E53F1274EDA827ED5146A2B13D1--/AD_ELEMENT
 
 !--4AC57284C5C745EB9087C105222EDF02--AD_ELEMENT
@@ -31,6 +33,7 @@
 !--4AC57284C5C745EB9087C105222EDF02--  
NAME![CDATA[APRM_Rec_Detail_V_ID]]/NAME
 !--4AC57284C5C745EB9087C105222EDF02--  
PRINTNAME![CDATA[APRM_Rec_Detail_V_ID]]/PRINTNAME
 !--4AC57284C5C745EB9087C105222EDF02--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
+!--4AC57284C5C745EB9087C105222EDF02--  ISGLOSSARY![CDATA[N]]/ISGLOSSARY
 !--4AC57284C5C745EB9087C105222EDF02--/AD_ELEMENT
 
 !--6037A140C2664B6991BFD4EC7561A662--AD_ELEMENT
@@ -42,6 +45,7 @@
 !--6037A140C2664B6991BFD4EC7561A662--  
NAME![CDATA[Aprm_Finacc_Trx_Full_Acct_V_ID]]/NAME
 !--6037A140C2664B6991BFD4EC7561A662--  
PRINTNAME![CDATA[Aprm_Finacc_Trx_Full_Acct_V_ID]]/PRINTNAME
 !--6037A140C2664B6991BFD4EC7561A662--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
+!--6037A140C2664B6991BFD4EC7561A662--  ISGLOSSARY![CDATA[N]]/ISGLOSSARY
 !--6037A140C2664B6991BFD4EC7561A662--/AD_ELEMENT
 
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/103c7719b601
changeset: 14077:103c7719b601
user:  Iván Perdomo ivan.perdomo at openbravo.com
date:  Mon Oct 24 23:16:22 2011 +0200
summary:   Issue 18781: Annotate source code with available globals

details:   https://code.openbravo.com/erp/devel/pi/rev/fc3f17718283
changeset: 14078:fc3f17718283
user:  Iván Perdomo ivan.perdomo at openbravo.com
date:  Mon Oct 24 23:17:12 2011 +0200
summary:   Issue 18781: Annotate the source code with available globals

details:   https://code.openbravo.com/erp/devel/pi/rev/b249bed2371e
changeset: 14079:b249bed2371e
user:  Iván Perdomo ivan.perdomo at openbravo.com
date:  Mon Oct 24 23:20:02 2011 +0200
summary:   Issue 18781: Fixes use of undeclared variables

details:   https://code.openbravo.com/erp/devel/pi/rev/62ad106caee5
changeset: 14080:62ad106caee5
user:  Iván Perdomo ivan.perdomo at openbravo.com
date:  Mon Oct 24 23:21:34 2011 +0200
summary:   Issue 18781: Enabled the detection of undeclared variables

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
 |  4 ++--
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
|  2 +-
 modules/org.openbravo.client.kernel/jslint/jslint  
  |  9 -
 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js
   |  2 ++
 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-link-widget.js
  |  2 ++
 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
   |  2 ++
 6 files changed, 17 insertions(+), 4 deletions(-)

diffs (75 lines):

diff -r 9ff50adb99e5 -r 62ad106caee5 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
  Mon Oct 24 17:36:40 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
  Mon Oct 24 23:21:34 2011 +0200
@@ -217,7 +217,7 @@
   setUnloadEventHandling: function(){
 var me = this;
 if (document.layers) {
-  document.captureEvents(Event.UNLOAD);
+  document.captureEvents(isc.Event.UNLOAD);
 }
 window.onunload = function(){
   if (isc.OBSearchItem.openedWindow) {
@@ -230,7 +230,7 @@
   
   clearUnloadEventHandling: function(){
 if (document.layers) {
-  window.releaseEvents(Event.UNLOAD);
+  window.releaseEvents(isc.Event.UNLOAD);
 }
 window.onunload = function(){
 };
diff -r 9ff50adb99e5 -r 62ad106caee5 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
 Mon Oct 24 17:36:40 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
 Mon Oct 24 23:21:34 2011 +0200
@@ -97,7 +97,7 @@
   
   getStatusBarFields: function() {
 var statusBarFields = [[],[],[],[],[], []], i, item, title, refColumnName, 
targetEntity, value, displayedValue,
-  length = this.statusBarFields.length;
+  length = this.statusBarFields.length, sourceWindowId;
 for(i = 0; i  length; i++) {
   item = this.getItem(this.statusBarFields[i]);
   title = item.getTitle();
diff -r 9ff50adb99e5 -r 62ad106caee5 
modules/org.openbravo.client.kernel/jslint/jslint
--- a/modules/org.openbravo.client.kernel/jslint/jslint Mon Oct 24 17:36:40 
2011 +0200
+++ b/modules/org.openbravo.client.kernel/jslint/jslint Mon Oct 24 23:21:34 
2011 +0200
@@ -1,3 +1,10 @@
 #!/bin/sh
+
+# --browser doesn't work properly in jslint4java 1.4.7
+# adding the global available functions manually: window, unscape, top, alert
+# adding globals present in qunit: ok, test, module, expect, same, stop, 
start, equals, asyncTest
+
 echo Checking -- $@
-java -jar 
./modules/org.openbravo.client.kernel/lib/runtime/jslint4java-1.4.7.jar 
--browser --evil --continue $@
+java -jar 
./modules/org.openbravo.client.kernel/lib/runtime/jslint4java-1.4.7.jar \
+ --browser --evil --continue --undef \
+ --predef 
window,unescape,top,alert,isc,OB,ok,test,module,expect,same,stop,start,asyncTest,equals
 $@
diff -r 9ff50adb99e5 -r 62ad106caee5 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js
--- 
a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js
Mon Oct 24 17:36:40 2011 +0200
+++ 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/c101c7b3b408
changeset: 13782:c101c7b3b408
user:  Martin Taal martin.taal at openbravo.com
date:  Sat Sep 17 16:48:11 2011 +0200
summary:   Set newUI when generating static resource component

details:   https://code.openbravo.com/erp/devel/pi/rev/103957c0f0ad
changeset: 13783:103957c0f0ad
user:  Martin Taal martin.taal at openbravo.com
date:  Sat Sep 17 16:48:32 2011 +0200
summary:   Prevent setting OBContext in session when it already was set

details:   https://code.openbravo.com/erp/devel/pi/rev/b76178797a94
changeset: 13784:b76178797a94
user:  Martin Taal martin.taal at openbravo.com
date:  Sat Sep 17 16:48:59 2011 +0200
summary:   Prevent re-initializing session and OBContext many times for each 
request

details:   https://code.openbravo.com/erp/devel/pi/rev/d239a25a825d
changeset: 13785:d239a25a825d
user:  Martin Taal martin.taal at openbravo.com
date:  Sat Sep 17 16:55:54 2011 +0200
summary:   Added comments in the code, to prevent later mistake with logging 
in/re-inits for each request

diffstat:

 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
 |  5 +++--
 src/org/openbravo/base/secureApp/HttpSecureAppServlet.java 
  |  8 +++-
 src/org/openbravo/base/secureApp/LoginUtils.java   
  |  3 +++
 src/org/openbravo/dal/core/OBContext.java  
  |  5 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diffs (85 lines):

diff -r b1fde682e407 -r d239a25a825d 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
--- 
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
  Sat Sep 17 11:07:37 2011 +0200
+++ 
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
  Sat Sep 17 16:55:54 2011 +0200
@@ -100,11 +100,12 @@
   KernelConstants.MODE_PARAMETER_300);
 
   if (!classicMode) {
+// set in the session that we are looking at the new ui
 // note injecting the HttpSession through Weld does not work
 // as it will instantiate one of the subclasses of HttpSession
 // defined in the RequestContext
-((HttpSession) 
getParameters().get(KernelConstants.HTTP_SESSION)).setAttribute(
-#Hide_BackButton.toUpperCase(), true);
+final HttpSession session = (HttpSession) 
getParameters().get(KernelConstants.HTTP_SESSION);
+session.setAttribute(#Hide_BackButton.toUpperCase(), true);
 OBContext.getOBContext().setNewUI(true);
   }
 
diff -r b1fde682e407 -r d239a25a825d 
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.javaSat Sep 
17 11:07:37 2011 +0200
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.javaSat Sep 
17 16:55:54 2011 +0200
@@ -121,6 +121,8 @@
   setSessionValue(reqHistory.command + sufix, strCommand);
 }
 
+// Note, see LoginUtils.fillSessionArguments which sets the loggingIn
+// session var to N explicitly
 public boolean isLoggingIn() {
   return loggingIn == null || loggingIn.equals() || 
loggingIn.equals(Y);
 }
@@ -235,6 +237,8 @@
 
   boolean loggedOK = false;
 
+  // NOTE !isLoggingIn assumes that the value of LoggingIn is N, this
+  // is done by the fillSessionArguments below
   if (!variables.isLoggingIn()) {
 // log in process is completed, check whether the session in db is 
still active
 loggedOK = SeguridadData.loggedOK(this, variables.getDBSession());
@@ -302,6 +306,9 @@
   }
 
   final VariablesSecureApp vars = new VariablesSecureApp(request, 
false);
+
+  // note fill session arguments will set the LOGGINGIN session var
+  // to N
   if (LoginUtils.fillSessionArguments(this, vars, strUserAuth, 
strLanguage, strIsRTL,
   strRole, strClient, strOrg, strWarehouse)) {
 readProperties(vars, 
globalParameters.getOpenbravoPropertiesPath());
@@ -313,7 +320,6 @@
 logout(request, response);
 return;
   }
-  variables.removeSessionValue(#LOGGINGIN);
 } else {
   variables.updateHistory(request);
 }
diff -r b1fde682e407 -r d239a25a825d 
src/org/openbravo/base/secureApp/LoginUtils.java
--- a/src/org/openbravo/base/secureApp/LoginUtils.java  Sat Sep 17 11:07:37 
2011 +0200
+++ b/src/org/openbravo/base/secureApp/LoginUtils.java  Sat Sep 17 16:55:54 
2011 +0200
@@ -309,6 +309,9 @@
 }
 
 // Login process if finished, set the flag as not logging in
+// this flag may not be removed from the session, it must be set
+// to N to prevent re-initializing the session continuously
+// See the HttpSecureAppServlet
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/50656a45e834
changeset: 13505:50656a45e834
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Aug 11 14:38:23 2011 +0200
summary:   Added OBBaseView to reflect the View api

details:   https://code.openbravo.com/erp/devel/pi/rev/b4cea573f46c
changeset: 13506:b4cea573f46c
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Aug 11 14:39:41 2011 +0200
summary:   Prevent NPE when having a non-window view

details:   https://code.openbravo.com/erp/devel/pi/rev/3f480d2257f5
changeset: 13507:3f480d2257f5
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Aug 11 14:40:11 2011 +0200
summary:   Solved issues which prevented passing of menu parameters to viewY

details:   https://code.openbravo.com/erp/devel/pi/rev/01e4fbd5a96b
changeset: 13508:01e4fbd5a96b
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Aug 11 14:40:31 2011 +0200
summary:   Small change in sequence number of menu item

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
 |   2 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java
|   5 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-base-view.js
   |  81 ++
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js
  |   5 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js
  |   4 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TREENODE.xml 
 |   2 +-
 6 files changed, 95 insertions(+), 4 deletions(-)

diffs (174 lines):

diff -r 34be4ea6c46f -r 01e4fbd5a96b 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
   Thu Aug 11 14:37:18 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
   Thu Aug 11 14:40:31 2011 +0200
@@ -182,6 +182,8 @@
 globalResources.add(createStaticResource(
 web/org.openbravo.client.application/js/main/ob-standard-view.js, 
false));
 globalResources.add(createStaticResource(
+web/org.openbravo.client.application/js/main/ob-base-view.js, 
false));
+globalResources.add(createStaticResource(
 
web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js, 
false));
 globalResources.add(createStaticResource(
 web/org.openbravo.client.application/js/form/ob-view-form-notes.js, 
false));
diff -r 34be4ea6c46f -r 01e4fbd5a96b 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java
  Thu Aug 11 14:37:18 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java
  Thu Aug 11 14:40:31 2011 +0200
@@ -169,13 +169,16 @@
 return etag + _ + getViewVersionHash();
   }
 
-  synchronized private String getViewVersionHash() {
+  private synchronized String getViewVersionHash() {
 String viewVersionHash = ;
 String viewVersions = ;
 final String viewId = getParameter(viewId);
 OBContext.setAdminMode();
 try {
   Window window = OBDal.getInstance().get(Window.class, 
correctViewId(viewId));
+  if (window == null) {
+return viewVersionHash;
+  }
   for (Tab t : window.getADTabList()) {
 viewVersions += t.getTable().isFullyAudited() + |;
   }
diff -r 34be4ea6c46f -r 01e4fbd5a96b 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-base-view.js
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-base-view.js
 Thu Aug 11 14:40:31 2011 +0200
@@ -0,0 +1,81 @@
+/*
+ *
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  License),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use. this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an AS IS
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/6ca5f8714dc6
changeset: 13457:6ca5f8714dc6
user:  David Baz Fayos david.baz at openbravo.com
date:  Mon Aug 08 13:19:58 2011 +0200
summary:   Fixed issue 18222: Rewritten message for 
org.openbravo.client.application

details:   https://code.openbravo.com/erp/devel/pi/rev/562f9c1adfdf
changeset: 13458:562f9c1adfdf
user:  David Baz Fayos david.baz at openbravo.com
date:  Mon Aug 08 13:20:20 2011 +0200
summary:   Fixed issue 18222: Rewritten message for org.openbravo.client.myob

details:   https://code.openbravo.com/erp/devel/pi/rev/b0f17c42fcaf
changeset: 13459:b0f17c42fcaf
user:  David Baz Fayos david.baz at openbravo.com
date:  Mon Aug 08 13:20:58 2011 +0200
summary:   Fixed issue 18222: Rewritten message for 
org.openbravo.client.querylist

details:   https://code.openbravo.com/erp/devel/pi/rev/7388c6aaf4b0
changeset: 13460:7388c6aaf4b0
user:  David Baz Fayos david.baz at openbravo.com
date:  Mon Aug 08 13:24:08 2011 +0200
summary:   Fixed issue 18222: Rewritten message for 
org.openbravo.service.integration.google

diffstat:

 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
 |  4 ++--
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml
|  2 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MESSAGE.xml
   |  2 +-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml
 |  2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r 7f1656a76895 -r 7388c6aaf4b0 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
--- 
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Aug 08 12:50:37 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Aug 08 13:24:08 2011 +0200
@@ -1362,7 +1362,7 @@
 !--FF80808130DC55FE0130DC9631A60019--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--FF80808130DC55FE0130DC9631A60019--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--FF80808130DC55FE0130DC9631A60019--  
VALUE![CDATA[OBUIAPP_ActivateMessage]]/VALUE
-!--FF80808130DC55FE0130DC9631A60019--  MSGTEXT![CDATA[Only Professional 
and Basic Edition subscribers can %0. a target=_blank 
href=http://www.openbravo.com/product/erp/editions/;Learn more/a about the 
benefits of Openbravo's commercial editions.]]/MSGTEXT
+!--FF80808130DC55FE0130DC9631A60019--  MSGTEXT![CDATA[%0 only available 
for Professional and Basic Edition subscribers. a target=_blank 
href=http://www.openbravo.com/product/erp/editions/;Learn more/a about the 
benefits of Openbravo's Professional and Basic Editions.]]/MSGTEXT
 !--FF80808130DC55FE0130DC9631A60019--  MSGTIP![CDATA[%0 is a place-holder 
used to show a feature description]]/MSGTIP
 !--FF80808130DC55FE0130DC9631A60019--  MSGTYPE![CDATA[I]]/MSGTYPE
 !--FF80808130DC55FE0130DC9631A60019--  
AD_MODULE_ID![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]/AD_MODULE_ID
@@ -1473,7 +1473,7 @@
 !--FF8080813198F7290131995F17A8004E--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--FF8080813198F7290131995F17A8004E--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--FF8080813198F7290131995F17A8004E--  
VALUE![CDATA[OBUIAPP_ActivateMessagePersonalization]]/VALUE
-!--FF8080813198F7290131995F17A8004E--  MSGTEXT![CDATA[use a 
href=http://wiki.openbravo.com/wiki/User_Manual/Window_Personalization; 
target=_blankWindow Personalization/a]]/MSGTEXT
+!--FF8080813198F7290131995F17A8004E--  MSGTEXT![CDATA[a 
href=http://wiki.openbravo.com/wiki/User_Manual/Window_Personalization; 
target=_blankWindow Personalization/a is a Premium Feature]]/MSGTEXT
 !--FF8080813198F7290131995F17A8004E--  MSGTYPE![CDATA[I]]/MSGTYPE
 !--FF8080813198F7290131995F17A8004E--  
AD_MODULE_ID![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]/AD_MODULE_ID
 !--FF8080813198F7290131995F17A8004E--/AD_MESSAGE
diff -r 7f1656a76895 -r 7388c6aaf4b0 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml
--- 
a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml   
Mon Aug 08 12:50:37 2011 +0200
+++ 
b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml   
Mon Aug 08 13:24:08 2011 +0200
@@ -141,7 +141,7 @@
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  
VALUE![CDATA[OBKMO_ActivateMessage]]/VALUE
-!--4D4433A442EB4F0C8DF2F2A57A8BBE31--  MSGTEXT![CDATA[to delete this 
widget]]/MSGTEXT
+!--4D4433A442EB4F0C8DF2F2A57A8BBE31--  MSGTEXT![CDATA[This widget removal 
capability is]]/MSGTEXT
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  MSGTYPE![CDATA[I]]/MSGTYPE
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  
AD_MODULE_ID![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]/AD_MODULE_ID
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--/AD_MESSAGE
diff -r 7f1656a76895 -r 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/bd81eb1ac9a5
changeset: 13440:bd81eb1ac9a5
user:  Iván Perdomo ivan.perdomo at openbravo.com
date:  Fri Aug 05 12:58:06 2011 +0200
summary:   Use common premium functionality message

details:   https://code.openbravo.com/erp/devel/pi/rev/89375137ecd1
changeset: 13441:89375137ecd1
user:  Iván Perdomo ivan.perdomo at openbravo.com
date:  Fri Aug 05 12:59:04 2011 +0200
summary:   Use common base premium functionality message - Part II

details:   https://code.openbravo.com/erp/devel/pi/rev/9a862a92d22f
changeset: 13442:9a862a92d22f
user:  Iván Perdomo ivan.perdomo at openbravo.com
date:  Fri Aug 05 13:00:06 2011 +0200
summary:   Use common base message for premium functionality - Part III

details:   https://code.openbravo.com/erp/devel/pi/rev/7e1aea78244f
changeset: 13443:7e1aea78244f
user:  Iván Perdomo ivan.perdomo at openbravo.com
date:  Fri Aug 05 13:00:46 2011 +0200
summary:   Use common base message for premium functionality - Part IV

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js
 |  14 +---
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml
|   2 +-
 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js
 |  18 +
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MESSAGE.xml
   |  11 +++
 
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
|  31 +++--
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml
 |   2 +-
 
modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java
   |   9 +-
 7 files changed, 37 insertions(+), 50 deletions(-)

diffs (171 lines):

diff -r 2f3439ca07ae -r 7e1aea78244f 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js
Fri Aug 05 12:32:56 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js
Fri Aug 05 13:00:46 2011 +0200
@@ -24,21 +24,11 @@
   
   var personalizationButtonProperties = {
 action: function() {
-  var tabIdentifier, personalizeForm,
-  activateButton = isc.addProperties({}, isc.Dialog.OK, {
-getTitle: function() {
-  return OB.I18N.getLabel('OBUIAPP_LearnMore');
-},
-click: function() {
-  this.topElement.cancelClick();
-  window.open('http://www.openbravo.com/product/erp/get-basic/');
-}});
-
   if(OB.Application.licenseType === 'C') {
-isc.confirm(OB.I18N.getLabel('OBUIAPP_ActivateMessage'), {
+isc.warn(OB.I18N.getLabel('OBUIAPP_ActivateMessage', 
[OB.I18N.getLabel('OBUIAPP_ActivateMessagePersonalization')]), {
 isModal: true,
 showModalMask: true,
-toolbarButtons: [activateButton, isc.Dialog.CANCEL]
+toolbarButtons: [isc.Dialog.OK]
 });
 return;
   }
diff -r 2f3439ca07ae -r 7e1aea78244f 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml
--- 
a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml   
Fri Aug 05 12:32:56 2011 +0200
+++ 
b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml   
Fri Aug 05 13:00:46 2011 +0200
@@ -141,7 +141,7 @@
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  
VALUE![CDATA[OBKMO_ActivateMessage]]/VALUE
-!--4D4433A442EB4F0C8DF2F2A57A8BBE31--  MSGTEXT![CDATA[Only Professional 
and Basic Edition subscribers are allowed to delete this widget. The bLearn 
More/b button will show you how to activate your instance.]]/MSGTEXT
+!--4D4433A442EB4F0C8DF2F2A57A8BBE31--  MSGTEXT![CDATA[to delete this 
widget]]/MSGTEXT
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  MSGTYPE![CDATA[I]]/MSGTYPE
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--  
AD_MODULE_ID![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]/AD_MODULE_ID
 !--4D4433A442EB4F0C8DF2F2A57A8BBE31--/AD_MESSAGE
diff -r 2f3439ca07ae -r 7e1aea78244f 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js
--- 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/ef6e09f8f68d
changeset: 13368:ef6e09f8f68d
user:  Stefan Hühner stefan.huehner at openbravo.com
date:  Mon Aug 01 17:31:40 2011 +0200
summary:   [WidgetInForm] Allows placing of (workspace) widgets into a generatd 
window.
- new Base-Reference + uidefinition + formitem code
- Change widget baseclass to support functional differences between widget
  in workspace and in generated windows. As in generated window:
  - no dragging, no widget title, no menu

details:   https://code.openbravo.com/erp/devel/pi/rev/ef714224f3f7
changeset: 13369:ef714224f3f7
user:  Stefan Hühner stefan.huehner at openbravo.com
date:  Mon Aug 01 17:37:17 2011 +0200
summary:   [WidgetInForm] Change querylist-widgets for use in WidgetInForm
- disable height recalculation if widget displayed in a generated window
  as height is constraint by field layout
- Rewrite parameter handling of querylist
  - Do not pass widget instance id and read params from database
  - Instead pass current parameters from client to the backend on each
datasource request. This allows for runtime modificatin of parameter
values which is needed to allows widgets to use values of form fields
  - Note: Fixed parameters are handled by the backend as before
  - For each request evaluate all non-fixed parameters to allow usage of
${formValues.field} type expressions to connect to current record

details:   https://code.openbravo.com/erp/devel/pi/rev/06348d284aeb
changeset: 13370:06348d284aeb
user:  Stefan Hühner stefan.huehner at openbravo.com
date:  Mon Aug 01 17:38:24 2011 +0200
summary:   [WidgetInForm] re-evaluate src param on each refresh instead on only 
once
This allows usage of dynamic values in the url-widget when used inside a
generated window.

details:   https://code.openbravo.com/erp/devel/pi/rev/ffa95c0d6236
changeset: 13371:ffa95c0d6236
user:  Stefan Hühner stefan.huehner at openbravo.com
date:  Mon Aug 01 17:39:50 2011 +0200
summary:   [WidgetInForm] Refresh all WidgetInForm-fields in processFICreturn
This refreshes the widgets when data is received from the backend i.e. on new,
navigation, after a callout and also allows passing this new data to the widget
so it can be used in the widget parameters.

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
|8 +
 
modules/org.openbravo.client.myob/src-db/database/model/tables/OBKMO_WIDGET_REFERENCE.xml
|   59 +
 
modules/org.openbravo.client.myob/src-db/database/model/triggers/OBKMO_WIDGET_REFERENCE_MOD_TRG.xml
  |   70 ++
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml 
  |  338 ++
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET_TABLE.xml
|   14 +
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml
  |   13 +
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml  
  |  157 
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_REFERENCE.xml  
  |   16 +
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TAB.xml
  |   24 +
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TABLE.xml  
  |   20 +
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
|   13 +
 
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponentProvider.java
|2 +
 
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/widgetinform/WidgetInFormUIDefinition.java
   |   63 +
 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js
 |   60 +
 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-url-widget.js
  |3 +
 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js 
 |   23 +-
 
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
   |   53 +-
 
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
  |   21 +
 18 files changed, 929 insertions(+), 28 deletions(-)

diffs (truncated from 1239 to 300 lines):

diff -r 0951c9cfecef -r ffa95c0d6236 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
 Mon Aug 01 17:04:08 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
 Mon Aug 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/2fbae58b98c2
changeset: 13285:2fbae58b98c2
user:  Antonio Moreno antonio.moreno at openbravo.com
date:  Tue Jul 26 15:47:44 2011 +0200
summary:   [imageBLOB] Improved the color of the border and the background of 
the image control

details:   https://code.openbravo.com/erp/devel/pi/rev/bae98e2df3fa
changeset: 13286:bae98e2df3fa
user:  Antonio Moreno antonio.moreno at openbravo.com
date:  Tue Jul 26 15:57:57 2011 +0200
summary:   [imageBLOB] Improved algorithm to calculate dimensions of image popup

details:   https://code.openbravo.com/erp/devel/pi/rev/cc03c38f8a61
changeset: 13287:cc03c38f8a61
user:  Antonio Moreno antonio.moreno at openbravo.com
date:  Tue Jul 26 16:15:01 2011 +0200
summary:   [imageBLOB] Added cursor attribute to image

details:   https://code.openbravo.com/erp/devel/pi/rev/3f2583bb1884
changeset: 13288:3f2583bb1884
user:  Antonio Moreno antonio.moreno at openbravo.com
date:  Tue Jul 26 18:10:49 2011 +0200
summary:   [imageBLOB] Fixed issue 18082. Image size and mime type will be 
saved and reused to increase performance.

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java
   |   29 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
 |   24 +-
 src-db/database/model/tables/AD_IMAGE.xml  
 |   12 +
 src-db/database/sourcedata/AD_COLUMN.xml   
 |   93 ++
 src-db/database/sourcedata/AD_ELEMENT.xml  
 |   33 ++
 src/org/openbravo/erpCommon/info/ImageInfoBLOB.java
 |   11 +-
 src/org/openbravo/erpCommon/utility/ImageToDatabaseLoader.java 
 |4 +
 src/org/openbravo/erpCommon/utility/ShowImage.java 
 |   14 +-
 src/org/openbravo/erpCommon/utility/ShowImageLogo.java 
 |   22 +-
 src/org/openbravo/erpCommon/utility/Utility.java   
 |  153 +++--
 10 files changed, 342 insertions(+), 53 deletions(-)

diffs (truncated from 670 to 300 lines):

diff -r 2bec31b391ad -r 3f2583bb1884 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java
 Tue Jul 26 18:07:06 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java
 Tue Jul 26 18:10:49 2011 +0200
@@ -18,12 +18,8 @@
  */
 package org.openbravo.client.application.window;
 
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
 import java.util.Map;
 
-import javax.imageio.ImageIO;
-
 import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.model.Entity;
@@ -32,6 +28,8 @@
 import org.openbravo.client.kernel.BaseActionHandler;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.MimeTypeUtil;
+import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.datamodel.Table;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.ad.utility.Image;
@@ -80,10 +78,25 @@
 OBContext.setAdminMode();
 String imageID = (String) parameters.get(inpimageId);
 Image image = OBDal.getInstance().get(Image.class, imageID);
-ByteArrayInputStream bis = new 
ByteArrayInputStream(image.getBindaryData());
-BufferedImage rImage = ImageIO.read(bis);
-int width = rImage.getWidth();
-int height = rImage.getHeight();
+Long width;
+Long height;
+if (image.getHeight() == null || image.getWidth() == null) {
+  Long[] size = Utility.computeImageSize(image.getBindaryData());
+  width = size[0];
+  height = size[1];
+  image.setWidth(width);
+  image.setHeight(height);
+  OBDal.getInstance().save(image);
+  OBDal.getInstance().flush();
+} else {
+  width = image.getWidth();
+  height = image.getHeight();
+}
+if (image.getMimetype() == null) {
+  
image.setMimetype(MimeTypeUtil.getInstance().getMimeTypeName(image.getBindaryData()));
+  OBDal.getInstance().save(image);
+  OBDal.getInstance().flush();
+}
 JSONObject obj = new JSONObject();
 obj.put(width, width);
 obj.put(height, height);
diff -r 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/ae1ff625dc0f
changeset: 13161:ae1ff625dc0f
user:  Gorka Ion Damián gorkaion.damian at openbravo.com
date:  Fri Jul 15 10:04:47 2011 +0200
summary:   Fixed issue 17895.Adds accounting view for financial account.

details:   https://code.openbravo.com/erp/devel/pi/rev/03cffbd6c056
changeset: 13162:03cffbd6c056
user:  Gorka Ion Damián gorkaion.damian at openbravo.com
date:  Fri Jul 15 11:36:40 2011 +0200
summary:   Fixed issue 17898.Added accounting dimensions to GL Journal lines.

details:   https://code.openbravo.com/erp/devel/pi/rev/cc5c3490dc5b
changeset: 13163:cc5c3490dc5b
user:  Gorka Ion Damián gorkaion.damian at openbravo.com
date:  Fri Jul 15 11:48:55 2011 +0200
summary:   merge

details:   https://code.openbravo.com/erp/devel/pi/rev/5133dc2e3407
changeset: 13164:5133dc2e3407
user:  Gorka Ion Damián gorkaion.damian at openbravo.com
date:  Fri Jul 15 11:50:11 2011 +0200
summary:   merge

diffstat:

 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
 |16 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/AD_ORGINFO.xml
  | 9 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRX_FULL_ACCT_V.xml
  |26 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml  
   |  1697 +-
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml 
   |26 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml   
   |  1225 +++-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
  |14 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml 
  |24 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml 
   |34 +-
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml   
   |23 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
 | 7 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
|38 +
 src-db/database/model/tables/GL_JOURNALLINE.xml
   |50 +
 src-db/database/sourcedata/AD_COLUMN.xml   
   |   277 +-
 src-db/database/sourcedata/AD_FIELD.xml
   |   224 +-
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml   
   |77 +
 src/org/openbravo/erpCommon/ad_forms/DocLineGLJournal_data.xsql
   |11 +-
 17 files changed, 3760 insertions(+), 18 deletions(-)

diffs (truncated from 4537 to 300 lines):

diff -r 047e3c5c51ab -r 5133dc2e3407 
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
 Fri Jul 15 09:34:32 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
 Fri Jul 15 11:50:11 2011 +0200
@@ -47,6 +47,7 @@
 v_TotalLines NUMBER;
 v_PaymentMethod C_INVOICE.FIN_PAYMENTMETHOD_ID%TYPE;
 v_documentno C_INVOICE.DocumentNo%TYPE;
+v_poreference C_INVOICE.POReference%TYPE;
 v_project_id c_invoice.c_project_id%TYPE;
 v_campaign_id c_invoice.c_campaign_id%TYPE;
 v_activity_id c_invoice.c_activity_id%TYPE;
@@ -71,6 +72,7 @@
 v_finpayment_desc FIN_Payment.Description%TYPE;
 v_orderno_trl AD_Message.MsgText%TYPE;
 v_invoiceno_trl AD_Message.MsgText%TYPE;
+v_payment_desc AD_OrgInfo.em_aprm_payment_desc%TYPE;
 
 
 TYPE RECORD IS REF CURSOR;
@@ -107,12 +109,12 @@
   SELECT ad_client_id, ad_org_id, c_doctypetarget_id, IsSOTrx,
   grandtotal, C_PaymentTerm_ID, PaymentRule, C_Currency_ID,
   C_BPartner_ID, DateInvoiced, totallines, fin_paymentmethod_id,
-  fin_payment_priority_id, documentNo,
+  fin_payment_priority_id, documentNo, poreference,
   c_project_id, c_campaign_id, c_activity_id, user1_id, user2_id
   INTO v_Client_ID, v_Org_ID, v_DocTypeTarget_ID, v_IsSOTrx,
   v_GrandTotal, v_PaymentTerm, v_PaymentRule, v_Currency_ID,
   v_BPartner_ID, v_DateInvoiced, v_totallines, v_PaymentMethod,
-  v_PaymentPriority, v_documentno,
+  v_PaymentPriority, v_documentno, v_poreference,
   v_project_id, v_campaign_id, v_activity_id, v_user1, v_user2
   FROM c_invoice
   WHERE c_invoice_id=p_record_id;
@@ -501,6 +503,16 @@
   FROM C_BPARTNER
   WHERE C_BPARTNER_ID = v_BPartner_ID;
   IF(v_Financial_Account_ID IS NOT NULL) THEN
+

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/94bc85e2ea60
changeset: 13022:94bc85e2ea60
user:  Antonio Moreno antonio.moreno at openbravo.com
date:  Thu Jun 30 17:09:48 2011 +0200
summary:   Column headers in CSV file exported from querylist will have the 
correct quotes

details:   /erp/devel/pi/rev/45f722ed8b0e
changeset: 13023:45f722ed8b0e
user:  Antonio Moreno antonio.moreno at openbravo.com
date:  Thu Jun 30 17:10:35 2011 +0200
summary:   Related to issue 16948. Added capability to also translate the 
'Remove Formula Field' and 'Remove Summary Field' strings

details:   /erp/devel/pi/rev/e861861de87c
changeset: 13024:e861861de87c
user:  Antonio Moreno antonio.moreno at openbravo.com
date:  Thu Jun 30 17:42:36 2011 +0200
summary:   Related to issue 17789. Changed encoding of generated CSV files so 
that they work seamlessly with Excel

details:   /erp/devel/pi/rev/3dc747db65f2
changeset: 13025:3dc747db65f2
user:  Antonio Moreno antonio.moreno at openbravo.com
date:  Thu Jun 30 17:57:40 2011 +0200
summary:   Related to issue 17789. Changed encoding of generated CSV files so 
that they work seamlessly with Excel

diffstat:

 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
|   6 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MESSAGE.xml
   |  22 ++
 
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient-labels.js
 |   2 +
 3 files changed, 27 insertions(+), 3 deletions(-)

diffs (76 lines):

diff -r 0499ad7a934c -r 3dc747db65f2 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
--- 
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
  Thu Jun 30 17:53:54 2011 +0200
+++ 
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
  Thu Jun 30 17:57:40 2011 +0200
@@ -194,7 +194,7 @@
   exportAs = csv;
 }
 if (csv.equals(exportAs)) {
-  response.setContentType(text/csv; charset=UTF-8);
+  response.setContentType(text/csv; charset=iso-8859-1);
   response.setHeader(Content-Disposition, attachment; 
filename=ExportedData.csv);
   if (getDataSource(request) instanceof DefaultDataSourceService) {
 QueryJSONWriterToCSV writer = new QueryJSONWriterToCSV(request, 
response, parameters,
@@ -241,7 +241,7 @@
 MapString, String parameters, Entity entity) {
   try {
 OBContext.setAdminMode();
-response.setContentType(text/csv; charset=UTF-8);
+response.setContentType(text/csv; charset=iso-8859-1);
 response.setHeader(Content-Disposition, attachment; 
filename=ExportedData.csv);
 writer = response.getWriter();
 VariablesSecureApp vars = new VariablesSecureApp(request);
@@ -398,7 +398,7 @@
 writer.append(fieldSeparator);
   }
   keys.add(key);
-  writer.append(').append(key).append(');
+  writer.append(\).append(key).append(\);
 }
 propertiesWritten = true;
   } catch (Exception e) {
diff -r 0499ad7a934c -r 3dc747db65f2 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MESSAGE.xml
--- 
a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MESSAGE.xml
 Thu Jun 30 17:53:54 2011 +0200
+++ 
b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MESSAGE.xml
 Thu Jun 30 17:57:40 2011 +0200
@@ -682,6 +682,28 @@
 !--FF80808130D566F90130D57C35910012--  
AD_MODULE_ID![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]/AD_MODULE_ID
 !--FF80808130D566F90130D57C35910012--/AD_MESSAGE
 
+!--FF80808130E0E1230130E10F1BDA0009--AD_MESSAGE
+!--FF80808130E0E1230130E10F1BDA0009--  
AD_MESSAGE_ID![CDATA[FF80808130E0E1230130E10F1BDA0009]]/AD_MESSAGE_ID
+!--FF80808130E0E1230130E10F1BDA0009--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--FF80808130E0E1230130E10F1BDA0009--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--FF80808130E0E1230130E10F1BDA0009--  ISACTIVE![CDATA[Y]]/ISACTIVE
+!--FF80808130E0E1230130E10F1BDA0009--  
VALUE![CDATA[OBUISC_ListGrid.removeFormulaFieldText]]/VALUE
+!--FF80808130E0E1230130E10F1BDA0009--  MSGTEXT![CDATA[Remove Formula 
Field...]]/MSGTEXT
+!--FF80808130E0E1230130E10F1BDA0009--  MSGTYPE![CDATA[I]]/MSGTYPE
+!--FF80808130E0E1230130E10F1BDA0009--  
AD_MODULE_ID![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]/AD_MODULE_ID
+!--FF80808130E0E1230130E10F1BDA0009--/AD_MESSAGE
+
+!--FF80808130E0E1230130E10F67C5000F--AD_MESSAGE
+!--FF80808130E0E1230130E10F67C5000F--  
AD_MESSAGE_ID![CDATA[FF80808130E0E1230130E10F67C5000F]]/AD_MESSAGE_ID
+!--FF80808130E0E1230130E10F67C5000F--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--FF80808130E0E1230130E10F67C5000F--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--FF80808130E0E1230130E10F67C5000F--  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/c97e498c96f4
changeset: 12645:c97e498c96f4
user:  Pablo Sarobe pablo.sarobe at openbravo.com
date:  Wed Jun 01 11:42:36 2011 +0200
summary:   Fine tunning Business partner window without configscript applied

details:   /erp/devel/pi/rev/f72d7e6f6e17
changeset: 12646:f72d7e6f6e17
user:  Pablo Sarobe pablo.sarobe at openbravo.com
date:  Wed Jun 01 14:20:16 2011 +0200
summary:   Relocated fields for window Sales order

details:   /erp/devel/pi/rev/ee9e5c3b1e25
changeset: 12647:ee9e5c3b1e25
user:  Pablo Sarobe pablo.sarobe at openbravo.com
date:  Wed Jun 01 14:07:38 2011 +0200
summary:   Remove field group for warehouse field in Goods shipment

details:   /erp/devel/pi/rev/63c156053603
changeset: 12648:63c156053603
user:  Pablo Sarobe pablo.sarobe at openbravo.com
date:  Wed Jun 01 14:39:23 2011 +0200
summary:   Relocated fields in goods shipment

diffstat:

 modules/org.openbravo.v3/src-db/database/configScript.xml |4 -
 src-db/database/sourcedata/AD_FIELD.xml   |  111 ++---
 src-db/database/sourcedata/AD_TAB.xml |2 +-
 3 files changed, 53 insertions(+), 64 deletions(-)

diffs (truncated from 510 to 300 lines):

diff -r 2fe831f49373 -r 63c156053603 
modules/org.openbravo.v3/src-db/database/configScript.xml
--- a/modules/org.openbravo.v3/src-db/database/configScript.xml Wed Jun 01 
16:20:40 2011 +0200
+++ b/modules/org.openbravo.v3/src-db/database/configScript.xml Wed Jun 01 
14:39:23 2011 +0200
@@ -509,10 +509,6 @@
   oldValue![CDATA[Y]]/oldValue
   newValue![CDATA[N]]/newValue
 /columnDataChange
-columnDataChange tablename=AD_FIELD columnname=AD_FIELDGROUP_ID 
pkRow=2944
-  oldValue![CDATA[108]]/oldValue
-  newValue/
-/columnDataChange
 columnDataChange tablename=AD_FIELD columnname=ISDISPLAYED 
pkRow=2946
   oldValue![CDATA[Y]]/oldValue
   newValue![CDATA[N]]/newValue
diff -r 2fe831f49373 -r 63c156053603 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml   Wed Jun 01 16:20:40 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml   Wed Jun 01 14:39:23 2011 +0200
@@ -13410,7 +13410,7 @@
 !--1083--  
DISPLAYLOGIC![CDATA[@DocStatus@!'VO'@DocStatus@!'CL']]/DISPLAYLOGIC
 !--1083--  DISPLAYLENGTH![CDATA[23]]/DISPLAYLENGTH
 !--1083--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--1083--  SEQNO![CDATA[240]]/SEQNO
+!--1083--  SEQNO![CDATA[314]]/SEQNO
 !--1083--  ISSAMELINE![CDATA[N]]/ISSAMELINE
 !--1083--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--1083--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -13433,10 +13433,10 @@
 !--1084--  ISCENTRALLYMAINTAINED![CDATA[Y]]/ISCENTRALLYMAINTAINED
 !--1084--  AD_TAB_ID![CDATA[186]]/AD_TAB_ID
 !--1084--  AD_COLUMN_ID![CDATA[2172]]/AD_COLUMN_ID
-!--1084--  ISDISPLAYED![CDATA[Y]]/ISDISPLAYED
+!--1084--  ISDISPLAYED![CDATA[N]]/ISDISPLAYED
 !--1084--  DISPLAYLENGTH![CDATA[44]]/DISPLAYLENGTH
 !--1084--  ISREADONLY![CDATA[Y]]/ISREADONLY
-!--1084--  SEQNO![CDATA[250]]/SEQNO
+!--1084--  SEQNO![CDATA[315]]/SEQNO
 !--1084--  ISSAMELINE![CDATA[Y]]/ISSAMELINE
 !--1084--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--1084--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -13802,7 +13802,7 @@
 !--1107--  DISPLAYLOGIC![CDATA[@OrderType@='SO'  
@FreightCostRule@='F']]/DISPLAYLOGIC
 !--1107--  DISPLAYLENGTH![CDATA[10]]/DISPLAYLENGTH
 !--1107--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--1107--  SEQNO![CDATA[260]]/SEQNO
+!--1107--  SEQNO![CDATA[372]]/SEQNO
 !--1107--  ISSAMELINE![CDATA[Y]]/ISSAMELINE
 !--1107--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--1107--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -13829,7 +13829,7 @@
 !--1108--  DISPLAYLOGIC![CDATA[@OrderType@='SO' | @OrderType@='WP' | 
@OrderType@='PR' | @OrderType@='WR' | @OrderType@='WI']]/DISPLAYLOGIC
 !--1108--  DISPLAYLENGTH![CDATA[21]]/DISPLAYLENGTH
 !--1108--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--1108--  SEQNO![CDATA[270]]/SEQNO
+!--1108--  SEQNO![CDATA[317]]/SEQNO
 !--1108--  ISSAMELINE![CDATA[N]]/ISSAMELINE
 !--1108--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--1108--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -13856,7 +13856,7 @@
 !--1109--  DISPLAYLOGIC![CDATA[@DeliveryViaRule@='S'  (@OrderType@='SO' 
| @OrderType@='WP' | @OrderType@='PR' | @OrderType@='WR' | 
@OrderType@='WI')]]/DISPLAYLOGIC
 !--1109--  DISPLAYLENGTH![CDATA[44]]/DISPLAYLENGTH
 !--1109--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--1109--  SEQNO![CDATA[280]]/SEQNO
+!--1109--  SEQNO![CDATA[318]]/SEQNO
 !--1109--  ISSAMELINE![CDATA[Y]]/ISSAMELINE
 !--1109--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--1109--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -13883,7 +13883,7 @@
 !--1110--  DISPLAYLOGIC![CDATA[@OrderType@='SO' | 
@OrderType@='WP']]/DISPLAYLOGIC
 !--1110--  DISPLAYLENGTH![CDATA[21]]/DISPLAYLENGTH
 !--1110--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--1110--  SEQNO![CDATA[290]]/SEQNO
+!--1110--  SEQNO![CDATA[376]]/SEQNO
 !--1110--  ISSAMELINE![CDATA[Y]]/ISSAMELINE
 !--1110--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--1110--  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/e956239af002
changeset: 12667:e956239af002
user:  Pablo Sarobe pablo.sarobe at openbravo.com
date:  Wed Jun 01 20:53:25 2011 +0200
summary:   Recolated fields in purchase order without having the configscript 
applied

details:   /erp/devel/pi/rev/6dda30dcaf5f
changeset: 12668:6dda30dcaf5f
user:  Pablo Sarobe pablo.sarobe at openbravo.com
date:  Wed Jun 01 21:08:33 2011 +0200
summary:   Relocated fields in goods receipt without having applied the 
configscript

details:   /erp/devel/pi/rev/dfd9668a41d5
changeset: 12669:dfd9668a41d5
user:  Pablo Sarobe pablo.sarobe at openbravo.com
date:  Wed Jun 01 21:25:10 2011 +0200
summary:   Relocated fields in Purchase Invoice without having applied the 
configscript

details:   /erp/devel/pi/rev/edb6c469aba9
changeset: 12670:edb6c469aba9
user:  Pablo Sarobe pablo.sarobe at openbravo.com
date:  Thu Jun 02 00:27:17 2011 +0200
summary:   Fixes consistency configscript

diffstat:

 modules/org.openbravo.v3/src-db/database/configScript.xml |4 -
 src-db/database/sourcedata/AD_FIELD.xml   |  103 +++--
 2 files changed, 53 insertions(+), 54 deletions(-)

diffs (truncated from 479 to 300 lines):

diff -r 1fe85d718959 -r edb6c469aba9 
modules/org.openbravo.v3/src-db/database/configScript.xml
--- a/modules/org.openbravo.v3/src-db/database/configScript.xml Thu Jun 02 
00:21:41 2011 +0200
+++ b/modules/org.openbravo.v3/src-db/database/configScript.xml Thu Jun 02 
00:27:17 2011 +0200
@@ -609,10 +609,6 @@
   oldValue![CDATA[Y]]/oldValue
   newValue![CDATA[N]]/newValue
 /columnDataChange
-columnDataChange tablename=AD_FIELD columnname=ISDISPLAYED 
pkRow=3338
-  oldValue![CDATA[Y]]/oldValue
-  newValue![CDATA[N]]/newValue
-/columnDataChange
 columnDataChange tablename=AD_FIELD columnname=ISDISPLAYED 
pkRow=3346
   oldValue![CDATA[Y]]/oldValue
   newValue![CDATA[N]]/newValue
diff -r 1fe85d718959 -r edb6c469aba9 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml   Thu Jun 02 00:21:41 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml   Thu Jun 02 00:27:17 2011 +0200
@@ -38738,10 +38738,11 @@
 !--3324--  ISCENTRALLYMAINTAINED![CDATA[Y]]/ISCENTRALLYMAINTAINED
 !--3324--  AD_TAB_ID![CDATA[290]]/AD_TAB_ID
 !--3324--  AD_COLUMN_ID![CDATA[3513]]/AD_COLUMN_ID
+!--3324--  
AD_FIELDGROUP_ID![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]/AD_FIELDGROUP_ID
 !--3324--  ISDISPLAYED![CDATA[Y]]/ISDISPLAYED
 !--3324--  DISPLAYLENGTH![CDATA[44]]/DISPLAYLENGTH
 !--3324--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--3324--  SEQNO![CDATA[350]]/SEQNO
+!--3324--  SEQNO![CDATA[295]]/SEQNO
 !--3324--  ISSAMELINE![CDATA[N]]/ISSAMELINE
 !--3324--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--3324--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -38874,7 +38875,7 @@
 !--3329--  ISDISPLAYED![CDATA[Y]]/ISDISPLAYED
 !--3329--  DISPLAYLENGTH![CDATA[44]]/DISPLAYLENGTH
 !--3329--  ISREADONLY![CDATA[Y]]/ISREADONLY
-!--3329--  SEQNO![CDATA[370]]/SEQNO
+!--3329--  SEQNO![CDATA[334]]/SEQNO
 !--3329--  ISSAMELINE![CDATA[Y]]/ISSAMELINE
 !--3329--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--3329--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -38952,7 +38953,7 @@
 !--3332--  DISPLAYLOGIC![CDATA[@$Element_PJ@='Y']]/DISPLAYLOGIC
 !--3332--  DISPLAYLENGTH![CDATA[44]]/DISPLAYLENGTH
 !--3332--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--3332--  SEQNO![CDATA[380]]/SEQNO
+!--3332--  SEQNO![CDATA[312]]/SEQNO
 !--3332--  ISSAMELINE![CDATA[N]]/ISSAMELINE
 !--3332--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--3332--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -39113,7 +39114,7 @@
 !--3338--  ISCENTRALLYMAINTAINED![CDATA[Y]]/ISCENTRALLYMAINTAINED
 !--3338--  AD_TAB_ID![CDATA[290]]/AD_TAB_ID
 !--3338--  AD_COLUMN_ID![CDATA[3487]]/AD_COLUMN_ID
-!--3338--  ISDISPLAYED![CDATA[Y]]/ISDISPLAYED
+!--3338--  ISDISPLAYED![CDATA[N]]/ISDISPLAYED
 !--3338--  DISPLAYLENGTH![CDATA[1]]/DISPLAYLENGTH
 !--3338--  ISREADONLY![CDATA[N]]/ISREADONLY
 !--3338--  SEQNO![CDATA[390]]/SEQNO
@@ -39479,7 +39480,7 @@
 !--3355--  ISDISPLAYED![CDATA[Y]]/ISDISPLAYED
 !--3355--  DISPLAYLENGTH![CDATA[1]]/DISPLAYLENGTH
 !--3355--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--3355--  SEQNO![CDATA[420]]/SEQNO
+!--3355--  SEQNO![CDATA[332]]/SEQNO
 !--3355--  ISSAMELINE![CDATA[Y]]/ISSAMELINE
 !--3355--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--3355--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -40269,7 +40270,7 @@
 !--3388--  DISPLAYLOGIC![CDATA[@DirectShip@='N']]/DISPLAYLOGIC
 !--3388--  DISPLAYLENGTH![CDATA[44]]/DISPLAYLENGTH
 !--3388--  ISREADONLY![CDATA[N]]/ISREADONLY
-!--3388--  SEQNO![CDATA[130]]/SEQNO
+!--3388--  SEQNO![CDATA[242]]/SEQNO
 !--3388--  ISSAMELINE![CDATA[Y]]/ISSAMELINE
 !--3388--  ISFIELDONLY![CDATA[N]]/ISFIELDONLY
 !--3388--  ISENCRYPTED![CDATA[N]]/ISENCRYPTED
@@ -40323,7 +40324,7 @@
 !--3390--  DISPLAYLOGIC![CDATA[@OrderType@='OB' | @OrderType@='SO' | 
@OrderType@='PO']]/DISPLAYLOGIC
 !--3390--  DISPLAYLENGTH![CDATA[10]]/DISPLAYLENGTH
 !--3390--  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/66ef6ecb0b86
changeset: 12126:66ef6ecb0b86
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Thu May 12 11:25:13 2011 +0200
summary:   [cleanup] Reapplied changeset 5defe5fe3c5f
fixes issue 16503: Taxes in demo were wrong. Change organizations

details:   /erp/devel/pi/rev/8586a30d5a1b
changeset: 12127:8586a30d5a1b
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Thu May 12 11:51:28 2011 +0200
summary:   [cleanup] Reapplied changeset fde0a5fe03ea
Fixes issue 16624

details:   /erp/devel/pi/rev/ad377edeedcd
changeset: 12128:ad377edeedcd
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Thu May 12 12:24:34 2011 +0200
summary:   [cleanup] Reapplied changeset 0735ae63ec2b
Issue 16175: Sample Data updated to this issue commit

details:   /erp/devel/pi/rev/9c2ea7e89365
changeset: 12129:9c2ea7e89365
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Thu May 12 12:28:07 2011 +0200
summary:   [cleanup] Reapplied changeset 53ddd0ec0d40
Fixes issue 16791

diffstat:

 referencedata/sampledata/F_B_International_Group.xml |  7726 ++---
 1 files changed, 4479 insertions(+), 3247 deletions(-)

diffs (truncated from 30591 to 300 lines):

diff -r 6cf49fbe4734 -r 9c2ea7e89365 
referencedata/sampledata/F_B_International_Group.xml
--- a/referencedata/sampledata/F_B_International_Group.xml  Thu May 12 
13:23:38 2011 +0200
+++ b/referencedata/sampledata/F_B_International_Group.xml  Thu May 12 
12:28:07 2011 +0200
@@ -11890,7 +11890,7 @@
 autoNumberingtrue/autoNumbering
 incrementBy1/incrementBy
 startingNo50/startingNo
-nextAssignedNumber14/nextAssignedNumber
+nextAssignedNumber19/nextAssignedNumber
 currentNextSystem5/currentNextSystem
 usedForRecordIDfalse/usedForRecordID
 prefixAS//prefix
@@ -11998,7 +11998,7 @@
 autoNumberingtrue/autoNumbering
 incrementBy1/incrementBy
 startingNo100/startingNo
-nextAssignedNumber50019/nextAssignedNumber
+nextAssignedNumber50020/nextAssignedNumber
 currentNextSystem100/currentNextSystem
 usedForRecordIDfalse/usedForRecordID
 prefixSO//prefix
@@ -13636,7 +13636,7 @@
 autoNumberingtrue/autoNumbering
 incrementBy1/incrementBy
 startingNo100/startingNo
-nextAssignedNumber500016/nextAssignedNumber
+nextAssignedNumber500025/nextAssignedNumber
 currentNextSystem100/currentNextSystem
 usedForRecordIDfalse/usedForRecordID
 prefixGS//prefix
@@ -13823,6 +13823,42 @@
 suffix xsi:nil=true/
 restartSequenceEveryYearfalse/restartSequenceEveryYear
   /ADSequence
+  ADSequence id=FF8081812F539E8E012F53B6B85B0009
+idFF8081812F539E8E012F53B6B85B0009/id
+client id=FF8080812AFBCB14012AFBD3E373001F/
+organization id=0/
+activetrue/active
+nameReversed Sales Invoice/name
+descriptionReversed Sales Invoice/description
+valueFormat xsi:nil=true/
+autoNumberingtrue/autoNumbering
+incrementBy1/incrementBy
+startingNo100/startingNo
+nextAssignedNumber100/nextAssignedNumber
+currentNextSystem100/currentNextSystem
+usedForRecordIDfalse/usedForRecordID
+prefix xsi:nil=true/
+suffix xsi:nil=true/
+restartSequenceEveryYearfalse/restartSequenceEveryYear
+  /ADSequence
+  ADSequence id=FF8081812F539E8E012F53B84FDF0010
+idFF8081812F539E8E012F53B84FDF0010/id
+client id=FF8080812AFBCB14012AFBD3E373001F/
+organization id=0/
+activetrue/active
+nameReversed Purchase Invoice/name
+descriptionReversed Purchase Invoice/description
+valueFormat xsi:nil=true/
+autoNumberingtrue/autoNumbering
+incrementBy1/incrementBy
+startingNo100/startingNo
+nextAssignedNumber100/nextAssignedNumber
+currentNextSystem100/currentNextSystem
+usedForRecordIDfalse/usedForRecordID
+prefix xsi:nil=true/
+suffix xsi:nil=true/
+restartSequenceEveryYearfalse/restartSequenceEveryYear
+  /ADSequence
   ADSequence id=FFB42B38D6A34634B534AB499B13644C
 idFFB42B38D6A34634B534AB499B13644C/id
 client id=FF8080812AFBCB14012AFBD3E373001F/
@@ -84462,6 +84498,78 @@
 fromDocumentNo xsi:nil=true/
 toDocumentNo xsi:nil=true/
   /Warehouse
+  WarehouseAccounts id=FF8080812F9BABA8012F9C8775D300E8
+idFF8080812F9BABA8012F9C8775D300E8/id
+warehouse id=DB499813C673490BAA6275D4BD2A5774/
+accountingSchema id=FF8080812AFBCB14012AFBD43E0B089A/
+client id=FF8080812AFBCB14012AFBD3E373001F/
+organization id=90A1F59849E84AFABD04814B3D15A691/
+activetrue/active
+warehouseInventory xsi:nil=true/
+inventoryAdjustment xsi:nil=true/
+warehouseDifferences id=FF8080812AFBCB14012AFBD44C3508B1/
+inventoryRevaluation xsi:nil=true/
+  /WarehouseAccounts
+  WarehouseAccounts id=FF8080812F9BABA8012F9C87CCF900EB
+idFF8080812F9BABA8012F9C87CCF900EB/id
+warehouse id=DB499813C673490BAA6275D4BD2A5774/
+

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/dcb5c16ec13d
changeset: 12061:dcb5c16ec13d
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Thu May 05 17:40:59 2011 +0200
summary:   Fixes issue 16455: Payment report: Filters are not stored.

details:   /erp/devel/pi/rev/e317dcf60d8d
changeset: 12062:e317dcf60d8d
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Thu May 05 19:46:37 2011 +0200
summary:   New left joins in Payment Report for new hibernate behaviour.

details:   /erp/devel/pi/rev/305530340709
changeset: 12063:305530340709
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Thu May 05 20:29:37 2011 +0200
summary:   Fixes issue 15884: CurrentDSO and Overdue columns are being 
calculated wrong.

details:   /erp/devel/pi/rev/65e926b95433
changeset: 12064:65e926b95433
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Mon May 09 11:52:11 2011 +0200
summary:   Fixes issue 16455: Payment report: Filters are not stored: Status 
filter.

diffstat:

 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
|   82 +-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
|   76 +-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml
 |   23 +-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
 |  118 +
 4 files changed, 218 insertions(+), 81 deletions(-)

diffs (truncated from 518 to 300 lines):

diff -r 91b7608a44e8 -r 65e926b95433 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
--- 
a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
   Mon May 09 13:17:55 2011 +0200
+++ 
b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html
   Mon May 09 11:52:11 2011 +0200
@@ -121,7 +121,9 @@
 updateMenuIcon('buttonMenu');
 
 setWindowElementFocus('firstElement');
-hideGroupedOrderingCriteria()
+hideGroupedOrderingCriteria();
+hideLeftRight();
+selectedStatuses();
 }
 function onResizeDo(){
 resizeArea();
@@ -132,28 +134,81 @@
 var ord = document.frmMain.inpOrdCrit;
 var sho = document.frmMain.inpShown;
 
-var last;
+var lastOrd;
+var lastSho;
+var i;
 
 for (i = 0; i  ord.length; i++){
 if (gro.options[gro.selectedIndex].value == ord.options[i].value){
-ord[i].style.display = 'none';
-last = ord[i];
+ord[i].style.visibility = hidden;
+lastOrd = ord[i];
 }
 else
-ord[i].style.display = '';
+ord[i].style.visibility = '';
 }
 
+if (lastOrd != null){
+ord.remove(lastOrd.index);
+ord.add(lastOrd, null);
+}
+
+for (i = 0; i  sho.length ; i++){
+if (gro.options[gro.selectedIndex].value == sho.options[i].value){
+sho[i].style.visibility = hidden;
+lastSho = sho[i];
+}
+else
+sho[i].style.visibility = '';
+}
+
+if (lastSho != null){
+sho.remove(lastSho.index);
+sho.add(lastSho, null);
+}
+}
+function hideLeftRight(){
+var ord = document.frmMain.inpOrdCrit;
+var sho = document.frmMain.inpShown;
+
+var last;
+var i;
+var j;
+
+   for (i = 0; i  ord.length; i++){
+for (j = 0; j  sho.length; j++){
+if (ord.options[i].value == sho.options[j].value){
+ord[i].style.visibility = hidden;
+last = ord[i];
+}
+}
+}
+
 if (last != null){
 ord.remove(last.index);
 ord.add(last, null);
 }
-
-for (i = 0; i  sho.length ; i++){
-if (gro.options[gro.selectedIndex].value == sho.options[i].value)
-sho[i].style.display = 'none';
-else
-sho[i].style.display = '';
-}
+}
+function selectedStatuses(){
+   var selStatus = document.frmMain.inpSelectedStatuses;
+   var strSelStatus;
+   var arrSelStatus;
+   var status = document.frmMain.paramfinPaymSt;
+   
+   var i;
+   var j;
+   
+   strSelStatus = selStatus.value.replace((',);
+   strSelStatus = strSelStatus.replace('),);
+   
+   arrSelStatus = strSelStatus.split(', ');
+   
+   for (i = 0; i  arrSelStatus.length; i++ ){
+ 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/1f414265d30b
changeset: 11986:1f414265d30b
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Thu May 05 12:21:12 2011 +0200
summary:   Merge changeset 818:1dfc14a06c86 of 2.50 APRM

details:   /erp/devel/pi/rev/f9e523287348
changeset: 11987:f9e523287348
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Thu May 05 12:24:58 2011 +0200
summary:   [APRM] Merge changeset 820:065c35c42ada of 2.50 APRM

details:   /erp/devel/pi/rev/894723d0b1ed
changeset: 11988:894723d0b1ed
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Thu May 05 12:29:20 2011 +0200
summary:   [APRM] Merge changeset 821:601d55e4b571 of 2.50 APRM

details:   /erp/devel/pi/rev/601c54bfb8b2
changeset: 11989:601c54bfb8b2
user:  Mikel Irurita mikel.irurita at openbravo.com
date:  Thu May 05 12:31:03 2011 +0200
summary:   [APRM] Merge changeset 822:5e04106a of 2.50 APRM

diffstat:

 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.class
|0 
 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class
|0 
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
   |   21 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml
   |   11 +
 
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.java
 |   51 ++
 
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql
|   69 ++
 
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java
 |  250 ++
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
   |4 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
   |  113 +++-
 9 files changed, 487 insertions(+), 32 deletions(-)

diffs (truncated from 688 to 300 lines):

diff -r f2a90f673328 -r 601c54bfb8b2 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance.class
 has changed
diff -r f2a90f673328 -r 601c54bfb8b2 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class
 has changed
diff -r f2a90f673328 -r 601c54bfb8b2 
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 May 05 11:28:22 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
 Thu May 05 12:31:03 2011 +0200
@@ -65,6 +65,7 @@
 v_Line FIN_FINACC_TRANSACTION.LINE%TYPE;
 v_count NUMBER;
 v_PaymentPriority VARCHAR(32);
+v_creditmultiplier NUMBER := 1;
 
 
 TYPE RECORD IS REF CURSOR;
@@ -107,6 +108,10 @@
   v_project_id, v_campaign_id, v_activity_id, v_user1, v_user2
   FROM c_invoice
   WHERE c_invoice_id=p_record_id;
+  
+  IF (v_IsSOTrx = 'N') THEN
+v_creditmultiplier := -1;
+  END IF;
 
   -- complete invoice
   IF (p_docaction = 'CO') THEN
@@ -172,7 +177,7 @@
  fin_payment_scheduledetail_id,
  fin_payment_scheduledetail.fin_payment_schedule_order,
  fin_payment_scheduledetail.fin_payment_detail_id,
- CASE WHEN fin_payment.status IS NULL OR fin_payment.status IN 
('RPAP', 'RPAE') THEN 'N' ELSE 'Y' END AS paid
+ CASE WHEN fin_payment.status IN ('PPM', 'RPR', 'PWNC', 'RDNC', 
'RPPC') THEN 'Y' ELSE 'N' END AS paid
   FROM c_invoiceline, c_orderline, fin_payment_schedule,
 fin_payment_scheduledetail LEFT JOIN fin_payment_detail ON 
fin_payment_scheduledetail.fin_payment_detail_id = 
fin_payment_detail.fin_payment_detail_id
LEFT JOIN fin_payment ON 
fin_payment_detail.fin_payment_id = fin_payment.fin_payment_id
@@ -453,7 +458,7 @@
 
   -- Updating SO_CREDITUSED when Invoices are being processed
   UPDATE C_BPARTNER
-  SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + V_OutstandingAmount
+  SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + 
(COALESCE(V_OutstandingAmount, 0) * 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/7cb3ab3f3572
changeset: 11932:7cb3ab3f3572
user:  Martin Taal martin.taal at openbravo.com
date:  Wed May 04 13:46:16 2011 +0200
summary:   Prevent unnecessary warning

details:   /erp/devel/pi/rev/c829731f40b9
changeset: 11933:c829731f40b9
user:  Martin Taal martin.taal at openbravo.com
date:  Wed May 04 13:37:34 2011 +0200
summary:   Fixes issue 16999: Lots of slow datasource (create) requests on 
accessing sales invoice on first time

details:   /erp/devel/pi/rev/975f3bd4e8dc
changeset: 11934:975f3bd4e8dc
user:  Martin Taal martin.taal at openbravo.com
date:  Wed May 04 13:37:46 2011 +0200
summary:   Fixes issue 16999: Lots of slow datasource (create) requests on 
accessing sales invoice on first time

details:   /erp/devel/pi/rev/1398bf486a83
changeset: 11935:1398bf486a83
user:  Martin Taal martin.taal at openbravo.com
date:  Wed May 04 13:38:27 2011 +0200
summary:   removed selecting of text in grid

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/MainLayoutComponent.java
 |  18 ++
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
  |   2 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
|   1 -
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceConstants.java
 |   2 +
 src/org/openbravo/base/model/Property.java 
|   4 +-
 5 files changed, 25 insertions(+), 2 deletions(-)

diffs (106 lines):

diff -r 459eab5f575c -r 1398bf486a83 
modules/org.openbravo.client.application/src/org/openbravo/client/application/MainLayoutComponent.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MainLayoutComponent.java
Wed May 04 13:04:53 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MainLayoutComponent.java
Wed May 04 13:38:27 2011 +0200
@@ -20,7 +20,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -29,6 +31,8 @@
 import org.openbravo.base.weld.WeldUtils;
 import org.openbravo.client.kernel.BaseComponent;
 import org.openbravo.client.kernel.BaseTemplateComponent;
+import org.openbravo.client.kernel.Component;
+import org.openbravo.client.kernel.ComponentProvider;
 import org.openbravo.client.kernel.Template;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
@@ -36,6 +40,7 @@
 import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.obps.ActivationKey;
 import org.openbravo.erpCommon.utility.PropertyException;
+import org.openbravo.service.datasource.DataSourceConstants;
 
 /**
  * 
@@ -46,6 +51,10 @@
   @Inject
   private WeldUtils weldUtils;
 
+  @Inject
+  @ComponentProvider.Qualifier(DataSourceConstants.DS_COMPONENT_TYPE)
+  private ComponentProvider dsComponentProvider;
+
   /*
* (non-Javadoc)
* 
@@ -145,6 +154,15 @@
 }
   }
 
+  public String getNotesDataSource() {
+final String dsId = 090A37D22E61FE94012E621729090048;
+final MapString, Object dsParameters = new HashMapString, 
Object(getParameters());
+dsParameters.put(DataSourceConstants.DS_CREATE, true);
+dsParameters.put(DataSourceConstants.DS_CLASS_NAME, OBViewDataSource);
+final Component component = dsComponentProvider.getComponent(dsId, 
dsParameters);
+return component.generate();
+  }
+
   public static class NBComponent {
 // NB stands for: Navigation Bar
 private String jscode;
diff -r 459eab5f575c -r 1398bf486a83 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
 Wed May 04 13:04:53 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
 Wed May 04 13:38:27 2011 +0200
@@ -134,6 +134,8 @@
 ${nbc.jscode}#if nbc_has_next,/#if
 /#list]);
 
+${data.notesDataSource}
+
 // test to see if we can show the heartbeat or registration popups (or not)
 (function _OB_checkHeartBeatRegistration() {
  var handleReturn = function(response, data, request) {
diff -r 459eab5f575c -r 1398bf486a83 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
   Wed May 04 13:04:53 2011 +0200
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
   Wed May 04 13:38:27 2011 +0200
@@ -28,7 +28,6 @@
   recordComponentPosition: 'within',
   poolComponentsPerColumn: true,
   showRecordComponents: true,
-  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/4287acab4a0f
changeset: 11824:4287acab4a0f
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon May 02 13:40:02 2011 +0200
summary:   related to issue 16956: Don't check whether current version is 3.0

details:   /erp/devel/pi/rev/6cc7e07e3511
changeset: 11825:6cc7e07e3511
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon May 02 14:01:58 2011 +0200
summary:   fixed issue 16956: Increased license manager granularity to tabs

details:   /erp/devel/pi/rev/8f862dbf5c01
changeset: 11826:8f862dbf5c01
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon May 02 15:12:47 2011 +0200
summary:   fixed issue 16956: Don't show 2.50 non allowed tabs

details:   /erp/devel/pi/rev/000970cba425
changeset: 11827:000970cba425
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon May 02 15:24:47 2011 +0200
summary:   related to issue 16956: Use ActivationKey singleton in 
UserInfoWidgetActionHandler

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
 |   4 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java
  |   6 +-
 src/org/openbravo/erpCommon/businessUtility/WindowTabs.java
|  42 +
 src/org/openbravo/erpCommon/obps/ActivationKey.java
|  35 +--
 4 files changed, 52 insertions(+), 35 deletions(-)

diffs (235 lines):

diff -r 87b919ca8474 -r 000970cba425 
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
Mon May 02 14:01:03 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
Mon May 02 15:24:47 2011 +0200
@@ -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) 2009 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2011 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  __.
  
@@ -264,7 +264,7 @@
   }
 
   protected ListRole getRoles(MapString, Object parameters) {
-ActivationKey ak = new ActivationKey();
+ActivationKey ak = ActivationKey.getInstance();
 SystemInformation sysInfo = 
OBDal.getInstance().get(SystemInformation.class, 0);
 boolean correctSystemStatus = sysInfo.getSystemStatus() == null
 || KernelServlet.getGlobalParameters().getOBProperty(safe.mode, 
false)
diff -r 87b919ca8474 -r 000970cba425 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java
 Mon May 02 14:01:03 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java
 Mon May 02 15:24:47 2011 +0200
@@ -26,6 +26,8 @@
 import org.openbravo.client.kernel.KernelConstants;
 import org.openbravo.client.kernel.Template;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.obps.ActivationKey;
+import org.openbravo.erpCommon.obps.ActivationKey.FeatureRestriction;
 import org.openbravo.model.ad.ui.Field;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.ad.ui.Window;
@@ -126,7 +128,9 @@
 final ListOBViewTab tempTabs = new ArrayListOBViewTab();
 for (Tab tab : getWindow().getADTabList()) {
   // NOTE: grid sequence and field sequence tabs do not have any fields 
defined!
-  if (!tab.isActive() || tab.getADFieldList().isEmpty()) {
+  if (!tab.isActive()
+  || tab.getADFieldList().isEmpty()
+  || ActivationKey.getInstance().hasLicencesTabAccess(tab.getId()) != 
FeatureRestriction.NO_RESTRICTION) {
 continue;
   }
   final OBViewTab tabComponent = createComponent(OBViewTab.class);
diff -r 87b919ca8474 -r 000970cba425 
src/org/openbravo/erpCommon/businessUtility/WindowTabs.java
--- a/src/org/openbravo/erpCommon/businessUtility/WindowTabs.java   Mon May 
02 14:01:03 2011 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/WindowTabs.java   Mon May 
02 15:24:47 2011 +0200
@@ -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) 2001-2010 Openbravo SLU

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/4e8298aebfb3
changeset: 11797:4e8298aebfb3
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Thu Apr 28 16:12:22 2011 +0200
summary:   [cleanup] Removed deprecated elements from the configScript

details:   /erp/devel/pi/rev/2684cc21d9dd
changeset: 11798:2684cc21d9dd
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Thu Apr 28 18:06:36 2011 +0200
summary:   [cleanup] Removed AD_TREENODEPR table

details:   /erp/devel/pi/rev/b2b6acc6f87b
changeset: 11799:b2b6acc6f87b
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Thu Apr 28 18:08:25 2011 +0200
summary:   Merge from PI

details:   /erp/devel/pi/rev/26361fd2e787
changeset: 11800:26361fd2e787
user:  Víctor Martínez Romanos victor.martinez at openbravo.com
date:  Thu Apr 28 18:09:50 2011 +0200
summary:   Merge back cleanup project (phase II)

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml   
  | 3 -
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
|30 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
|35 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
 | 9 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
 | 3 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
 |70 +-
 
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
 |38 +-
 modules/org.openbravo.v3/src-db/database/configScript.xml  
  |12 -
 referencedata/sampledata/F_B_International_Group.xml   
  |  9387 -
 referencedata/sampledata/QA_Testing.xml
  |   697 +-
 src-db/database/model/tables/AD_TREENODEPR.xml 
  |74 -
 src-db/database/model/triggers/AD_TREE_TRG.xml 
  |21 +-
 src-db/database/model/triggers/M_PRODUCT_TRG.xml   
  |24 +-
 src-db/database/model/triggers/M_PRODUCT_TRG2.xml  
  |35 -
 src-db/database/sourcedata/AD_COLUMN.xml   
  |   399 -
 src-db/database/sourcedata/AD_DATASET_TABLE.xml
  |28 -
 src-db/database/sourcedata/AD_TABLE.xml
  |21 -
 src-db/database/sourcedata/referencedData/AD_TREENODEPR.xml
  |13 -
 src-db/src/com/openbravo/db/OpenbravoDataFilter.java   
  | 1 -
 src-db/src/com/openbravo/db/OpenbravoMetadataFilter.java   
  | 1 -
 src-test/org/openbravo/test/dal/DalQueryTest.java  
  | 4 +-
 src-test/org/openbravo/test/dal/DalStoredProcedureTest.java
  |13 +-
 src/org/openbravo/erpCommon/utility/WindowTreeUtility.java 
  | 9 +-
 src/org/openbravo/erpCommon/utility/WindowTree_data.xsql   
  |30 -
 24 files changed, 5011 insertions(+), 5946 deletions(-)

diffs (truncated from 31836 to 300 lines):

diff -r a2f40b181582 -r 26361fd2e787 
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 28 13:00:23 2011 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml  
Thu Apr 28 18:09:50 2011 +0200
@@ -4112,7 +4112,6 @@
 !--830698140BBF4AC3E040007F01000289--  
ISSHOWNINSTATUSBAR![CDATA[N]]/ISSHOWNINSTATUSBAR
 !--830698140BBF4AC3E040007F01000289--/AD_FIELD
 
-!--830698140BC54AC3E040007F01000289--  
ISSHOWNINSTATUSBAR![CDATA[N]]/ISSHOWNINSTATUSBAR
 !--830698140BCD4AC3E040007F01000289--AD_FIELD
 !--830698140BCD4AC3E040007F01000289--  
AD_FIELD_ID![CDATA[830698140BCD4AC3E040007F01000289]]/AD_FIELD_ID
 !--830698140BCD4AC3E040007F01000289--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
@@ -4163,8 +4162,6 @@
 !--830698140BCE4AC3E040007F01000289--  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/5b79026d84eb
changeset: 11635:5b79026d84eb
user:  David Alsasua david.alsasua at openbravo.com
date:  Tue Apr 12 13:52:52 2011 +0200
summary:   Reformatted file. No code change

details:   /erp/devel/pi/rev/3f0c0c2ce654
changeset: 11636:3f0c0c2ce654
user:  David Alsasua david.alsasua at openbravo.com
date:  Tue Apr 12 13:54:45 2011 +0200
summary:   Fixes issue 16090.
Re-readding the client object

details:   /erp/devel/pi/rev/0a95b66e07c2
changeset: 11637:0a95b66e07c2
user:  David Alsasua david.alsasua at openbravo.com
date:  Wed Apr 13 16:46:27 2011 +0200
summary:   Fixes issue 15686.
Modified help and description of the tab.

details:   /erp/devel/pi/rev/7f6adf1fa00e
changeset: 11638:7f6adf1fa00e
user:  David Alsasua david.alsasua at openbravo.com
date:  Fri Apr 15 16:57:44 2011 +0200
summary:   Fixes issue 16374.

diffstat:

 src-db/database/sourcedata/AD_TAB.xml|   4 +-
 src/org/openbravo/erpCommon/ad_forms/DocInvoice.java |   4 +-
 src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java |  38 
+-
 3 files changed, 23 insertions(+), 23 deletions(-)

diffs (132 lines):

diff -r 3e993613f156 -r 7f6adf1fa00e src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml Thu Apr 21 12:15:54 2011 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml Fri Apr 15 16:57:44 2011 +0200
@@ -7400,8 +7400,8 @@
 !--800012--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--800012--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--800012--  NAME![CDATA[Shipment Route]]/NAME
-!--800012--  DESCRIPTION![CDATA[Create a delivery position for this 
business partner on a defined shipment route.]]/DESCRIPTION
-!--800012--  HELP![CDATA[Create a delivery position for this business 
partner on a defined shipment route.]]/HELP
+!--800012--  DESCRIPTION![CDATA[Create a delivery position for this 
business partner on a defined shipment route, in case the wharehouse is defined 
as Shipment Vehicle.]]/DESCRIPTION
+!--800012--  HELP![CDATA[Create a delivery position for this business 
partner on a defined shipment route, in case the wharehouse is defined as 
Shipment Vehicle.]]/HELP
 !--800012--  AD_TABLE_ID![CDATA[89]]/AD_TABLE_ID
 !--800012--  AD_WINDOW_ID![CDATA[123]]/AD_WINDOW_ID
 !--800012--  SEQNO![CDATA[150]]/SEQNO
diff -r 3e993613f156 -r 7f6adf1fa00e 
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java  Thu Apr 21 
12:15:54 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java  Fri Apr 15 
16:57:44 2011 +0200
@@ -11,7 +11,7 @@
  * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
  * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
  * Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2009 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2011 Openbravo S.L.U.
  **
  */
 package org.openbravo.erpCommon.ad_forms;
@@ -287,7 +287,7 @@
 m_debt_payments[i].dpStatus, conn), this.C_Currency_ID, 
getConvertedAmt(
 m_debt_payments[i].Amount, 
m_debt_payments[i].C_Currency_ID_From,
 this.C_Currency_ID, DateAcct, , AD_Client_ID, AD_Org_ID, 
conn), ,
-Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn); 

+Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
   else
 fact.createLine(m_debt_payments[i], 
getAccountBPartner(C_BPartner_ID, as, false,
 m_debt_payments[i].dpStatus, conn), this.C_Currency_ID, , 
getConvertedAmt(
diff -r 3e993613f156 -r 7f6adf1fa00e 
src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java  Thu Apr 
21 12:15:54 2011 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java  Fri Apr 
15 16:57:44 2011 +0200
@@ -152,10 +152,11 @@
   OBDal.getInstance().flush();
   OBDal.getInstance().commitAndClose();
   org = OBDal.getInstance().get(Organization.class, strOrgId);
+  client = org.getClient();
   if (strcLocationId != null  !strcLocationId.equals())
 try {
-  InitialSetupUtility.updateOrgLocation(org,
-  OBDal.getInstance().get(Location.class, strcLocationId));
+  InitialSetupUtility.updateOrgLocation(org, 
OBDal.getInstance().get(Location.class,
+  strcLocationId));
 } catch (final Exception err) {
   return logErrorAndRollback(
   @CreateOrgFailed@,
@@ -258,9 +259,9 @@
 try {
   log4j.debug(createReferenceData() - There exists accounting modules 
to process);
   obeResult = insertAccountingModule(strSourcePath, strModules, 
partner, product, project,
-  campaign, salesRegion,
-  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/242a9b7ced2e
changeset: 11456:242a9b7ced2e
user:  Thirumalai Kandasami thirumalai at qualian.in
date:  Mon Apr 04 14:10:22 2011 +0530
summary:   Fixed issue 16602:Module In development default value to Yes

details:   /erp/devel/pi/rev/2c1f16a95cb3
changeset: 11457:2c1f16a95cb3
user:  Thirumalai Kandasami thirumalai at qualian.in
date:  Mon Apr 04 16:13:21 2011 +0530
summary:   Related to issue 16602:Backout changeset 11144

details:   /erp/devel/pi/rev/58528b0fe598
changeset: 11458:58528b0fe598
user:  Thirumalai Kandasami thirumalai at qualian.in
date:  Mon Apr 04 16:19:30 2011 +0530
summary:   Fixed issue 16602:Module In development default value to Yes

details:   /erp/devel/pi/rev/9eac616b891b
changeset: 11459:9eac616b891b
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Mon Apr 04 14:29:14 2011 +0200
summary:   Merged Thirumalai Kandasami contribution

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
 |   2 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
   |   3 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
 |   6 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
  |   6 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-classic-popup.js
  |   5 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
   |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-help-about-widget.js
  |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
  |   2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
  |   7 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
|   6 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
  |  16 ++
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
  |  15 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
  |   8 +-
 
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
 |  16 +-
 
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
 |  16 +-
 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
  |   7 +-
 referencedata/standard/Initial_Setup.xml   
   |  76 +-
 src-db/database/model/functions/C_ORDER_POST1.xml  
   |   7 +-
 src-db/database/sourcedata/AD_AUXILIARINPUT.xml
   |   4 +-
 src-db/database/sourcedata/AD_COLUMN.xml   
   |   2 +-
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml   
   |   2 +-
 src-db/database/sourcedata/OBUISEL_SELECTOR.xml
   |   3 +-
 src/org/openbravo/erpCommon/ad_forms/DocLineAmortization_data.xsql 
   |   2 +-
 src/org/openbravo/erpReports/C_OrderJR.jrxml   
   |  33 +--
 src/org/openbravo/erpReports/C_OrderLinesJR.jrxml  
   |  10 +-
 25 files changed, 186 insertions(+), 72 deletions(-)

diffs (truncated from 697 to 300 lines):

diff -r dc283db4f5f6 -r 9eac616b891b 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
 Mon Apr 04 09:39:57 2011 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
 Mon Apr 04 14:29:14 2011 +0200
@@ -36,7 +36,7 @@
 
 // needed for backward compatibility... to open the registration form
 function openRegistration() {
-  OB.Utilities.openProcessPopup(OB.Application.contextUrl + 
'/ad_forms/Registration.html', true);
+  OB.Utilities.openProcessPopup(OB.Application.contextUrl + 
'ad_forms/Registration.html', true);
 }
 
 isc.Canvas.addClassProperties({neverUsePNGWorkaround:true});
diff -r dc283db4f5f6 -r 9eac616b891b 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/b26053672b18
changeset: 11364:b26053672b18
user:  Gorka Ion Damián gorkaion.damian at openbravo.com
date:  Fri Mar 25 10:32:36 2011 +0100
summary:   Added alert status field. Deprecated old isfixed column.

Alert background process has been updated and a modulescript is provided to
initialize properly the new column.

details:   /erp/devel/pi/rev/712dcd227b20
changeset: 11365:712dcd227b20
user:  Gorka Ion Damián gorkaion.damian at openbravo.com
date:  Fri Mar 25 10:33:14 2011 +0100
summary:   [OBUIAPP] Added new ob-section-stack.

details:   /erp/devel/pi/rev/9e1bf405c596
changeset: 11366:9e1bf405c596
user:  Gorka Ion Damián gorkaion.damian at openbravo.com
date:  Fri Mar 25 10:34:18 2011 +0100
summary:   [OBUIAPP] Added OBSectionItemControlLink.

details:   /erp/devel/pi/rev/a64a4edec787
changeset: 11367:a64a4edec787
user:  Gorka Ion Damián gorkaion.damian at openbravo.com
date:  Fri Mar 25 10:47:27 2011 +0100
summary:   Added new alert management view implementation.

This view replaces old alert management form.
Fixes issue 3415
Fixes issue 16476

diffstat:

 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml 
  | 
  12 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
|   
88 +++
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
   |   
11 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
 |   12 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
 |   10 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
   |  166 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
   |9 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
|  278 ++
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
 |  170 ++
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-alert-manager.js
  |   10 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-section-stack.js
  |   26 +
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
 |   35 +
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
  |   14 +
 src-db/database/model/tables/AD_ALERT.xml  
   
|4 +
 src-db/database/sourcedata/AD_COLUMN.xml   
   
|   42 +-
 src-db/database/sourcedata/AD_ELEMENT.xml  
   
|   16 +
 src-db/database/sourcedata/AD_FIELD.xml
   
|   34 +-
 src-db/database/sourcedata/AD_MENU.xml 
   
|2 +-
 src-db/database/sourcedata/AD_MESSAGE.xml  
   
|   44 +
 src-db/database/sourcedata/AD_REFERENCE.xml
   
|   13 +
 src-db/database/sourcedata/AD_REF_LIST.xml 
   
|   48 +
 
src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAlertStatus.class
|0 
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/4643f2e3d2d2
changeset: 11320:4643f2e3d2d2
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Mon Mar 21 17:31:50 2011 +0100
summary:   Line break character changed to RptMA_ProcessPlan.jrxml file.

details:   /erp/devel/pi/rev/e069a216a9c6
changeset: 11321:e069a216a9c6
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Mon Mar 21 17:33:41 2011 +0100
summary:   Issue 16042: Errors in Process Plan report.

details:   /erp/devel/pi/rev/a22ffb5762e0
changeset: 11322:a22ffb5762e0
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Mon Mar 21 17:35:09 2011 +0100
summary:   Line break character changed to ReportProductionRun.jrxml file.

details:   /erp/devel/pi/rev/2bfae37b2817
changeset: 11323:2bfae37b2817
user:  Ioritz Cia ioritz.cia at openbravo.com
date:  Mon Mar 21 17:53:41 2011 +0100
summary:   Issue 15771: Errors in Production Run Status Report.

diffstat:

 src-db/database/sourcedata/AD_TEXTINTERFACES.xml |11 +
 src/org/openbravo/erpCommon/ad_reports/ReportProductionRun.jrxml |  1754 
+-
 src/org/openbravo/erpReports/RptMA_ProcessPlan.jrxml |  1490 

 3 files changed, 1633 insertions(+), 1622 deletions(-)

diffs (truncated from 3918 to 300 lines):

diff -r 0208d57942c9 -r 2bfae37b2817 
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml  Mon Mar 21 16:19:08 
2011 +0100
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml  Mon Mar 21 17:53:41 
2011 +0100
@@ -22466,6 +22466,17 @@
 !--DC828874109D4454AD120F56406F216B--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
 !--DC828874109D4454AD120F56406F216B--/AD_TEXTINTERFACES
 
+!--DC56329107544464ADCEA111AA534C17--AD_TEXTINTERFACES
+!--DC56329107544464ADCEA111AA534C17--  
AD_TEXTINTERFACES_ID![CDATA[DC56329107544464ADCEA111AA534C17]]/AD_TEXTINTERFACES_ID
+!--DC56329107544464ADCEA111AA534C17--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--DC56329107544464ADCEA111AA534C17--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--DC56329107544464ADCEA111AA534C17--  ISACTIVE![CDATA[Y]]/ISACTIVE
+!--DC56329107544464ADCEA111AA534C17--  TEXT![CDATA[Process]]/TEXT
+!--DC56329107544464ADCEA111AA534C17--  
FILENAME![CDATA[/org/openbravo/erpCommon/ad_reports/ReportProductionRun.jrxml]]/FILENAME
+!--DC56329107544464ADCEA111AA534C17--  ISUSED![CDATA[Y]]/ISUSED
+!--DC56329107544464ADCEA111AA534C17--  
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--DC56329107544464ADCEA111AA534C17--/AD_TEXTINTERFACES
+
 !--DD99CE7A10704467BA47244582B45F7D--AD_TEXTINTERFACES
 !--DD99CE7A10704467BA47244582B45F7D--  
AD_TEXTINTERFACES_ID![CDATA[DD99CE7A10704467BA47244582B45F7D]]/AD_TEXTINTERFACES_ID
 !--DD99CE7A10704467BA47244582B45F7D--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
diff -r 0208d57942c9 -r 2bfae37b2817 
src/org/openbravo/erpCommon/ad_reports/ReportProductionRun.jrxml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportProductionRun.jrxml  Mon Mar 
21 16:19:08 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductionRun.jrxml  Mon Mar 
21 17:53:41 2011 +0100
@@ -1,138 +1,138 @@
-?xml version=1.0 encoding=UTF-8  ?
-!-- Created with iReport - A designer for JasperReports --
-!DOCTYPE jasperReport PUBLIC //JasperReports//DTD Report Design//EN 
http://jasperreports.sourceforge.net/dtds/jasperreport.dtd;
-jasperReport
-name=ReportProductionRun
-columnCount=1
-printOrder=Vertical
-orientation=Portrait
-pageWidth=595
-pageHeight=842
-columnWidth=535
-columnSpacing=0
-leftMargin=30
-rightMargin=30
-topMargin=20
-bottomMargin=20
-whenNoDataType=NoPages
-isTitleNewPage=false
-isSummaryNewPage=false
-   property name=ireport.scriptlethandling value=0 /
-   property name=ireport.encoding value=UTF-8 /
-   import value=java.util.* /
-   import value=net.sf.jasperreports.engine.* /
-   import value=net.sf.jasperreports.engine.data.* /
-
-   style 
-   name=default
-   isDefault=false
-   vAlign=Middle
-   fontName=Bitstream Vera Sans
-   fontSize=10
-   
-   /style
-   style 
-   name=Report_Title
-   isDefault=false
-   fontName=Bitstream Vera Sans
-   fontSize=18
-   
-   box leftPadding=5/box
-   /style
-   style 
-   name=Report_Subtitle
-   isDefault=false
-   forecolor=#55
-   fontName=Bitstream Vera Sans
-   fontSize=14
-   
-   box leftPadding=5/box
-   /style
-   style 
-   name=Total_Field
-   isDefault=false
-   mode=Opaque
-   forecolor=#00
-   

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/4ef7c6fa1824
changeset: 11179:4ef7c6fa1824
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Mar 10 14:23:52 2011 +0100
summary:   Automatically add sequencenumber/lineno as sort clause

details:   /erp/devel/pi/rev/b6cb84c2517d
changeset: 11180:b6cb84c2517d
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Mar 10 14:24:35 2011 +0100
summary:   Removed space

details:   /erp/devel/pi/rev/a8a9fe6a5d65
changeset: 11181:a8a9fe6a5d65
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Mar 10 14:26:02 2011 +0100
summary:   Double click on cell opens form with correct field focused

details:   /erp/devel/pi/rev/40df33ccddc6
changeset: 11182:40df33ccddc6
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Mar 10 19:09:23 2011 +0100
summary:   Fix issue that cancel button forced a save, Fixes issue 16215: 
Parent records are hidden when creating the line

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
 |  13 ++-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
  |  24 -
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
  |  39 -
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
  |  37 ++---
 
modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js
   |  21 +
 src-db/database/sourcedata/AD_REF_LIST.xml 
   |   2 +-
 6 files changed, 109 insertions(+), 27 deletions(-)

diffs (truncated from 343 to 300 lines):

diff -r 8c44ad13e0d6 -r 40df33ccddc6 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
 Thu Mar 10 18:04:48 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
 Thu Mar 10 19:09:23 2011 +0100
@@ -42,6 +42,7 @@
 import org.openbravo.model.ad.ui.Field;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.common.order.Order;
+import org.openbravo.model.common.order.OrderLine;
 import org.openbravo.service.json.JsonConstants;
 
 /**
@@ -56,6 +57,7 @@
 
   private boolean applyTransactionalFilter = false;
   private Tab tab;
+  private Entity entity;
   private ListLocalField fields = null;
 
   private final ListField fieldsInDynamicExpression = new ArrayListField();
@@ -72,6 +74,7 @@
 
   public void setTab(Tab tab) {
 this.tab = tab;
+entity = ModelProvider.getInstance().getEntityByTableId((String) 
DalUtil.getId(tab.getTable()));
   }
 
   public String getWhereClause() {
@@ -85,6 +88,14 @@
 if (tab.getHqlorderbyclause() != null) {
   return tab.getHqlorderbyclause();
 }
+// use 2 examples of sequence number of line no
+if (entity.hasProperty(Tab.PROPERTY_SEQUENCENUMBER)) {
+  return Tab.PROPERTY_SEQUENCENUMBER;
+}
+if (entity.hasProperty(OrderLine.PROPERTY_LINENO)) {
+  return OrderLine.PROPERTY_LINENO;
+}
+
 return JsonConstants.IDENTIFIER;
   }
 
@@ -101,8 +112,6 @@
 }
 String transactionalFilter =  e.updated   + 
JsonConstants.QUERY_PARAM_TRANSACTIONAL_RANGE
 +  ;
-final Entity entity = ModelProvider.getInstance().getEntityByTableId(
-(String) DalUtil.getId(tab.getTable()));
 if (entity.hasProperty(Order.PROPERTY_PROCESSED)) {
   transactionalFilter +=  or e.processed = 'N' ;
 }
diff -r 8c44ad13e0d6 -r 40df33ccddc6 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
  Thu Mar 10 18:04:48 2011 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
  Thu Mar 10 19:09:23 2011 +0100
@@ -816,7 +816,7 @@
   // ** {{{ editRecord }}} **
   // Opens the edit form and selects the record in the grid, will refresh
   // child views also
-  editRecord: function(record, preventFocus){
+  editRecord: function(record, preventFocus, focusFieldName){
 
 this.messageBar.hide();
 
@@ -833,7 +833,7 @@
   // also handle the case that there are unsaved values in the grid
   // show them in the form
   var rowNum = this.viewGrid.getRecordIndex(record);
-  this.viewForm.editRecord(this.viewGrid.getEditedRecord(rowNum), 
preventFocus, this.viewGrid.recordHasChanges(rowNum));
+  this.viewForm.editRecord(this.viewGrid.getEditedRecord(rowNum), 
preventFocus, this.viewGrid.recordHasChanges(rowNum), focusFieldName);
 }
   },
   
@@ -1268,16 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/166b5bfd652e
changeset: 10860:166b5bfd652e
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Feb 24 10:33:10 2011 +0100
summary:   Solve undefined js error

details:   /erp/devel/pi/rev/804521660761
changeset: 10861:804521660761
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Feb 24 10:33:27 2011 +0100
summary:   Solve show of db id in selector has link

details:   /erp/devel/pi/rev/25524a2a7c47
changeset: 10862:25524a2a7c47
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Feb 24 10:33:49 2011 +0100
summary:   Solve duplicate width attribute

details:   /erp/devel/pi/rev/be5823345242
changeset: 10863:be5823345242
user:  Martin Taal martin.taal at openbravo.com
date:  Thu Feb 24 10:34:11 2011 +0100
summary:   Set width attribute as field property

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
|1 -
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
|4 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKSearchUIDefinition.java
 |  131 +
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
 |2 +-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java
 |   13 +-
 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
|   10 +-
 6 files changed, 89 insertions(+), 72 deletions(-)

diffs (255 lines):

diff -r 9bbe067ee20c -r be5823345242 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
  Thu Feb 24 09:31:30 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
  Thu Feb 24 10:34:11 2011 +0100
@@ -29,7 +29,6 @@
 rowSpan: ${fieldDefinition.rowSpan},
 startRow: ${fieldDefinition.startRow?string},
 endRow: ${fieldDefinition.endRow?string},
-width: '*',
 #if fieldDefinition.standardField
 columnName: '${fieldDefinition.columnName?string}',
 inpColumnName: '${fieldDefinition.inpColumnName?string}',
diff -r 9bbe067ee20c -r be5823345242 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
  Thu Feb 24 09:31:30 2011 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
  Thu Feb 24 10:34:11 2011 +0100
@@ -1195,7 +1195,7 @@
   me.Super('discardEdits', localArguments);
   
   // remove the record if new
-  if (record._new) {
+  if (record  record._new) {
 me.data.handleUpdate('remove', [{
   id: record.id
 }]);
@@ -1206,7 +1206,7 @@
   }
   
   this.view.standardWindow.cleanUpAutoSaveProperties();
-  
+   
   // update after removing the error msg
   this.view.updateTabTitle();
   this.view.toolBar.updateButtonState(true);
diff -r 9bbe067ee20c -r be5823345242 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKSearchUIDefinition.java
--- 
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKSearchUIDefinition.java
   Thu Feb 24 09:31:30 2011 +0100
+++ 
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKSearchUIDefinition.java
   Thu Feb 24 10:34:11 2011 +0100
@@ -18,6 +18,11 @@
  */
 package org.openbravo.client.kernel.reference;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Property;
@@ -65,80 +70,76 @@
 
   @Override
   public String getFieldProperties(Field field) {
+final String superJsonStr = super.getFieldProperties(field);
 if (field == null) {
-  return ;
+  return superJsonStr;
 }
-final StringBuilder props = new StringBuilder();
-final Property prop = 
KernelUtils.getInstance().getPropertyFromColumn(field.getColumn());
-final Reference reference = OBDal.getInstance().get(Reference.class,
-prop.getDomainType().getReference().getId());
-ModelImplementation modelImplementation = null;
-for (ModelImplementation localModelImplementation : 
reference.getADModelImplementationList()) {
-  if (localModelImplementation.isActive()) {

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/72e872c1dee2
changeset: 10832:72e872c1dee2
user:  RM packaging bot staff.rm at openbravo.com
date:  Fri Feb 18 22:35:48 2011 +0100
summary:   Update AD_MODULE version to 3.0RC4

details:   /erp/devel/pi/rev/37f2d5f6122e
changeset: 10833:37f2d5f6122e
user:  RM packaging bot staff.rm at openbravo.com
date:  Fri Feb 18 22:35:50 2011 +0100
summary:   Added tag 3.0RC4 for changeset 72e872c1dee2

details:   /erp/devel/pi/rev/45b3d2257377
changeset: 10834:45b3d2257377
user:  RM packaging bot staff.rm at openbravo.com
date:  Fri Feb 18 22:35:51 2011 +0100
summary:   Added signature for changeset 37f2d5f6122e

details:   /erp/devel/pi/rev/3e72d9acbfea
changeset: 10835:3e72d9acbfea
user:  RM packaging bot staff.rm at openbravo.com
date:  Tue Feb 22 20:41:13 2011 +0100
summary:   Merge 3.0RC4 temporary head

diffstat:

 .hgsigs

 |1 +
 .hgtags

 |1 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  

 |4 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml

|4 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java

 |3 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java

|   52 -
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js

  |2 +
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml   

 |4 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml

 |2 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml

   |4 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml

|8 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java

   |   12 +
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml

|4 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml

 |2 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml   

 |4 +-
 
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml

 |6 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/I18NComponent.java

  |2 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml 

 |4 +-
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml

   |4 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml 

|4 +-
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/117a9ea08085
changeset: 10317:117a9ea08085
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Wed Feb 02 12:42:05 2011 +0100
summary:   [process] Fixed default popup opening

details:   /erp/devel/pi/rev/fa2b09e4dd26
changeset: 10318:fa2b09e4dd26
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Wed Feb 02 12:42:15 2011 +0100
summary:   [process] Fixed default popup opening

details:   /erp/devel/pi/rev/1b9501554fdb
changeset: 10319:1b9501554fdb
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Wed Feb 02 12:42:24 2011 +0100
summary:   [process] Fixed default popup opening

details:   /erp/devel/pi/rev/4fa368678e2e
changeset: 10320:4fa368678e2e
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Wed Feb 02 12:42:36 2011 +0100
summary:   [process] Fixed default popup opening

diffstat:

 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml
 |   30 +-
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PREFERENCE.xml
|2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PREFERENCE.xml
 |2 +-
 src-db/database/sourcedata/AD_PREFERENCE.xml   
   |  350 +-
 4 files changed, 192 insertions(+), 192 deletions(-)

diffs (truncated from 1740 to 300 lines):

diff -r 089fd90320fb -r 4fa368678e2e 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml
 Wed Feb 02 12:27:17 2011 +0100
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml
 Wed Feb 02 12:42:36 2011 +0100
@@ -50,7 +50,7 @@
 !--9B4A5EB6974FA841E040A8C0E1077381--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--9B4A5EB6974FA841E040A8C0E1077381--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--9B4A5EB6974FA841E040A8C0E1077381--  
ATTRIBUTE![CDATA[ModalProcess12016E2EDE0245B5A36B84CBA144DBDF]]/ATTRIBUTE
-!--9B4A5EB6974FA841E040A8C0E1077381--  VALUE![CDATA[Y]]/VALUE
+!--9B4A5EB6974FA841E040A8C0E1077381--  VALUE![CDATA[N]]/VALUE
 !--9B4A5EB6974FA841E040A8C0E1077381--  
ISPROPERTYLIST![CDATA[N]]/ISPROPERTYLIST
 !--9B4A5EB6974FA841E040A8C0E1077381--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
 !--9B4A5EB6974FA841E040A8C0E1077381--/AD_PREFERENCE
@@ -61,7 +61,7 @@
 !--9B4A5EB69750A841E040A8C0E1077381--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--9B4A5EB69750A841E040A8C0E1077381--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--9B4A5EB69750A841E040A8C0E1077381--  
ATTRIBUTE![CDATA[ModalProcess2EED9BC16DB34D2B80BA40A21564BECF]]/ATTRIBUTE
-!--9B4A5EB69750A841E040A8C0E1077381--  VALUE![CDATA[Y]]/VALUE
+!--9B4A5EB69750A841E040A8C0E1077381--  VALUE![CDATA[N]]/VALUE
 !--9B4A5EB69750A841E040A8C0E1077381--  
ISPROPERTYLIST![CDATA[N]]/ISPROPERTYLIST
 !--9B4A5EB69750A841E040A8C0E1077381--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
 !--9B4A5EB69750A841E040A8C0E1077381--/AD_PREFERENCE
@@ -72,7 +72,7 @@
 !--9B4A5EB69751A841E040A8C0E1077381--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--9B4A5EB69751A841E040A8C0E1077381--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--9B4A5EB69751A841E040A8C0E1077381--  
ATTRIBUTE![CDATA[ModalProcess3C4A5FB206B74C3CA9FE20116FCA0464]]/ATTRIBUTE
-!--9B4A5EB69751A841E040A8C0E1077381--  VALUE![CDATA[Y]]/VALUE
+!--9B4A5EB69751A841E040A8C0E1077381--  VALUE![CDATA[N]]/VALUE
 !--9B4A5EB69751A841E040A8C0E1077381--  
ISPROPERTYLIST![CDATA[N]]/ISPROPERTYLIST
 !--9B4A5EB69751A841E040A8C0E1077381--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
 !--9B4A5EB69751A841E040A8C0E1077381--/AD_PREFERENCE
@@ -83,7 +83,7 @@
 !--9B4A5EB69752A841E040A8C0E1077381--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--9B4A5EB69752A841E040A8C0E1077381--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--9B4A5EB69752A841E040A8C0E1077381--  
ATTRIBUTE![CDATA[ModalProcess4A059E4F79294640AD37B1B718C56E5D]]/ATTRIBUTE
-!--9B4A5EB69752A841E040A8C0E1077381--  VALUE![CDATA[Y]]/VALUE
+!--9B4A5EB69752A841E040A8C0E1077381--  VALUE![CDATA[N]]/VALUE
 !--9B4A5EB69752A841E040A8C0E1077381--  
ISPROPERTYLIST![CDATA[N]]/ISPROPERTYLIST
 !--9B4A5EB69752A841E040A8C0E1077381--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
 !--9B4A5EB69752A841E040A8C0E1077381--/AD_PREFERENCE
@@ -94,7 +94,7 @@
 !--9B4A5EB69753A841E040A8C0E1077381--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
 !--9B4A5EB69753A841E040A8C0E1077381--  ISACTIVE![CDATA[Y]]/ISACTIVE
 !--9B4A5EB69753A841E040A8C0E1077381--  
ATTRIBUTE![CDATA[ModalProcess62E6270312534380B9A8BDF603CA8FBB]]/ATTRIBUTE
-!--9B4A5EB69753A841E040A8C0E1077381--  VALUE![CDATA[Y]]/VALUE
+!--9B4A5EB69753A841E040A8C0E1077381--  VALUE![CDATA[N]]/VALUE
 !--9B4A5EB69753A841E040A8C0E1077381--  
ISPROPERTYLIST![CDATA[N]]/ISPROPERTYLIST
 !--9B4A5EB69753A841E040A8C0E1077381--  
AD_MODULE_ID![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]/AD_MODULE_ID
 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/a02b82831805
changeset: 10326:a02b82831805
user:  Martin Taal martin.taal at openbravo.com
date:  Wed Feb 02 15:32:58 2011 +0100
summary:   Solve issue with null value of view datasource

details:   /erp/devel/pi/rev/b53f9e9335cd
changeset: 10327:b53f9e9335cd
user:  Martin Taal martin.taal at openbravo.com
date:  Wed Feb 02 15:34:23 2011 +0100
summary:   Grid editing: also pass/handle form values in edit mode

details:   /erp/devel/pi/rev/001abf5ee1fa
changeset: 10328:001abf5ee1fa
user:  Martin Taal martin.taal at openbravo.com
date:  Wed Feb 02 15:35:28 2011 +0100
summary:   Consider all context values (also from editable grid) when opening 
popup

details:   /erp/devel/pi/rev/8c027d350043
changeset: 10329:8c027d350043
user:  Martin Taal martin.taal at openbravo.com
date:  Wed Feb 02 15:35:57 2011 +0100
summary:   Save edit values in grid before saving the record itself

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
|   4 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 |   7 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
   |  18 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
  |  61 +++--
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
  |  58 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
  |   1 +
 6 files changed, 96 insertions(+), 53 deletions(-)

diffs (truncated from 345 to 300 lines):

diff -r 2260f5f59c95 -r 8c027d350043 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Wed Feb 02 14:26:32 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Wed Feb 02 15:35:57 2011 +0100
@@ -27,7 +27,6 @@
 /#if
 #if tabComponent.tabSet
 tabId: '${tabComponent.tabId}',
-dataSource: ${tabComponent.dataSourceJavaScript},
 moduleId: '${tabComponent.moduleId}',
 /#if
 
@@ -46,7 +45,7 @@
   #list tabComponent.allFields as field
 {
   property: '${field.propertyName?js_string}',
-  column: '${field.columnName?js_string}', 
+  inpColumn: '${field.columnName?js_string}', 
   dbColumn: '${field.dbColumnName?js_string}', 
   sessionProperty: ${field.session},
   type: '${field.typeName?js_string}'
@@ -99,6 +98,7 @@
 hasChildTabs: true,
 /#if
 initWidget: function() {
+this.dataSource = ${tabComponent.dataSourceJavaScript};
 this.viewForm = ${tabComponent.viewForm}; 
 this.viewGrid = ${tabComponent.viewGrid};
 this.Super('initWidget', arguments);
diff -r 2260f5f59c95 -r 8c027d350043 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 Wed Feb 02 14:26:32 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
 Wed Feb 02 15:35:57 2011 +0100
@@ -413,11 +413,14 @@
   private void setValuesInRequest(String mode, Tab tab, BaseOBObject row, 
JSONObject jsContent) {
 ListField fields = tab.getADFieldList();
 if (mode.equals(EDIT)) {
-  // In EDIT mode we get them from the database
+  // In EDIT mode we initialize them from the database
   for (Field field : fields) {
 setValueOfColumnInRequest(row, field.getColumn().getDBColumnName());
   }
-} else if (mode.equals(CHANGE) || mode.equals(SETSESSION)) {
+}
+
+// and then overwrite with what gets passed in
+if (mode.equals(EDIT) || mode.equals(CHANGE) || 
mode.equals(SETSESSION)) {
   // In CHANGE and SETSESSION we get them from the request
   for (Field field : fields) {
 final Property prop = 
KernelUtils.getInstance().getPropertyFromColumn(field.getColumn());
diff -r 2260f5f59c95 -r 8c027d350043 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
   Wed Feb 02 14:26:32 2011 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
   Wed Feb 02 15:35:57 2011 +0100
@@ -173,10 +173,11 @@
   }, 
 
   

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/b9c4daa3bff7
changeset: 10129:b9c4daa3bff7
user:  Martin Taal martin.taal at openbravo.com
date:  Tue Jan 25 23:49:38 2011 +0100
summary:   Set form height to 100%, changed initial empty data message of grid 
to loading

details:   /erp/devel/pi/rev/1b9e9f910f8c
changeset: 10130:1b9e9f910f8c
user:  Martin Taal martin.taal at openbravo.com
date:  Tue Jan 25 23:50:40 2011 +0100
summary:   layoutchildren returns value

details:   /erp/devel/pi/rev/8007b8d1d5ba
changeset: 10131:8007b8d1d5ba
user:  Martin Taal martin.taal at openbravo.com
date:  Tue Jan 25 23:51:27 2011 +0100
summary:   Solved smaller bugs in standard window

details:   /erp/devel/pi/rev/4569470336c6
changeset: 10132:4569470336c6
user:  Martin Taal martin.taal at openbravo.com
date:  Tue Jan 25 23:52:34 2011 +0100
summary:   Mouse cursor only changes for mid tabset, solved layout issue for 
grand-child tab when minimized

diffstat:

 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
 |   3 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-tabset.js
 |  47 +--
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
|  58 +++--
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
  |  18 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
|   2 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
|  19 +-
 6 files changed, 73 insertions(+), 74 deletions(-)

diffs (truncated from 428 to 300 lines):

diff -r 67117d6c25f3 -r 4569470336c6 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
   Tue Jan 25 23:48:58 2011 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
   Tue Jan 25 23:52:34 2011 +0100
@@ -122,13 +122,14 @@
   
   // keep the funnel stuff placed correctly
   layoutChildren : function () {
-this.Super(layoutChildren, arguments);
+var ret = this.Super(layoutChildren, arguments);
 if (this.funnelLayout) { 
 this.funnelLayout.setLeft(this.computeFunnelLeft());
 }
 if (this.filterImage) { 
   this.filterImage.setLeft(this.computeFunnelLeft(2));
 }
+return ret;
   },
   
   actionButtonProperties: {
diff -r 67117d6c25f3 -r 4569470336c6 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-tabset.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-tabset.js
   Tue Jan 25 23:48:58 2011 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-tabset.js
   Tue Jan 25 23:52:34 2011 +0100
@@ -38,7 +38,7 @@
   isc.Timer.setTimeout(function(){
 // if no double click happened then do the single click
 if (me.dblClickWaiting) {
-  me.dblClickWaiting = false;  
+  me.dblClickWaiting = false;
   me.tabSet.doHandleClick();
 }
   }, OB.Constants.DBL_CLICK_DELAY);
@@ -59,26 +59,37 @@
 },
 
 mouseDown: function() {
-  this.setCursor(isc.Canvas.MOVE);
+  if (this.state === isc.OBStandardView.STATE_IN_MID) {
+this.setCursor(isc.Canvas.MOVE);
+  }
 },
 
 mouseUp: function() {
-  this.setCursor(isc.Canvas.ROW_RESIZE);
+  if (this.state === isc.OBStandardView.STATE_IN_MID) {
+this.setCursor(isc.Canvas.ROW_RESIZE);
+  }
 },
 
 mouseOut: function() {
-  this.setCursor(isc.Canvas.ROW_RESIZE);
+  if (this.state === isc.OBStandardView.STATE_IN_MID) {
+this.setCursor(isc.Canvas.ROW_RESIZE);
+  }
 },
 
 mouseOver: function() {
-  this.setCursor(isc.Canvas.ROW_RESIZE);
+  if (this.state === isc.OBStandardView.STATE_IN_MID) {
+this.setCursor(isc.Canvas.ROW_RESIZE);
+  }
 },
 
 getCurrentCursor: function() {
-  if (isc.EventHandler.leftButtonDown()) {
-return isc.Canvas.MOVE;
+  if (this.state === isc.OBStandardView.STATE_IN_MID) {
+if (isc.EventHandler.leftButtonDown()) {
+  return isc.Canvas.MOVE;
+}
+return isc.Canvas.ROW_RESIZE;
   }
-  return isc.Canvas.ROW_RESIZE;
+  return this.Super('getCurrentCursor', arguments);
 },
 
 dragStart: function(){
@@ -208,12 +219,14 @@
   }
   
 } else if (newState === isc.OBStandardView.STATE_MIN) {
-  // the height is set to the height of the tabbar
-  

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/87a71c03db21
changeset: 10014:87a71c03db21
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Jan 21 09:20:07 2011 +0100
summary:   [print] Generalized print button for all documents

details:   /erp/devel/pi/rev/0a1d57b2bfbb
changeset: 10015:0a1d57b2bfbb
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Jan 21 09:38:45 2011 +0100
summary:   [print] Added label

details:   /erp/devel/pi/rev/29828d1dc88a
changeset: 10016:29828d1dc88a
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Jan 21 09:47:42 2011 +0100
summary:   [print] Cleanup OB.ToolbarUtils.print

details:   /erp/devel/pi/rev/93b2b18ef412
changeset: 10017:93b2b18ef412
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Jan 21 10:13:03 2011 +0100
summary:   [print] Show warning if trying to print empty record selection

diffstat:

 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
  |  11 ++
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
 |  27 ++-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
  |  39 -
 3 files changed, 54 insertions(+), 23 deletions(-)

diffs (132 lines):

diff -r edc079a42ed8 -r 93b2b18ef412 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
--- 
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Jan 21 09:40:23 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Jan 21 10:13:03 2011 +0100
@@ -882,4 +882,15 @@
 !--FF8081812DA54F20012DA70C468C0075--  
AD_MODULE_ID![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]/AD_MODULE_ID
 !--FF8081812DA54F20012DA70C468C0075--/AD_MESSAGE
 
+!--FF8081812DA79D5E012DA7CD45DB0048--AD_MESSAGE
+!--FF8081812DA79D5E012DA7CD45DB0048--  
AD_MESSAGE_ID![CDATA[FF8081812DA79D5E012DA7CD45DB0048]]/AD_MESSAGE_ID
+!--FF8081812DA79D5E012DA7CD45DB0048--  
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--FF8081812DA79D5E012DA7CD45DB0048--  AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--FF8081812DA79D5E012DA7CD45DB0048--  ISACTIVE![CDATA[Y]]/ISACTIVE
+!--FF8081812DA79D5E012DA7CD45DB0048--  
VALUE![CDATA[OBUIAPP_PrintNoRecordSelected]]/VALUE
+!--FF8081812DA79D5E012DA7CD45DB0048--  MSGTEXT![CDATA[No record selected 
to print. Select at least one and try again.]]/MSGTEXT
+!--FF8081812DA79D5E012DA7CD45DB0048--  MSGTYPE![CDATA[W]]/MSGTYPE
+!--FF8081812DA79D5E012DA7CD45DB0048--  
AD_MODULE_ID![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]/AD_MODULE_ID
+!--FF8081812DA79D5E012DA7CD45DB0048--/AD_MESSAGE
+
 /data
diff -r edc079a42ed8 -r 93b2b18ef412 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
   Fri Jan 21 09:40:23 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
   Fri Jan 21 10:13:03 2011 +0100
@@ -43,6 +43,7 @@
 import org.openbravo.model.ad.ui.Process;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.ad.ui.TabTrl;
+import org.openbravo.service.db.DalConnectionProvider;
 import org.openbravo.utils.FormatUtilities;
 
 /**
@@ -508,9 +509,31 @@
 
   public class PrintButton extends IconButton {
 public PrintButton() {
+  Process process = tab.getProcess();
+  String processUrl = ;
+  for (ModelImplementation mo : process.getADModelImplementationList()) {
+if (mo.isDefault()  (P.equals(mo.getAction()) || 
R.equals(mo.getAction( {
+  for (ModelImplementationMapping mom : 
mo.getADModelImplementationMappingList()) {
+if (mom.isDefault()) {
+  processUrl = .. + mom.getMappingName();
+  break;
+}
+  }
+  break;
+}
+  }
+  if (processUrl.isEmpty()) {
+processUrl = process.getSearchKey() + .pdf;
+  }
+  if (processUrl.indexOf(/) == -1) {
+processUrl = / + FormatUtilities.replace(processUrl);
+  }
+
   type = print;
-  action = OB.ToolbarUtils.print(this.view);;
-  label = testing...;
+  action = OB.ToolbarUtils.print(this.view, ' + processUrl + ',  + 
process.isDirectPrint()
+  + );;
+  label = Utility.messageBD(new DalConnectionProvider(), Print, 
OBContext.getOBContext()
+  .getLanguage().getLanguage());
 }
 
   }
diff -r edc079a42ed8 -r 93b2b18ef412 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Fri Jan 21 09:40:23 2011 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Fri Jan 21 10:13:03 2011 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/6faa4e77ee45
changeset: 10038:6faa4e77ee45
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Jan 21 16:57:53 2011 +0100
summary:   [audit] Added audit trail in toolbar

details:   /erp/devel/pi/rev/eb19b95b73ca
changeset: 10039:eb19b95b73ca
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Jan 21 17:00:27 2011 +0100
summary:   [audit] Hide audit button for professional/basic instances that have 
not audited table for current tab

details:   /erp/devel/pi/rev/e262af20d35f
changeset: 10040:e262af20d35f
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Jan 21 17:34:27 2011 +0100
summary:   [audit] Set alert when selecting 1 record to show audit

details:   /erp/devel/pi/rev/1d5862969ab4
changeset: 10041:1d5862969ab4
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Fri Jan 21 17:38:41 2011 +0100
summary:   [audit] Fixed audit trail popups to work on modal windows

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
 |  12 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
  |  23 ++
 src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html
 |   4 +-
 src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupHistory.html
 |   4 +-
 4 files changed, 39 insertions(+), 4 deletions(-)

diffs (104 lines):

diff -r 56750adc3119 -r 1d5862969ab4 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
   Fri Jan 21 16:49:58 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
   Fri Jan 21 17:38:41 2011 +0100
@@ -36,6 +36,7 @@
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.data.Sqlc;
+import org.openbravo.erpCommon.obps.ActivationKey;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.datamodel.Column;
 import org.openbravo.model.ad.domain.ModelImplementation;
@@ -113,6 +114,17 @@
 if (tab.getProcess() != null) {
   iconButtons.addAll(getPrintEmailButtons());
 }
+
+// Audit trail button
+if (!ActivationKey.getInstance().isActive() || 
tab.getTable().isFullyAudited()) {
+  IconButton auditBtn = new IconButton();
+  auditBtn.type = audit;
+  auditBtn.label = Utility.messageBD(new DalConnectionProvider(), 
AuditTrail, OBContext
+  .getOBContext().getLanguage().getLanguage());
+  auditBtn.action = OB.ToolbarUtils.showAuditTrail(this.view);;
+  iconButtons.add(auditBtn);
+}
+
 return iconButtons;
   }
 
diff -r 56750adc3119 -r 1d5862969ab4 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
--- 
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Fri Jan 21 16:49:58 2011 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Fri Jan 21 17:38:41 2011 +0100
@@ -721,5 +721,28 @@
   view.setContextInfo(sessionProperties, function() {
 OB.Layout.ClassicOBCompatibility.Popup.open('print', 0, 0, 
OB.Application.contextUrl + 
'/businessUtility/PrinterReports.html?'+popupParams, '', window, false, false, 
true);
   });
+};
+
+OB.ToolbarUtils.showAuditTrail = function(view){
+  var selectedRecords = view.viewGrid.getSelectedRecords();
+
+  if (selectedRecords.length  1) {
+var setWarning = {
+  set: function(label){
+  view.messageBar.setMessage(OBMessageBar.TYPE_WARNING, '', label);
+  }
+};
+OB.I18N.getLabel('JS28', null, setWarning, 'set');
+return;
+  }
   
+  var popupParams = Command=POPUP_HISTORY;
+  popupParams += inpTabId= + view.tabId;
+  popupParams += inpTableId= + view.standardProperties.inpTableId;
+  
+  if (view.viewGrid.getSelectedRecord()) {
+popupParams += inpRecordId= + view.viewGrid.getSelectedRecord().id;
+  }
+  
+  OB.Layout.ClassicOBCompatibility.Popup.open('print', 900, 600, 
OB.Application.contextUrl + '/businessUtility/AuditTrail.html?'+popupParams, 
'', window, false, false, true);
 };
\ No newline at end of file
diff -r 56750adc3119 -r 1d5862969ab4 
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html
--- a/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html   
Fri Jan 21 16:49:58 2011 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html   
Fri Jan 21 17:38:41 2011 +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) 2009-2010 Openbravo SLU 
+ * All portions 

[OpenbravoERP-commits] devel/pi: 4 new changesets

[hg]

details:   /erp/devel/pi/rev/e65622833f44
changeset: 9967:e65622833f44
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Wed Jan 19 10:48:44 2011 +0100
summary:   [print] Show print toolbar button in tabs where print is defined

details:   /erp/devel/pi/rev/be0c44bcb34d
changeset: 9968:be0c44bcb34d
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Wed Jan 19 15:52:58 2011 +0100
summary:   [print] Added standard columns to tab

details:   /erp/devel/pi/rev/fdcc95ea9e66
changeset: 9969:fdcc95ea9e66
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Thu Jan 20 08:17:05 2011 +0100
summary:   [print] Sample print implemntation for printing invoices

details:   /erp/devel/pi/rev/109de0c65230
changeset: 9970:109de0c65230
user:  Asier Lostalé asier.lostale at openbravo.com
date:  Thu Jan 20 08:17:50 2011 +0100
summary:   [print] Properly show print popup

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
 |  17 ++
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
|  85 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
   |  35 +++-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
 |  45 +
 src/org/openbravo/erpCommon/businessUtility/PrinterReports.html
|  16 +-
 src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.html   
|  11 +-
 6 files changed, 197 insertions(+), 12 deletions(-)

diffs (truncated from 353 to 300 lines):

diff -r bf4b4623fef7 -r 109de0c65230 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Thu Jan 20 09:19:30 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Thu Jan 20 08:17:50 2011 +0100
@@ -33,6 +33,14 @@
 
 defaultEditMode: ${tabComponent.defaultEditMode},
 
+standardProperties:{
+  inpTabId: '${tabComponent.tabId}',
+  inpwindowId: '${tabComponent.windowId}',
+  inpTableId: '${tabComponent.tableId?js_string}',
+  inpkeyColumnId: '${tabComponent.keyColumnId?js_string}',
+  inpKeyName: '${tabComponent.keyName?js_string}'
+},
+
 propertyToColumns:[
   #list tabComponent.allFields as field
 {
@@ -59,6 +67,15 @@
   }#if field_has_next,/#if
 /#list],
 
+iconToolbarButtons: [
+#list tabComponent.iconButtons as button
+  {
+action: function(){ ${button.action} },
+buttonType: '${button.type?js_string}',
+prompt: '${button.label?js_string}'
+  }#if button_has_next,/#if
+/#list],
+
 #if tabComponent.childTabs?size gt; 0
 hasChildTabs: true,
 /#if
diff -r bf4b4623fef7 -r 109de0c65230 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
   Thu Jan 20 09:19:30 2011 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
   Thu Jan 20 08:17:50 2011 +0100
@@ -59,6 +59,8 @@
   private OBViewTab parentTabComponent;
   private String parentProperty = null;
   private ListButtonField buttonFields = null;
+  private ListIconButton iconButtons = null;
+  private Field keyField;
 
   protected Template getComponentTemplate() {
 return OBDal.getInstance().get(Template.class, TEMPLATE_ID);
@@ -91,6 +93,20 @@
 return buttonFields;
   }
 
+  public ListIconButton getIconButtons() {
+if (iconButtons != null) {
+  return iconButtons;
+}
+
+iconButtons = new ArrayListIconButton();
+
+// Print button
+if (tab.getProcess() != null) {
+  iconButtons.add(new PrintButton());
+}
+return iconButtons;
+  }
+
   public String getParentProperty() {
 if (parentTabComponent == null) {
   return ;
@@ -199,7 +215,6 @@
 
   public ListFieldProperty getAllFields() {
 ListFieldProperty fields = new ArrayListFieldProperty();
-Field keyField = null;
 for (Field field : tab.getADFieldList()) {
   if (field.getColumn().isKeyColumn()) {
 keyField = field;
@@ -217,15 +232,56 @@
   fields.add(fp);
 }
 
+// Standard hidden fields shown in all 2.50 windows
+FieldProperty fp = new FieldProperty(keyField);
+fp.columnName = keyField.getColumn().getDBColumnName();
+fields.add(fp);
+
 return fields;
   }
 
+  private Field getKeyField() {
+if (keyField != null) {
+  return keyField;
+}
+
+for (Field field :