Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 08 Aug 2018 06:11:43 +0000
changeset 34495 d535ae1bfc55
parent 34494 984e19080e17 (current diff)
parent 34292 13cceb031649 (diff)
child 34496 bfd7a414183a
child 34497 e17a08d06f29
Merge back from main
legal/Licensing.txt
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java
src-db/database/model/functions/C_ORDER_POST1.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src-test/src/org/openbravo/test/copyLinesFromOrders/CopyLinesFromOrdersTest.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestConstants.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_13.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_14.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_15.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_16.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_17.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_18.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_19.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_20.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_01.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_02.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_03.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_04.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_05.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_06.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_07.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_08.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_AUM_21.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_AUM_22.java
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CopyLinesFromOrdersTestData.java
src/org/openbravo/common/actionhandler/copyfromorderprocess/UpdateOrderLineInformation.java
src/org/openbravo/erpCommon/utility/ErrorTextParserPOSTGRE.java
--- a/.hgsigs	Wed Aug 01 13:42:45 2018 +0200
+++ b/.hgsigs	Wed Aug 08 06:11:43 2018 +0000
@@ -232,3 +232,4 @@
 dc2ef98dc38f7c32c888dcf1f1adb37c6afb4d14 0 iEYEABECAAYFAlrxbisACgkQCX/oGf+2qkMMCwCdFeF47f2MY7Pq3cdsyHon64EYekwAoPYllLnhYETGsUEqtiKSxvj9Mgxb
 2121d856284cf0c4f26faef336bd2aa41ada151f 0 iEYEABECAAYFAlr8AykACgkQCX/oGf+2qkPKhQCfeQ+9S16IA3wZMgnoJjRRZRvG8SUAoIgKQPopjsjObnB6Qu1DyNgCByRt
 faeac12b1aad3dc7fb53f8ffda3ada9e3b7deaeb 0 iEYEABECAAYFAls/boQACgkQCX/oGf+2qkNdfACfaNh5oqLf0LzgGAYLmRWa97kbFj4AoL3KPdVDG0Mf6qKcxejAl7Kl12cd
+bbb6e342b4af3c81bd1a49418a01e63fcb09e3c5 0 iEYEABECAAYFAltpYMEACgkQCX/oGf+2qkMblgCffRsYLqTbeixIj19Lm3dm6iMqkv0AoM3iSQaEFeV7ff9nYRd3vz227Ir6
--- a/.hgtags	Wed Aug 01 13:42:45 2018 +0200
+++ b/.hgtags	Wed Aug 08 06:11:43 2018 +0000
@@ -243,3 +243,4 @@
 307b23f7635f3e92dd8fc8e7d55d09b7c914384c 3.0PR18Q2
 63c5e173ffdca0828d75476e5a48e2fae42ad9e9 3.0PR18Q1.3
 3f281a901fbbde5103faebca4df0c22b94ac5535 3.0PR18Q2.1
+5cbef591aff09f80e8a73a92202d438b792ad40f 3.0PR18Q3