Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 18 May 2017 07:49:54 +0200
changeset 32161 faab1831aea1
parent 32160 b069f040ba10 (current diff)
parent 31804 36766fd9b2cc (diff)
child 32162 383058dac569
Merge back from main
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.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_COLUMN.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Wed May 17 21:46:10 2017 +0200
+++ b/.hgsigs	Thu May 18 07:49:54 2017 +0200
@@ -211,3 +211,4 @@
 a131c85d1d3d55b852f97622ce068baf80b7fe67 0 iEYEABECAAYFAli+qu8ACgkQCX/oGf+2qkNTOACfTznbhwkwUplXd8QjHIuJ7uBJdK4An3KWtbUrBZleCwS1xH3aa2n9p9bM
 ff9ea5ead18501d3c6d2f782e38e172be08f8106 0 iEYEABECAAYFAlkDMfYACgkQCX/oGf+2qkPbaACfXUmwNxLBVRvD7cvYA4LinaJkUzAAoI5N7GpMTNy/NYMXetEOhuwPfSO5
 3a7510a5ee0b43ac0a65e4eae9b089f42158bbe0 0 iEYEABECAAYFAljGfFgACgkQCX/oGf+2qkOgoQCgx3u3UhiV8NyyiBZLsFjlwicCp1EAoPAl4mZZ6/wURPq39Ef6Rtbe1BRb
+835355e0fdbd35df49b4b559a4ce984192350fd2 0 iEYEABECAAYFAlkVX0kACgkQCX/oGf+2qkMVEQCfasQyxkrJdtvkEP03xKFyiwAi2f0AnRRguCtQ0qKkra8Kg55F7/9oKS7p
--- a/.hgtags	Wed May 17 21:46:10 2017 +0200
+++ b/.hgtags	Thu May 18 07:49:54 2017 +0200
@@ -222,3 +222,4 @@
 eaeb76d8cd4ec1caf5bf43bc9b4111424d799a03 3.0PR16Q4.3
 3995bf60960bff841f256fa98746aa6aa0f642f2 3.0PR16Q4.4
 273c24deef8f21e870cf563073cc653582a9fe9e 3.0PR17Q1
+10c0ffee4e6ccca6771d151dd27f706e50cf4b96 3.0PR17Q1.1