Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 15 Sep 2017 12:42:59 +0200
changeset 32729 7bfe29345cb5
parent 32728 0c8047a2daa3 (current diff)
parent 32424 56162cb1470e (diff)
child 32730 bd3b87f44dea
Merge back from main
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentUtils.java
modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Locator.java
src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java
src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java
--- a/.hgsigs	Fri Sep 15 12:27:06 2017 +0200
+++ b/.hgsigs	Fri Sep 15 12:42:59 2017 +0200
@@ -217,3 +217,4 @@
 74c2ec78cab6580e2c5fd67e4c7913924339df58 0 iEYEABECAAYFAlkdU7MACgkQCX/oGf+2qkMs3wCguelDCm09norUvWOnB7m/+X66yyMAoKr/DzyFXmSZTrlta3cfBpn5BY6v
 0e959ce9b986f2770ac4ac02296a59adaafdc919 0 iEYEABECAAYFAllSJLwACgkQCX/oGf+2qkOkKACfWiWW37hMTW9d4fneU+4JJsG//LYAoLkOPDVyEZCTY/IpOEuXT0hHKE9e
 4bad64e9d7577310506e2e19cacba696ed703ad6 0 iEYEABECAAYFAlmKpMUACgkQCX/oGf+2qkNGywCgobMSxQWqAp5l5HsKqlQMPn8GkNsAoOBNizvazzb9wRiYA1/57ntgR253
+9e6056c0e38e4355acf8d72a8efab6575c7f9733 0 iEYEABECAAYFAlm40qMACgkQCX/oGf+2qkPKxgCgndqN2CnOSnbnZEsQntY+mUaqZZEAoK6Xl9Q4HbgHep6JG/owLOzyehRK
--- a/.hgtags	Fri Sep 15 12:27:06 2017 +0200
+++ b/.hgtags	Fri Sep 15 12:42:59 2017 +0200
@@ -228,3 +228,4 @@
 7fd66b51c666e341168a7e5a036f7ac25a86eec9 3.0PR17Q2
 c37991aee21566d0ed397369377abdaeaf1a6f52 3.0PR17Q2.1
 632ba9b2ee8c8133be5b483482d3d99a83b4138f 3.0PR17Q2.2
+7fafd2a9f24bd0d5889253005412101631cc1efe 3.0PR17Q2.3