details: https://code.openbravo.com/erp/devel/main/rev/bdbc4e96cb77 changeset: 19417:bdbc4e96cb77 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Jan 24 00:29:43 2013 +0100 summary: Related to issue 22874: Implement rich and masked text field First implementation
details: https://code.openbravo.com/erp/devel/main/rev/15b14b0cb32f changeset: 19418:15b14b0cb32f user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 24 04:59:11 2013 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/e63fe66b6000 changeset: 19419:e63fe66b6000 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 24 07:07:18 2013 +0100 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/7b90716e2170 changeset: 19420:7b90716e2170 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Jan 24 11:44:21 2013 +0530 summary: Related to Issue 22750 : Back out changes Backout all changes done related to this issue. details: https://code.openbravo.com/erp/devel/main/rev/3e42b5ba12da changeset: 19421:3e42b5ba12da user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Thu Jan 24 10:44:35 2013 +0100 summary: Fixes issue 22795: G/L Journal lines window takes long time to load due to two combo boxes with a huge amount of data details: https://code.openbravo.com/erp/devel/main/rev/388822223199 changeset: 19422:388822223199 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Jan 24 10:58:21 2013 +0100 summary: Related to issue 22874: Implement rich and masked text field Solved small db model issues details: https://code.openbravo.com/erp/devel/main/rev/0748646d63bb changeset: 19423:0748646d63bb user: Jon Alegría <jon.alegria <at> openbravo.com> date: Thu Jan 24 11:40:04 2013 +0100 summary: Fixes issue 0022783: Error in "Generate Payment" process details: https://code.openbravo.com/erp/devel/main/rev/83103c66d7ac changeset: 19424:83103c66d7ac user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Jan 24 11:50:58 2013 +0100 summary: Fixes issue 22416: Wrong payment details distribution, when invoice amount is higher than pre-payment amount. details: https://code.openbravo.com/erp/devel/main/rev/7814d070ffe3 changeset: 19425:7814d070ffe3 user: Jon Alegría <jon.alegria <at> openbravo.com> date: Thu Jan 24 12:08:50 2013 +0100 summary: Fixes issue 0022864: Wrong bracket on existsTransactions function in CostingRuleProcess.java details: https://code.openbravo.com/erp/devel/main/rev/8e07931c30b9 changeset: 19426:8e07931c30b9 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Jan 24 11:04:36 2013 +0100 summary: Fixes Issue 19567: When Posting, checks if a Payment Schedule Detail is an adjust between an Order and an Invoice, and if so, merges it with another line. details: https://code.openbravo.com/erp/devel/main/rev/918cc7183ad6 changeset: 19427:918cc7183ad6 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Jan 24 12:09:48 2013 +0100 summary: Fixes Issue 22870. Reverts previous change. details: https://code.openbravo.com/erp/devel/main/rev/339f82efc76c changeset: 19428:339f82efc76c user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Thu Jan 24 12:53:13 2013 +0100 summary: Fixes issue 22814: In prepayments against invoices, no generate double posting if BP receivables account and BP prepayment account are the same details: https://code.openbravo.com/erp/devel/main/rev/fbbe21bdfeff changeset: 19429:fbbe21bdfeff user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 24 21:21:35 2013 +0100 summary: CI: update AD_MODULE to version 19428 diffstat: .hgsigs | 1 + .hgtags | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 32 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 6 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 77 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 2 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js | 155 +++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 35 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/model/tables/OBCLKER_REF_MASK.xml | 59 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml | 388 ++++++++++ modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_ELEMENT.xml | 25 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_FIELD.xml | 192 ++++ modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_REFERENCE.xml | 47 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TAB.xml | 26 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TABLE.xml | 20 + modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml | 20 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/MaskedStringUIDefinition.java | 43 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/RichTextUIDefinition.java | 57 + modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/sourcedata/AD_COLUMN.xml | 3 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 14 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 19 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 41 + src-util/modulescript/src/org/openbravo/modulescript/InitializeAcctDimensionsInClient_data.xsql | 4 +- src/org/openbravo/costing/CostingRuleProcess.java | 4 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html | 33 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 81 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 77 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 62 +- 74 files changed, 1525 insertions(+), 174 deletions(-) diffs (truncated from 2993 to 300 lines): diff -r 6c1c82b172f4 -r fbbe21bdfeff .hgsigs --- a/.hgsigs Wed Jan 23 18:16:09 2013 +0100 +++ b/.hgsigs Thu Jan 24 21:21:35 2013 +0100 @@ -99,3 +99,4 @@ 0de4d6a8de6d8676576cd03417b6e3cab9a7b78d 0 iEYEABECAAYFAlD+H7EACgkQCX/oGf+2qkMMSwCbBFZ24/VJnVdauBgZ4gIebPe9tB8AnA9F03aZPEkc27RXoFC7NfVSxt3B 21ee53026babfbaa1acea42273889c2d292eb5b6 0 iEYEABECAAYFAlD2CwAACgkQCX/oGf+2qkMs8QCePue6nyUSbeurM9ltNo/cb3k0vA0An2JJzndMdd/1MAurX6DfEGCTo9Uj 9fe1637c98a6cc490582445af850cc06b3e34a8e 0 iEYEABECAAYFAlD39dUACgkQCX/oGf+2qkMB5gCg/czNu6dng2nZxXKFiyTiuXHl0/IAoPKktgGNoj8crEuTaYuCrpYCtLTA +b495316d385b5256fb3384d0c00d05e6e2eacf18 0 iEYEABECAAYFAlD/hhQACgkQCX/oGf+2qkNLsQCg5D7WvT3vF3tzs+LFk/nUZ6tSKHgAnjxJmaE7z0f0LWCD+ejguy0eDBJf diff -r 6c1c82b172f4 -r fbbe21bdfeff .hgtags --- a/.hgtags Wed Jan 23 18:16:09 2013 +0100 +++ b/.hgtags Thu Jan 24 21:21:35 2013 +0100 @@ -110,3 +110,4 @@ 4023ea37e5619c3cd75559e1795a2609a5f97088 3.0MP18.3 f6d77303909a01da297ca96e5c23f8de1106eb0b 3.0MP19 964842f76d10b1752cfa63b69c370deb668abe4c 3.0MP19.1 +aaf6f469e183fe0ecaacc003f08d7c1879e64357 3.0MP19.2 diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Thu Jan 24 21:21:35 2013 +0100 @@ -427,7 +427,7 @@ --When difference amount is not 0 the payment schedule detail of the order has to be split. The difference --amount is the amount of the new psd that is not related to any invoice. - IF (v_differenceamount <> 0) THEN + IF (v_differenceamount > 0) THEN v_new_scheduledetailid := get_uuid(); INSERT INTO fin_payment_scheduledetail ( diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Jan 24 21:21:35 2013 +0100 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19395]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19428]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Jan 24 21:21:35 2013 +0100 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19395]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19428]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19395]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19428]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Thu Jan 24 21:21:35 2013 +0100 @@ -264,7 +264,7 @@ description.append(strRefundCredit).append("\n"); String truncateDescription = (description.length() > 255) ? description - .substring(0, 252).concat("...").toString() : description.toString(); + .substring(0, 251).concat("...").toString() : description.toString(); payment.setDescription(truncateDescription); } diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Thu Jan 24 21:21:35 2013 +0100 @@ -51,6 +51,7 @@ import org.openbravo.dal.security.OrganizationStructureProvider; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; import org.openbravo.data.FieldProvider; import org.openbravo.erpCommon.utility.FieldProviderFactory; import org.openbravo.erpCommon.utility.OBDateUtils; @@ -67,6 +68,7 @@ import org.openbravo.model.common.invoice.Invoice; import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount; import org.openbravo.model.financialmgmt.payment.FIN_Payment; +import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail; import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod; import org.openbravo.model.financialmgmt.payment.FIN_PaymentProposal; import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule; @@ -1165,4 +1167,34 @@ OBContext.restorePreviousMode(); } } + + /** + * Returns Payment Details from a Payment ordered by Invoice and Order + */ + public static List<FIN_PaymentDetail> getOrderedPaymentDetailList(FIN_Payment payment) { + + List<FIN_PaymentDetail> pdList = null; + + OBContext.setAdminMode(); + try { + final StringBuilder whereClause = new StringBuilder(); + whereClause.append(" as pd "); + whereClause.append(" left join pd." + FIN_PaymentDetail.PROPERTY_FINPAYMENTSCHEDULEDETAILLIST + + " as psd"); + whereClause.append(" where pd." + FIN_PaymentDetail.PROPERTY_FINPAYMENT + ".id = '" + + payment.getId() + "'"); + whereClause.append(" order by psd." + + FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE); + whereClause.append(", psd." + FIN_PaymentScheduleDetail.PROPERTY_ORDERPAYMENTSCHEDULE); + + OBQuery<FIN_PaymentDetail> query = OBDal.getInstance().createQuery(FIN_PaymentDetail.class, + whereClause.toString()); + pdList = query.list(); + + } finally { + OBContext.restorePreviousMode(); + } + + return pdList; + } } diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Jan 24 21:21:35 2013 +0100 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19395]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19428]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Jan 24 21:21:35 2013 +0100 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.19395]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.19428]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml Thu Jan 24 21:21:35 2013 +0100 @@ -5865,7 +5865,7 @@ <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> -<!--CD3A95C8A05D45A0A2B6D250E9C83170--> <POSITION><![CDATA[51]]></POSITION> +<!--CD3A95C8A05D45A0A2B6D250E9C83170--> <POSITION><![CDATA[52]]></POSITION> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--CD3A95C8A05D45A0A2B6D250E9C83170--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml Thu Jan 24 21:21:35 2013 +0100 @@ -2148,7 +2148,8 @@ <!--87DDE03149A94326BE55DC158625D244--> <AD_COLUMN_ID><![CDATA[B2DDC4BECBF24431AB1940C2A38F9C54]]></AD_COLUMN_ID> <!--87DDE03149A94326BE55DC158625D244--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--87DDE03149A94326BE55DC158625D244--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--87DDE03149A94326BE55DC158625D244--> <DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ = 'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14']]></DISPLAYLOGIC> +<!--87DDE03149A94326BE55DC158625D244--> <DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ = 'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14' | +@OBUIAPP_Field_Reference@ = '7CB371C13D204EB69BF370217F692999']]></DISPLAYLOGIC> <!--87DDE03149A94326BE55DC158625D244--> <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH> <!--87DDE03149A94326BE55DC158625D244--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--87DDE03149A94326BE55DC158625D244--> <SEQNO><![CDATA[62]]></SEQNO> @@ -2682,7 +2683,8 @@ <!--B79252A201AA41C091F9498DF820A0AC--> <AD_COLUMN_ID><![CDATA[1A96C47A27AC49D7BEA41E57BBD59948]]></AD_COLUMN_ID> <!--B79252A201AA41C091F9498DF820A0AC--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--B79252A201AA41C091F9498DF820A0AC--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--B79252A201AA41C091F9498DF820A0AC--> <DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ = 'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14']]></DISPLAYLOGIC> +<!--B79252A201AA41C091F9498DF820A0AC--> <DISPLAYLOGIC><![CDATA[@OBUIAPP_Field_Reference@ = 'FF8080813123BF670131241C2BB30012' | @OBUIAPP_Field_Reference@ = '14'| +@OBUIAPP_Field_Reference@ = '7CB371C13D204EB69BF370217F692999' ]]></DISPLAYLOGIC> <!--B79252A201AA41C091F9498DF820A0AC--> <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH> <!--B79252A201AA41C091F9498DF820A0AC--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--B79252A201AA41C091F9498DF820A0AC--> <SEQNO><![CDATA[64]]></SEQNO> diff -r 6c1c82b172f4 -r fbbe21bdfeff modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Wed Jan 23 18:16:09 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Thu Jan 24 21:21:35 2013 +0100 @@ -541,6 +541,17 @@ <!--6504DF0738A142D599C824644653BA88--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--6504DF0738A142D599C824644653BA88--></AD_MESSAGE> +<!--66D4232BC6894DCEB71DAB06F9757BB3--><AD_MESSAGE> +<!--66D4232BC6894DCEB71DAB06F9757BB3--> <AD_MESSAGE_ID><![CDATA[66D4232BC6894DCEB71DAB06F9757BB3]]></AD_MESSAGE_ID> +<!--66D4232BC6894DCEB71DAB06F9757BB3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--66D4232BC6894DCEB71DAB06F9757BB3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--66D4232BC6894DCEB71DAB06F9757BB3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--66D4232BC6894DCEB71DAB06F9757BB3--> <VALUE><![CDATA[OBUIAPP_MakeSelectionBold]]></VALUE> +<!--66D4232BC6894DCEB71DAB06F9757BB3--> <MSGTEXT><![CDATA[Make Selection Bold]]></MSGTEXT> +<!--66D4232BC6894DCEB71DAB06F9757BB3--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--66D4232BC6894DCEB71DAB06F9757BB3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--66D4232BC6894DCEB71DAB06F9757BB3--></AD_MESSAGE> + <!--675524506E80458799E39F8CC309CBFD--><AD_MESSAGE> <!--675524506E80458799E39F8CC309CBFD--> <AD_MESSAGE_ID><![CDATA[675524506E80458799E39F8CC309CBFD]]></AD_MESSAGE_ID> <!--675524506E80458799E39F8CC309CBFD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -552,6 +563,17 @@ <!--675524506E80458799E39F8CC309CBFD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--675524506E80458799E39F8CC309CBFD--></AD_MESSAGE> +<!--67995E233DA64EDE9029395E900C21ED--><AD_MESSAGE> +<!--67995E233DA64EDE9029395E900C21ED--> <AD_MESSAGE_ID><![CDATA[67995E233DA64EDE9029395E900C21ED]]></AD_MESSAGE_ID> +<!--67995E233DA64EDE9029395E900C21ED--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--67995E233DA64EDE9029395E900C21ED--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--67995E233DA64EDE9029395E900C21ED--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--67995E233DA64EDE9029395E900C21ED--> <VALUE><![CDATA[OBUIAPP_MakeSelectionItalic]]></VALUE> +<!--67995E233DA64EDE9029395E900C21ED--> <MSGTEXT><![CDATA[Make Selection Italic]]></MSGTEXT> +<!--67995E233DA64EDE9029395E900C21ED--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--67995E233DA64EDE9029395E900C21ED--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--67995E233DA64EDE9029395E900C21ED--></AD_MESSAGE> + <!--6831E84EB2124F08B3FCEF6F50CF8AD1--><AD_MESSAGE> <!--6831E84EB2124F08B3FCEF6F50CF8AD1--> <AD_MESSAGE_ID><![CDATA[6831E84EB2124F08B3FCEF6F50CF8AD1]]></AD_MESSAGE_ID> <!--6831E84EB2124F08B3FCEF6F50CF8AD1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -674,6 +696,17 @@ <!--7ACEA04C52F349C08E1157F64262ECC9--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--7ACEA04C52F349C08E1157F64262ECC9--></AD_MESSAGE> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--><AD_MESSAGE> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <AD_MESSAGE_ID><![CDATA[7E82DFE4E6964861B0B9A8AA968E5AC7]]></AD_MESSAGE_ID> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <VALUE><![CDATA[OBUIAPP_SetFontSize]]></VALUE> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <MSGTEXT><![CDATA[Set Font Size]]></MSGTEXT> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--7E82DFE4E6964861B0B9A8AA968E5AC7--></AD_MESSAGE> + <!--7E8A12D43C0D404F868CE36DB349C9FC--><AD_MESSAGE> <!--7E8A12D43C0D404F868CE36DB349C9FC--> <AD_MESSAGE_ID><![CDATA[7E8A12D43C0D404F868CE36DB349C9FC]]></AD_MESSAGE_ID> <!--7E8A12D43C0D404F868CE36DB349C9FC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -719,6 +752,17 @@ <!--822D5C3E1A014738B4D39BF2BF568C7C--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--822D5C3E1A014738B4D39BF2BF568C7C--></AD_MESSAGE> +<!--839DDEEC373B4151BC1C721AB90FB5AC--><AD_MESSAGE> +<!--839DDEEC373B4151BC1C721AB90FB5AC--> <AD_MESSAGE_ID><![CDATA[839DDEEC373B4151BC1C721AB90FB5AC]]></AD_MESSAGE_ID> +<!--839DDEEC373B4151BC1C721AB90FB5AC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--839DDEEC373B4151BC1C721AB90FB5AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--839DDEEC373B4151BC1C721AB90FB5AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--839DDEEC373B4151BC1C721AB90FB5AC--> <VALUE><![CDATA[OBUIAPP_SetFont]]></VALUE> +<!--839DDEEC373B4151BC1C721AB90FB5AC--> <MSGTEXT><![CDATA[Set Font]]></MSGTEXT> +<!--839DDEEC373B4151BC1C721AB90FB5AC--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--839DDEEC373B4151BC1C721AB90FB5AC--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--839DDEEC373B4151BC1C721AB90FB5AC--></AD_MESSAGE> + <!--888D0AF770AE4037B85120FB775FE038--><AD_MESSAGE> <!--888D0AF770AE4037B85120FB775FE038--> <AD_MESSAGE_ID><![CDATA[888D0AF770AE4037B85120FB775FE038]]></AD_MESSAGE_ID> <!--888D0AF770AE4037B85120FB775FE038--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -873,6 +917,17 @@ <!--A57B3DD733264DB1BB3D6F84EA104931--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--A57B3DD733264DB1BB3D6F84EA104931--></AD_MESSAGE> +<!--A62959A6990A43089EEBDF89CE8FCC48--><AD_MESSAGE> +<!--A62959A6990A43089EEBDF89CE8FCC48--> <AD_MESSAGE_ID><![CDATA[A62959A6990A43089EEBDF89CE8FCC48]]></AD_MESSAGE_ID> +<!--A62959A6990A43089EEBDF89CE8FCC48--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A62959A6990A43089EEBDF89CE8FCC48--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A62959A6990A43089EEBDF89CE8FCC48--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A62959A6990A43089EEBDF89CE8FCC48--> <VALUE><![CDATA[OBUIAPP_MakeSelectionUnderlined]]></VALUE> +<!--A62959A6990A43089EEBDF89CE8FCC48--> <MSGTEXT><![CDATA[Make Selection Underlined]]></MSGTEXT> +<!--A62959A6990A43089EEBDF89CE8FCC48--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--A62959A6990A43089EEBDF89CE8FCC48--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--A62959A6990A43089EEBDF89CE8FCC48--></AD_MESSAGE> + <!--ABFDBB83F58841EA9545D9ED8637513B--><AD_MESSAGE> <!--ABFDBB83F58841EA9545D9ED8637513B--> <AD_MESSAGE_ID><![CDATA[ABFDBB83F58841EA9545D9ED8637513B]]></AD_MESSAGE_ID> <!--ABFDBB83F58841EA9545D9ED8637513B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1072,6 +1127,17 @@ <!--CE3E9A8711D54E719F02630BE8D5E2FB--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--CE3E9A8711D54E719F02630BE8D5E2FB--></AD_MESSAGE> +<!--CF668C49E43D4FA799A43191EA10C17A--><AD_MESSAGE> +<!--CF668C49E43D4FA799A43191EA10C17A--> <AD_MESSAGE_ID><![CDATA[CF668C49E43D4FA799A43191EA10C17A]]></AD_MESSAGE_ID> +<!--CF668C49E43D4FA799A43191EA10C17A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--CF668C49E43D4FA799A43191EA10C17A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--CF668C49E43D4FA799A43191EA10C17A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--CF668C49E43D4FA799A43191EA10C17A--> <VALUE><![CDATA[OBUIAPP_SetHyperlinkURL]]></VALUE> +<!--CF668C49E43D4FA799A43191EA10C17A--> <MSGTEXT><![CDATA[Set Hyperlink URL]]></MSGTEXT> +<!--CF668C49E43D4FA799A43191EA10C17A--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--CF668C49E43D4FA799A43191EA10C17A--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--CF668C49E43D4FA799A43191EA10C17A--></AD_MESSAGE> + <!--D109B6F7D8BF4F5C9D84463CD36BF434--><AD_MESSAGE> <!--D109B6F7D8BF4F5C9D84463CD36BF434--> <AD_MESSAGE_ID><![CDATA[D109B6F7D8BF4F5C9D84463CD36BF434]]></AD_MESSAGE_ID> <!--D109B6F7D8BF4F5C9D84463CD36BF434--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1160,6 +1226,17 @@ <!--E20A23145D554996A09BC927B847F3BB--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E20A23145D554996A09BC927B847F3BB--></AD_MESSAGE> ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
