Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 26 May 2017 11:45:00 +0200
changeset 32226 76ff37e5c6e8
parent 32225 13966655c3a8 (current diff)
parent 31820 be15134963d3 (diff)
child 32227 1ee70113bdc4
Merge back from main
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-onchange-functions.js
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
src-db/database/model/functions/C_INVOICE_POST.xml
src-db/database/model/functions/C_ORDER_POST1.xml
src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql
--- a/.hgsigs	Thu May 25 13:16:54 2017 -0400
+++ b/.hgsigs	Fri May 26 11:45:00 2017 +0200
@@ -212,3 +212,4 @@
 ff9ea5ead18501d3c6d2f782e38e172be08f8106 0 iEYEABECAAYFAlkDMfYACgkQCX/oGf+2qkPbaACfXUmwNxLBVRvD7cvYA4LinaJkUzAAoI5N7GpMTNy/NYMXetEOhuwPfSO5
 3a7510a5ee0b43ac0a65e4eae9b089f42158bbe0 0 iEYEABECAAYFAljGfFgACgkQCX/oGf+2qkOgoQCgx3u3UhiV8NyyiBZLsFjlwicCp1EAoPAl4mZZ6/wURPq39Ef6Rtbe1BRb
 835355e0fdbd35df49b4b559a4ce984192350fd2 0 iEYEABECAAYFAlkVX0kACgkQCX/oGf+2qkMVEQCfasQyxkrJdtvkEP03xKFyiwAi2f0AnRRguCtQ0qKkra8Kg55F7/9oKS7p
+74c2ec78cab6580e2c5fd67e4c7913924339df58 0 iEYEABECAAYFAlkdU7MACgkQCX/oGf+2qkMs3wCguelDCm09norUvWOnB7m/+X66yyMAoKr/DzyFXmSZTrlta3cfBpn5BY6v
--- a/.hgtags	Thu May 25 13:16:54 2017 -0400
+++ b/.hgtags	Fri May 26 11:45:00 2017 +0200
@@ -223,3 +223,4 @@
 3995bf60960bff841f256fa98746aa6aa0f642f2 3.0PR16Q4.4
 273c24deef8f21e870cf563073cc653582a9fe9e 3.0PR17Q1
 10c0ffee4e6ccca6771d151dd27f706e50cf4b96 3.0PR17Q1.1
+7fd66b51c666e341168a7e5a036f7ac25a86eec9 3.0PR17Q2