Merge temporary head for 3.0PR14Q3.7
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 24 Feb 2015 10:57:12 +0000
changeset 26063 20615caa4662
parent 26039 6856352d7235 (current diff)
parent 26062 4233e7217a71 (diff)
child 26064 8b4874747870
Merge temporary head for 3.0PR14Q3.7
.hgsigs
.hgtags
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/utility/CashVATUtil.java
--- a/.hgsigs	Mon Feb 23 03:50:05 2015 +0000
+++ b/.hgsigs	Tue Feb 24 10:57:12 2015 +0000
@@ -161,6 +161,7 @@
 340ffd8d7a9d5f42c216d59bacb99a27253825b0 0 iEYEABECAAYFAlSAMJIACgkQCX/oGf+2qkPCvgCfUWYHrJ/CJAkuUbalTNWcKPdmipEAn0r9uP5bQjzfZG1qg1CqQPqyFeOk
 84cf6c6fe9b1028b39e631dfaa9819525353ac1b 0 iEYEABECAAYFAlSz9ogACgkQCX/oGf+2qkMWZwCdG/tS4LF6c3mnfKN2b/cQUUxyQKAAoIY7jjkcR03KUm1XWZO04hop8NS4
 784c2b3f13bbc448cbdfbe6d3ec39902f1494084 0 iEYEABECAAYFAlTR2L0ACgkQCX/oGf+2qkMXJgCfUMI4/BdRtigj6/OwaZsdtRjrma4An1evjoyeGFw3/TEXf3GISaVl8vfk
+eeb46276317756eba9ce33726a75bdcd84c46dcb 0 iEYEABECAAYFAlTqux0ACgkQCX/oGf+2qkPhjQCfY8oeJAhiwzhK//iw4rMbvWgbnG0AoNYprOSntv5/c4HxkZ3lnERuv6x3
 53cc6ea75bb1d2065e367fa065b540334d4d514d 0 iEYEABECAAYFAlSYSdYACgkQCX/oGf+2qkPl4wCggC4EzYsyVitSyhbL2kWJlTZ2XXcAmwU0F1jbBoVlgyENCdW93qsA/uUF
 8651cad68d86877ad8a90a0f16ce994daca4c2c3 0 iEYEABECAAYFAlTLW8EACgkQCX/oGf+2qkPEPQCghnkxkVcLRQ5txQCvPqDfmX3OpWAAoOt8wvHw9mJLINJfaStIwhdZ062z
 831f7c3e542951b324cd9880b198bb4751bfd251 0 iEYEABECAAYFAlTm9ToACgkQCX/oGf+2qkPpFgCgzIKSAc1CMJoGRySzaUNdjoiyXyUAn2N/WoGlO000oJ6LcEcBldIz3+iT
--- a/.hgtags	Mon Feb 23 03:50:05 2015 +0000
+++ b/.hgtags	Tue Feb 24 10:57:12 2015 +0000
@@ -172,6 +172,7 @@
 fc76bf00588598f913bd9a5bb1d45fdd692548fd 3.0PR14Q3.4
 6861ab13dc527af0dc41945a0d855de511b4c04c 3.0PR14Q3.5
 628cb1400c023f5f5695f896a1a58319ff423289 3.0PR14Q3.6
+949be1b4825e10f4ba7a50216afa19e63d82abcf 3.0PR14Q3.7
 ed3565630685be1107627816bfd88379e174d7a7 3.0PR14Q4
 17ffddb263ab6fcea496938be6eb10b8c5c53729 3.0PR15Q1
 39f3bed2ed0eaa2a7e69a46d7bf417c346e25a6a 3.0PR15Q1.1