Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 03 May 2017 12:25:25 +0200
changeset 32049 fe0d2aa9d5c1
parent 32048 ae4c54d915ad (current diff)
parent 31787 669cc2e8812e (diff)
child 32050 d9446ef6dac0
Merge back from main
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
src-db/database/model/functions/C_INVOICE_POST.xml
src-db/database/model/functions/C_ORDER_POST1.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Tue May 02 09:27:56 2017 +0200
+++ b/.hgsigs	Wed May 03 12:25:25 2017 +0200
@@ -209,4 +209,5 @@
 fa51600e25b24b2eb3739898d293168ea94748a7 0 iEYEABECAAYFAlh/u8wACgkQCX/oGf+2qkPTnwCfZ29b107GdizLBcC+tzdP3HlnmUUAoN2kMLXvfTYSRLAQG/ziGm5P6kYA
 9753e90ea3e81f850f904feb531120b4e185394a 0 iEYEABECAAYFAliG6A8ACgkQCX/oGf+2qkPeeQCg6D9p++eslvzqEVlYK8RS0uzgZNsAoMELVWkte/AM/ilPxZ4vP37myscv
 a131c85d1d3d55b852f97622ce068baf80b7fe67 0 iEYEABECAAYFAli+qu8ACgkQCX/oGf+2qkNTOACfTznbhwkwUplXd8QjHIuJ7uBJdK4An3KWtbUrBZleCwS1xH3aa2n9p9bM
+ff9ea5ead18501d3c6d2f782e38e172be08f8106 0 iEYEABECAAYFAlkDMfYACgkQCX/oGf+2qkPbaACfXUmwNxLBVRvD7cvYA4LinaJkUzAAoI5N7GpMTNy/NYMXetEOhuwPfSO5
 3a7510a5ee0b43ac0a65e4eae9b089f42158bbe0 0 iEYEABECAAYFAljGfFgACgkQCX/oGf+2qkOgoQCgx3u3UhiV8NyyiBZLsFjlwicCp1EAoPAl4mZZ6/wURPq39Ef6Rtbe1BRb
--- a/.hgtags	Tue May 02 09:27:56 2017 +0200
+++ b/.hgtags	Wed May 03 12:25:25 2017 +0200
@@ -220,4 +220,5 @@
 b93f495b2cde680cf6558d93d72051429f4b9031 3.0PR16Q4.1
 31c79a32ce3a6b555dadb35c70d63113be6312e7 3.0PR16Q4.2
 eaeb76d8cd4ec1caf5bf43bc9b4111424d799a03 3.0PR16Q4.3
+3995bf60960bff841f256fa98746aa6aa0f642f2 3.0PR16Q4.4
 273c24deef8f21e870cf563073cc653582a9fe9e 3.0PR17Q1