Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 11 Dec 2018 12:26:44 +0000
changeset 35215 4c4039a9c917
parent 35214 05948dd8851c (current diff)
parent 34890 e86213540c78 (diff)
child 35216 ebd6611474d3
Merge back from main
legal/Licensing.txt
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
src-db/database/model/prescript-PostgreSql.sql
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
src/org/openbravo/dal/core/OBContext.java
src/org/openbravo/dal/service/OBDal.java
src/org/openbravo/email/EmailEventManager.java
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java
--- a/.hgsigs	Mon Dec 10 16:29:15 2018 +0100
+++ b/.hgsigs	Tue Dec 11 12:26:44 2018 +0000
@@ -238,3 +238,4 @@
 51e0d0e9566b3a1e0e7e08e8bd089b77ae779688 0 iEYEABECAAYFAlukneUACgkQCX/oGf+2qkP8ngCgiC3Jo4cDL8F35HXpqHL3QtD46kUAn0znm6h/Ad3r0f/rJXf6dJli+zjK
 6a52d785570ecc2a63ba164aa50efa0b463917bd 0 iEYEABECAAYFAlvXCzAACgkQCX/oGf+2qkP3xQCgqKlwdDqMVRAsTFoEwi8gK16UtRIAnRVH6VaLpC/Yh7OgsjpO+rzj9AKp
 858933b8d4f0bd4ee7e278e2530a1b476a8e4fa9 0 iEYEABECAAYFAlv74bwACgkQCX/oGf+2qkNQCwCgl168atYYGOuVSkFeqvY6bAXC3m8An1eBFNK0jTdGC1TSahJ2gyQu/GOe
+75b4bc3d1f6f172a24506f5f72ce3137fa23aa7b 0 iF0EABECAB0WIQQwlWrRXxlUdnEi7O8Jf+gZ/7aqQwUCXA380QAKCRAJf+gZ/7aqQz70AKCz/O6ZFoJ9ewfn1JayCUThy5+mrQCeMkwewiAYcsfmFxp16XA497wv158=
--- a/.hgtags	Mon Dec 10 16:29:15 2018 +0100
+++ b/.hgtags	Tue Dec 11 12:26:44 2018 +0000
@@ -249,3 +249,4 @@
 2f706d7a458e736b7b6add7ca445132c5e0b9758 3.0PR18Q3.1
 b8cd708f773317970a8024f2e5b6c0ea4417e4b5 3.0PR18Q3.2
 5a97b89aa2f1202519525757dcfb699ec267e794 3.0PR18Q3.3
+9a7acd649cfcb6ea234c52263051d7e33e4ce333 3.0PR18Q4