Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 25 Nov 2014 06:25:55 +0100
changeset 25395 2066043575b3
parent 25313 5275962066ba (current diff)
parent 25394 69fa80585f96 (diff)
child 25396 2f6b08e9f45d
Merge back from main
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
src-db/database/model/functions/M_INOUT_POST.xml
src-db/database/model/triggers/M_LC_COST_CHK_TRG.xml
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_TABLE_TREE.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateADTrees.class
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateADTreesData.class
src-util/modulescript/src/org/openbravo/modulescript/UpdateADTrees.java
src-util/modulescript/src/org/openbravo/modulescript/UpdateADTrees_Data.xsql
src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java
src/org/openbravo/costing/AverageCostAdjustment.java
src/org/openbravo/costing/CostingBackground.java
src/org/openbravo/costing/LCCostMatchFromInvoiceHandler.java
src/org/openbravo/erpCommon/ad_forms/DocLCCost.java
--- a/.hgsigs	Mon Nov 24 15:49:17 2014 +0100
+++ b/.hgsigs	Tue Nov 25 06:25:55 2014 +0100
@@ -157,3 +157,4 @@
 a9d6608b6cabe9e27fa31cbf2a49a69b2d583e0a 0 iEUEABECAAYFAlPfOfMACgkQCX/oGf+2qkP8GQCY8T/ZXMymIqGubZ6h2LbjE7Uc4gCg5A/numsq2gypnrNri+wMt1HLLWA=
 c63d4e4125e832602ed1da786f756c26c7fdcd2a 0 iEYEABECAAYFAlQISYIACgkQCX/oGf+2qkMciwCgo6ZYlA+XmT9DC0n2zO7P5okbQngAoITq7wESNiiLk56/3Rzw7gGtOgMe
 d8e24b51ba03c98d057048de5e86c1c8c977276f 0 iEYEABECAAYFAlRJO3UACgkQCX/oGf+2qkMMFQCeObdVCTDlec79H4alHs8t8SDMQ9YAoO4HfqRXTDGnDg5+LnLtuBxPsQDD
+924afa1490b09bc691895099f12204b2282b0ee9 0 iEYEABECAAYFAlRhoL8ACgkQCX/oGf+2qkNHkwCfeuBMGLqmtcdy8LxqPtcu8mRAlQIAnAjqdHUhM+pTFL5tdsaY1V9buvP9
--- a/.hgtags	Mon Nov 24 15:49:17 2014 +0100
+++ b/.hgtags	Tue Nov 25 06:25:55 2014 +0100
@@ -168,3 +168,4 @@
 d7d2abe0f424775dcdf9139410ae161881be1fb8 3.0PR14Q3
 a5483762bc5de5e3e934785f3baffda3a2d96db2 3.0PR14Q3.1
 6af26661c789c5daa23e36e7367a05dfe291242e 3.0PR14Q3.2
+4ccbe7a7da1d0eed0677d7d0baf545607a192c87 3.0PR14Q3.3