Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 02 Nov 2012 13:56:59 +0100
changeset 18444 3b7ece7dc2c1
parent 18443 9238a973578d (current diff)
parent 18417 c364b51afd87 (diff)
child 18445 0e5a0a310e6e
Merge back from main
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
referencedata/sampledata/F_B_International_Group.xml
referencedata/sampledata/QA_Testing.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-db/database/sourcedata/AD_PROCESS_PARA.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/.hgsigs	Fri Nov 02 12:04:04 2012 +0100
+++ b/.hgsigs	Fri Nov 02 13:56:59 2012 +0100
@@ -84,4 +84,6 @@
 18d1c926f607a207a86f39f4cb0477d7abaea231 0 iEYEABECAAYFAlCITCEACgkQCX/oGf+2qkMxggCg0SsDTC/8I/S7f7HTRlKS8ZtABzwAoOiVWjBJkbhwi7ZxJDEVQA1E/6aH
 7643bde3a4855fc35ddf7269a221ba0e77863a75 0 iEYEABECAAYFAlBgQyAACgkQCX/oGf+2qkNE2ACfb7Xzd4dq5VTeUnFo9VSsPqoQHtsAn063Puz1dhXpBsvhgkpbDV7fXiR6
 2680cddd9aca96f87a83156d3ca27935a692dfb3 0 iEYEABECAAYFAlBsebEACgkQCX/oGf+2qkMexACdFPyyCM6bMSTiXilJF9M61iXNBQ4AnAwzonIXgFkr4tyY1WHa+PGw3caA
+12914c7ff338d71cdb942a1222174e6afa8771b2 0 iEYEABECAAYFAlCO6PcACgkQCX/oGf+2qkMl/wCfRObV0QOmE8SyyLxPPehcVX51Ho8AmwaEYe6MQiQDKgTY6rm/XMlBvBRa
 aee16f41346874b9e355af6007df8df57b7f0266 0 iEYEABECAAYFAlBut3kACgkQCX/oGf+2qkPE8gCaAyk5dQSNyoOSpzPeOEtOLBhrF0MAn3XWPPVJ1Pb7vCei3oE3aQ8Ctj9o
+99f8eda49e53a4782416f5b18442945c4b5e63b5 0 iEYEABECAAYFAlCRrN8ACgkQCX/oGf+2qkOAJQCdGW7u6kmDrbDAerqPP8WEjveCCA8AoKnuoxJ0oG4YoECyXIAAFwQPVR+/
--- a/.hgtags	Fri Nov 02 12:04:04 2012 +0100
+++ b/.hgtags	Fri Nov 02 13:56:59 2012 +0100
@@ -95,4 +95,6 @@
 91fb79467af4f71728e776b69dd1092dab8b2b5f 3.0MP14.2
 bf2e6628cebd62b56796fe8433c35378d516e375 3.0MP15
 fa0e90f7e9eed2e99536b6c372a15a2448c03d06 3.0MP15.1
+dd22f6b9902296a7d3f48b871fc8436ef20fdfdc 3.0MP15.2
 1cd80d4b32bbafca742ca1406fee082f97f5f254 3.0MP16
+84deb08844286485e5f948cdf06cec2ea727eddf 3.0MP16.1