Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 18 Jul 2014 11:56:39 +0200
changeset 24126 a87a28d7b2ca
parent 24125 bbb998610a90 (current diff)
parent 23970 77b6251af841 (diff)
child 24127 fb05bf3da92e
Merge back from main
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
src-db/database/model/functions/C_INVOICE_CREATE.xml
src-db/database/model/tables/AD_PREFERENCE.xml
src-db/database/model/tables/M_RESERVATION.xml
src-db/database/model/tables/M_RESERVATION_STOCK.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports.xml
--- a/.hgsigs	Thu Jul 17 14:42:48 2014 +0530
+++ b/.hgsigs	Fri Jul 18 11:56:39 2014 +0200
@@ -151,3 +151,4 @@
 7de34ade782eae3f74b2df2471292e0da145eb47 0 iEYEABECAAYFAlN95g4ACgkQCX/oGf+2qkO62ACg74llt2Ngb7UyteX/drSuZ6/U8mIAn2I3sFYMtTZ3jzjR5zGOJ3M8/Ah0
 e6d5de2bb5e230b5a9d6d95489292a8e92de1764 0 iEYEABECAAYFAlOhX0gACgkQCX/oGf+2qkOgGACg3wrp9HA+P7exN/j+Znu5acph2psAn1XulrvCL3RJ0r2iNyeVqaY73OtQ
 79d26cfa1fe16e6ba26251919588218073d8682f 0 iEYEABECAAYFAlOrwz0ACgkQCX/oGf+2qkOPlQCfV15XdSozD91qAF751lOUOH3VwroAn08TYpciEyWBOxsFXend1IUEPsnA
+9607751357e9e3a411c0919759ed81196befcad9 0 iEYEABECAAYFAlPHZVkACgkQCX/oGf+2qkORBQCfZJPiBWcEMNURibADGn9o+u+snwgAoP4ZMSkLCsu4PSf75rZn4gStM4wh
--- a/.hgtags	Thu Jul 17 14:42:48 2014 +0530
+++ b/.hgtags	Fri Jul 18 11:56:39 2014 +0200
@@ -162,3 +162,4 @@
 6b79b2cff11381014860b41d7db9c3835c87069b 3.0PR14Q2.1
 10a75a864b9d99c5f92d913f6d29255a5b0241cb 3.0PR14Q2.2
 623357e87f6cc274e2b75b2eda60d11dd0c593d2 3.0PR14Q2.3
+73f3bc31a2293109ebdc6e5b2f8b3f1870df7528 3.0PR14Q2.4