Merge temporary head for 3.0MP21.1
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 17 May 2013 08:19:55 +0000
changeset 20289 db23e74594b1
parent 20268 15df1ef7cde7 (current diff)
parent 20288 684f9428d55e (diff)
child 20307 519ac2052067
child 20425 6fd6890ab7cd
Merge temporary head for 3.0MP21.1
.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.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.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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
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/model/functions/M_INOUT_POST.xml
src-db/database/model/triggers/M_INOUTLINE_TRG.xml
src-db/database/model/triggers/M_INOUT_TRG_PROV.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/dal/xml/EntityResolver.java
src/org/openbravo/event/MInOutLineEventHandler.java
src/org/openbravo/service/rest/DalWebService.java
--- a/.hgsigs	Mon May 06 16:41:34 2013 +0000
+++ b/.hgsigs	Fri May 17 08:19:55 2013 +0000
@@ -106,6 +106,7 @@
 cd9fe4727ba89b6fc108d9e7e48cc222c24016e4 0 iEYEABECAAYFAlEkZrgACgkQCX/oGf+2qkNMEgCfVeNFe/nvgxNXwEUvbbIp6tqdAJ0AoK+83WD/fS6bRKK2xEgc5gwYlFJP
 2eb40756a1ed20c690c9158cd84aa62ea34ac339 0 iEYEABECAAYFAlEjW+AACgkQCX/oGf+2qkNupQCgz0W/xoRPzBsfhdSFgcD+vJy9aPAAoNfJeFhJ+psPdkmsZmz8fYvRg8DT
 1983af93019a75c0f0b130181b3ed8bb7d83bd8c 0 iEYEABECAAYFAlE42u0ACgkQCX/oGf+2qkNZQgCeKbV0dJ/m8Mcri1w7Xw3bB2dzAU0An02XW44EzaErkug0oKK6bkYmDmRA
+2f9499693ed7c3ddec2c3ba8857c23fed83a7312 0 iEYEABECAAYFAlGTRMwACgkQCX/oGf+2qkNSggCeKaVwdDklBr+nNouJLIQmEY0veVMAoNLfU94cIPAUBl8L2+auknM1IuUx
 d7e04c9b010fd0b52464f9b846278b415ff066cc 0 iEYEABECAAYFAlFrxIQACgkQCX/oGf+2qkPu7ACgofS8PV7CLsmpDNO8nNMkrs++JIcAoL69XxrlYHRfCM6aue8q5srbLm/R
 bea15e1decb29501b4124110009787f2dca70cf9 0 iEYEABECAAYFAlFue8kACgkQCX/oGf+2qkMvfACgjbPubrgVAbVnotRRgGAgQancNqsAoMRke06L5J+RtPYdeU3wRSx2YNqt
 dc219eb12d7e3a434b4d3151a93597d5292f2c06 0 iEYEABECAAYFAlGCVCkACgkQCX/oGf+2qkPi6gCeJKtfZ58WQOqlRHoY0X3K+6yxpwcAoJr+iFJrxNhzylyJuAiZx1Ewsdti
--- a/.hgtags	Mon May 06 16:41:34 2013 +0000
+++ b/.hgtags	Fri May 17 08:19:55 2013 +0000
@@ -117,6 +117,7 @@
 42352a2a7b5be48801784583817c082e2ec11af2 3.0MP19.4
 60f345bac02b65b2e09ad4e540c70875197ce76f 3.0MP20
 79ef7f4b625d71d1c8a6520648e528f9a722ab60 3.0MP21
+6a7b86469daac4468fd0897a233fbc401a34e1ab 3.0MP21.1
 383173cf8e316d135eb0d216ab091602955b1daf 3.0MP22
 ce76fa45acc0de59a2743e001aa3e00764b9b7b1 3.0MP22.1
 56826f5230e456121cf043d90513707beaf6b473 3.0MP22.2