Merge temporary head for 3.0PR15Q2.1
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 21 May 2015 12:28:04 +0000
changeset 26705 2cd1c165b01e
parent 26688 3eef7954a071 (current diff)
parent 26704 5b05db16e4d9 (diff)
child 26726 813d6271f672
Merge temporary head for 3.0PR15Q2.1
.hgsigs
.hgtags
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_TAB.xml
src-test/src/org/openbravo/test/costing/TestCosting.java
src/org/openbravo/costing/AverageCostAdjustment.java
src/org/openbravo/costing/PriceDifferenceProcess.java
--- a/.hgsigs	Thu May 21 09:19:25 2015 +0000
+++ b/.hgsigs	Thu May 21 12:28:04 2015 +0000
@@ -170,3 +170,4 @@
 4d63b001f63758b1b79b9502621754878acdfdff 0 iEYEABECAAYFAlUwx7cACgkQCX/oGf+2qkOn2gCcCxKfDDCR1P8qYR9bNtxTIs81JY8AniiMcNvRgeOQ6DOF+jHHVksUM4eO
 ac3537eef819b48dc9888d5ab0d4fec470158bef 0 iEYEABECAAYFAlVbMyIACgkQCX/oGf+2qkPRzwCfYI94AYb2DYsvojxmVtqMVqKjGiQAoIfADynxGuktv9GHEwfJOnnLCxv3
 ac761ac78f576cee64046e115ac42d2a3b227682 0 iEYEABECAAYFAlVItlgACgkQCX/oGf+2qkPgSACeNz58xoUWpTvMywmncbWx7+r7bnUAn1Ba1al80Q9HMY/wiMNu1Vfpd9Jo
+fdb1e0cd936d09381ae1aa87be98cc4f0f334f31 0 iEYEABECAAYFAlVbM8QACgkQCX/oGf+2qkO+wACfTbKub/UT0e2V2iyIB21716NAn/oAoIHu7PYZ7w/BkTQDZWR0PXDdYkty
--- a/.hgtags	Thu May 21 09:19:25 2015 +0000
+++ b/.hgtags	Thu May 21 12:28:04 2015 +0000
@@ -181,3 +181,4 @@
 ad409516bfa0b1c6f7ab128cab4526dd5058c787 3.0PR15Q1.3
 d5ec99ff8e8e301cf4bf673f37b9c04ea1758f98 3.0PR15Q1.4
 4239774eb8de8f0740bfbd6e3e36c075ee2a5a91 3.0PR15Q2
+e861122b0b1d2aa2ca6e177bfbb9ddf939e33dd7 3.0PR15Q2.1