details: https://code.openbravo.com/erp/devel/main/rev/feac67d8659e changeset: 16023:feac67d8659e user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Apr 11 12:38:56 2012 +0200 summary: Fixed issue 20234: 'Print' now works ok using Google Chrome 18.x.x.x
details: https://code.openbravo.com/erp/devel/main/rev/affd7607a5f7 changeset: 16024:affd7607a5f7 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Apr 12 16:14:19 2012 +0200 summary: Fixes issue 20241: It is possible to move between records while editing in grid. In the changeset 2e1947ca8bbc, related to issue 19830, a change was done that had a side effect that prevented the user from beign able to move between records while editing the grid when the records were modified. This change has been reverted and it does not have any consequence in issue 19830, because when the backout was done the issue was still not fixed. details: https://code.openbravo.com/erp/devel/main/rev/b557638b8bd4 changeset: 16025:b557638b8bd4 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Apr 12 12:48:06 2012 +0200 summary: fixed bug 20242: Window Personalization removes status bar fields After fix for #19234, isStatusBarField property was deleted and not set back because parentName was already present. Therefore it didn't appear in status bar section. details: https://code.openbravo.com/erp/devel/main/rev/31972a8aecd7 changeset: 16026:31972a8aecd7 user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com> date: Thu Apr 12 12:43:25 2012 +0200 summary: Fixed issue 20251: business partner callout problems have been solved This problem was produced in the refactoring process of the callout. This has been fixed by changing the wrong variable tld to the correct one l details: https://code.openbravo.com/erp/devel/main/rev/4a4cc349c6ba changeset: 16027:4a4cc349c6ba user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Apr 13 12:38:42 2012 +0000 summary: Update AD_MODULE version to 3.0MP10.1 details: https://code.openbravo.com/erp/devel/main/rev/17bc2224a41a changeset: 16028:17bc2224a41a user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Apr 13 12:38:43 2012 +0000 summary: Added tag 3.0MP10.1 for changeset 4a4cc349c6ba details: https://code.openbravo.com/erp/devel/main/rev/6fe07b22a835 changeset: 16029:6fe07b22a835 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Apr 13 12:38:44 2012 +0000 summary: Added signature for changeset 17bc2224a41a details: https://code.openbravo.com/erp/devel/main/rev/83f3c0b230db changeset: 16030:83f3c0b230db user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Apr 16 09:29:52 2012 +0000 summary: Merge temporary head for 3.0MP10.1 diffstat: .hgsigs | 2 + .hgtags | 2 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 --------- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt | 4 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/images/add.png | 0 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/images/view.png | 0 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 7 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +++--- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS_PARA.xml | 1 + src-db/database/sourcedata/AD_VAL_RULE.xml | 11 ++++ 50 files changed, 123 insertions(+), 130 deletions(-) diffs (truncated from 1172 to 300 lines): diff -r 00280ab1ed3a -r 83f3c0b230db .hgsigs --- a/.hgsigs Thu Apr 05 09:43:51 2012 +0000 +++ b/.hgsigs Mon Apr 16 09:29:52 2012 +0000 @@ -62,3 +62,5 @@ 4f5fd4acb98e5fb7ef587debb5ffd20487e2bb32 0 iEYEABECAAYFAk9CRa4ACgkQCX/oGf+2qkPC4ACeJ5HQ20QAW0ULMU/+SUGJvz9YNEYAoJwLMrqwWkt3GuJFyp7TwpULPeKu cab708e2de98b574cc10f344845b7dff184080b6 0 iEYEABECAAYFAk9Pi+oACgkQCX/oGf+2qkP4kwCfT5nGx/E4gn7sZh+d7L5/9JpcplwAoJ5C4WwVNpNaO+tNEx8oMlqdu8mc 1856e02fc5e0e515a31c939ebc0372303e692a0f 0 iEYEABECAAYFAk90jY0ACgkQCX/oGf+2qkOxtwCg6Cng1h29qYq7oA8b4mj3KPVMKgkAoLZP6fhub1DNQGEn8zjCEXIRt1Mi +17bc2224a41a30d10472bd14581378201c1ca44b 0 iEYEABECAAYFAk+IHlMACgkQCX/oGf+2qkM3MACgoR2lLVuhzaAg2v0PAHTOsvCgEIoAoP5uBTyNv/CqYuf+XIwD6F9nxa+y +ec66c54fad7f8821269266cd7de52b09a423cdae 0 iEYEABECAAYFAk99aVgACgkQCX/oGf+2qkOiDwCg+Ne5Dp5L0X34APNzA7rBeCmZVsQAoJ5AU9K9+Dhn7iuBHVyTisbUJ/oC diff -r 00280ab1ed3a -r 83f3c0b230db .hgtags --- a/.hgtags Thu Apr 05 09:43:51 2012 +0000 +++ b/.hgtags Mon Apr 16 09:29:52 2012 +0000 @@ -73,3 +73,5 @@ 482fdc3919a19e72bfa675ddfbeb5aee83144698 3.0MP8.1 b625648e103ef1d0ae41eff56c9a1e33877e53f9 3.0MP8.2 952c381e3ada4a4e3511782945d3aa66e09a697e 3.0MP9 +00280ab1ed3ab01d41ed048ccd01694af1223341 3.0MP10 +4a4cc349c6babb0d72149613cc3e4988427ee0ff 3.0MP10.1 diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 16 09:29:52 2012 +0000 @@ -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.16012]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.16003]]></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> @@ -25,7 +25,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time. Fixed issue 15305.]]></UPDATEINFO> <!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[MP10]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r 00280ab1ed3a -r 83f3c0b230db 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 Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 16 09:29:52 2012 +0000 @@ -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.16012]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.16003]]></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.16012]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.16003]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Apr 16 09:29:52 2012 +0000 @@ -1782,28 +1782,6 @@ <!--880F17892846E2DDE040007F0100404D--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--880F17892846E2DDE040007F0100404D--></AD_TEXTINTERFACES> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--><AD_TEXTINTERFACES> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--> <AD_TEXTINTERFACES_ID><![CDATA[88AFE5C0A0A3CD7FE040007F01000DB7]]></AD_TEXTINTERFACES_ID> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--> <TEXT><![CDATA[find]]></TEXT> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt]]></FILENAME> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--88AFE5C0A0A3CD7FE040007F01000DB7--></AD_TEXTINTERFACES> - -<!--88F9C050D1FBB8EAE040007F010021A2--><AD_TEXTINTERFACES> -<!--88F9C050D1FBB8EAE040007F010021A2--> <AD_TEXTINTERFACES_ID><![CDATA[88F9C050D1FBB8EAE040007F010021A2]]></AD_TEXTINTERFACES_ID> -<!--88F9C050D1FBB8EAE040007F010021A2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--88F9C050D1FBB8EAE040007F010021A2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--88F9C050D1FBB8EAE040007F010021A2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--88F9C050D1FBB8EAE040007F010021A2--> <TEXT><![CDATA[add]]></TEXT> -<!--88F9C050D1FBB8EAE040007F010021A2--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt]]></FILENAME> -<!--88F9C050D1FBB8EAE040007F010021A2--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--88F9C050D1FBB8EAE040007F010021A2--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--88F9C050D1FBB8EAE040007F010021A2--></AD_TEXTINTERFACES> - <!--89A928B6FF534D9C93E1FA20D744C009--><AD_TEXTINTERFACES> <!--89A928B6FF534D9C93E1FA20D744C009--> <AD_TEXTINTERFACES_ID><![CDATA[89A928B6FF534D9C93E1FA20D744C009]]></AD_TEXTINTERFACES_ID> <!--89A928B6FF534D9C93E1FA20D744C009--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt Mon Apr 16 09:29:52 2012 +0000 @@ -27,13 +27,13 @@ <td class="DataGrid_Body_Cell"><span id="fieldBLReferenceNo">xx11100011</span></td> <td class="DataGrid_Body_Cell_Amount"><span id="fieldAmount">xx12233</span></td> <td class="DataGrid_Body_LineNoCell" style="background-color: xx;" id="inpMatchStyle_xx" name="inpMatchStyle_xx"> - <a href="#" onClick="openSelector('xx');" id="fieldFindLink">find</a> + <a href="#" onClick="openSelector('xx');" id="fieldFindLink"><img src="../../../../../web/org.openbravo.advpaymentmngt/images/view.png"/></a> <!--span> </span--> <input id="inpCheckBox_xx" type="checkbox" name="inpBankStatementLineId" value="" onclick="unMatchLine('xx', this.checked);"/> <input type="hidden" name="inpFinancialTransactionId_xx" id="inpFinancialTransactionId_xx" value=""></input> <input type="hidden" name="inpMatchingType_xx" id="inpMatchingType_xx" value=""></input> <!--span> </span--> - <a href="#" onclick="openAddTransaction('xx');" id="fieldAddLink">add</a> + <a href="#" onclick="openAddTransaction('xx');" id="fieldAddLink"><img src="../../../../../web/org.openbravo.advpaymentmngt/images/add.png"/></a> </td> <td class="DataGrid_Body_Cell" id="inpMatchedDocument_xx">xxTransaction</td> <td class="DataGrid_Body_Cell" id="inpTransactionDate_xx" title="">xx01-01-2010</td> diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/images/add.png Binary file modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/images/add.png has changed diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/images/view.png Binary file modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/images/view.png has changed diff -r 00280ab1ed3a -r 83f3c0b230db 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 Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 16 09:29:52 2012 +0000 @@ -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.16012]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.16003]]></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> @@ -22,7 +22,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--C70732EA90A14EC0916078B85CC33D2D--> <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA> <!--C70732EA90A14EC0916078B85CC33D2D--> <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION_LABEL><![CDATA[MP10]]></VERSION_LABEL> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE> diff -r 00280ab1ed3a -r 83f3c0b230db 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 Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 16 09:29:52 2012 +0000 @@ -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.16012]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.16003]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 16 09:29:52 2012 +0000 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.16012]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.16003]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> @@ -22,7 +22,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION_LABEL><![CDATA[MP10]]></VERSION_LABEL> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE> diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 16 09:29:52 2012 +0000 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.16012]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.16003]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.16012]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.16003]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.16012]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.16003]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.16012]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.16003]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java Mon Apr 16 09:29:52 2012 +0000 @@ -190,19 +190,18 @@ orgValueMap.put(orgValueMapItem); } jsonRole.put("organizationValueMap", orgValueMap); - jsonRole.put("warehouseOrgMap", getWarehouses(role.getClient().getId())); + jsonRole.put("warehouseOrgMap", getWarehouses(role.getClient().getId(),orgs)); jsonRoles.put(jsonRole); } formItemInfo.put("roles", jsonRoles); return formItemInfo; } - private JSONArray getWarehouses(String clientId) throws JSONException { + private JSONArray getWarehouses(String clientId, List<Organization> orgs) throws JSONException { List<JSONObject> orgWarehouseArray = new ArrayList<JSONObject>(); final OrganizationStructureProvider osp = OBContext.getOBContext() .getOrganizationStructureProvider(clientId); - OBCriteria<Organization> orgs = OBDal.getInstance().createCriteria(Organization.class); - for (Organization org : orgs.list()) { + for (Organization org : orgs) { JSONObject orgWarehouse = new JSONObject(); orgWarehouse.put("orgId", org.getId()); final OBQuery<Warehouse> warehouses = OBDal diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 16 09:29:52 2012 +0000 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.16012]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.16003]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> @@ -21,7 +21,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--D393BE6F22BB44B7B728259B34FC795A--> <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION_LABEL><![CDATA[MP10]]></VERSION_LABEL> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE> diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 16 09:29:52 2012 +0000 @@ -7,7 +7,7 @@ <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.16012]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.16003]]></STARTVERSION> <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 16 09:29:52 2012 +0000 @@ -6,7 +6,7 @@ <!--4B828F4D03264080AA1D2057B13F613C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--4B828F4D03264080AA1D2057B13F613C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--4B828F4D03264080AA1D2057B13F613C--> <NAME><![CDATA[User Interface Client Kernel]]></NAME> -<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.16012]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.16003]]></VERSION> <!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION> <!--4B828F4D03264080AA1D2057B13F613C--> <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP> <!--4B828F4D03264080AA1D2057B13F613C--> <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL> @@ -22,7 +22,7 @@ <!--4B828F4D03264080AA1D2057B13F613C--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--4B828F4D03264080AA1D2057B13F613C--> <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA> <!--4B828F4D03264080AA1D2057B13F613C--> <UPDATEINFO><![CDATA[Bug fix for issue 15289]]></UPDATEINFO> -<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION_LABEL><![CDATA[MP10]]></VERSION_LABEL> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--4B828F4D03264080AA1D2057B13F613C--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE> diff -r 00280ab1ed3a -r 83f3c0b230db modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Apr 05 09:43:51 2012 +0000 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 16 09:29:52 2012 +0000 @@ -7,7 +7,7 @@ <!--26B041893E844A53AFA58BC326C4F0D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.16012]]></STARTVERSION> +<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.16003]]></STARTVERSION> <!--26B041893E844A53AFA58BC326C4F0D7--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--26B041893E844A53AFA58BC326C4F0D7--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--26B041893E844A53AFA58BC326C4F0D7--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> ------------------------------------------------------------------------------ For Developers, A Lot Can Happen In A Second. Boundary is the first to Know...and Tell You. Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! http://p.sf.net/sfu/Boundary-d2dvs2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
