details: https://code.openbravo.com/erp/devel/main/rev/c141a066c7d0 changeset: 19453:c141a066c7d0 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jan 25 18:55:48 2013 +0100 summary: fixed bug 22645: tabs without explicit reference to parent id are not refreshed
The problem was as the subtab was not explicitly setting its parent record (it was done through where clause), when changing selection in parent an empty criteria was created preventing request to datasource of being done. The fix creates for this case a dummy criteria to force request to be triggered. details: https://code.openbravo.com/erp/devel/main/rev/b1526c3b0148 changeset: 19454:b1526c3b0148 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Jan 26 02:21:59 2013 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/ef2e15e1a780 changeset: 19455:ef2e15e1a780 user: David Baz Fayos <david.baz <at> openbravo.com> date: Sat Jan 26 17:16:16 2013 +0100 summary: Fixed issue 22901: Added 'clientClass' to OBGrid to let use canvas based items in grids details: https://code.openbravo.com/erp/devel/main/rev/603290cb6a8a changeset: 19456:603290cb6a8a user: David Baz Fayos <david.baz <at> openbravo.com> date: Sat Jan 26 21:51:40 2013 +0100 summary: Fixed issue 22902: Added 'Print' link button to be used in QueryList widgets details: https://code.openbravo.com/erp/devel/main/rev/16eca807e2a3 changeset: 19457:16eca807e2a3 user: David Baz Fayos <david.baz <at> openbravo.com> date: Sun Jan 27 00:38:37 2013 +0100 summary: Related to issue 22901: Added a way to define in the own widget if it should be displayed or not if the row is in edit mode details: https://code.openbravo.com/erp/devel/main/rev/8215f88cf681 changeset: 19458:8215f88cf681 user: David Baz Fayos <david.baz <at> openbravo.com> date: Sun Jan 27 00:55:42 2013 +0100 summary: Related to issue 22901: Changed var name details: https://code.openbravo.com/erp/devel/main/rev/7b271be20db9 changeset: 19459:7b271be20db9 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sun Jan 27 11:17:24 2013 +0100 summary: CI: update AD_MODULE to version 19458 diffstat: 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.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_MESSAGE.xml | 11 + 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/window/OBViewTab.java | 20 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 36 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 11 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 127 +++++++-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 64 +--- 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/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/model/tables/OBCQL_QUERY_COLUMN.xml | 4 + modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_COLUMN.xml | 33 ++ modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_FIELD.xml | 27 ++ 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.querylist/src/org/openbravo/client/querylist/QueryListComponentProvider.java | 4 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java | 12 +- modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-canvas-item.js | 63 ++++ modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 23 +- 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_MODULE.xml | 4 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.html | 16 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.java | 25 +- src/org/openbravo/erpCommon/businessUtility/PrinterReports.xml | 4 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 12 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.html | 34 ++- src/org/openbravo/erpCommon/utility/reporting/printing/PrintOptions.xml | 4 +- 61 files changed, 497 insertions(+), 215 deletions(-) diffs (truncated from 1929 to 300 lines): diff -r 98f945713fd4 -r 7b271be20db9 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sun Jan 27 11:17:24 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.19434]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19458]]></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 98f945713fd4 -r 7b271be20db9 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 Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sun Jan 27 11:17:24 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.19434]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19458]]></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.19434]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19458]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 98f945713fd4 -r 7b271be20db9 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 Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sun Jan 27 11:17:24 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.19434]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19458]]></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 98f945713fd4 -r 7b271be20db9 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 Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sun Jan 27 11:17:24 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.19434]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.19458]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 98f945713fd4 -r 7b271be20db9 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 Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Sun Jan 27 11:17:24 2013 +0100 @@ -66,6 +66,17 @@ <!--04A912EBB5154048961E21EF15380D4A--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--04A912EBB5154048961E21EF15380D4A--></AD_MESSAGE> +<!--04E5DFD5293748308CF3ED2848CE8AE4--><AD_MESSAGE> +<!--04E5DFD5293748308CF3ED2848CE8AE4--> <AD_MESSAGE_ID><![CDATA[04E5DFD5293748308CF3ED2848CE8AE4]]></AD_MESSAGE_ID> +<!--04E5DFD5293748308CF3ED2848CE8AE4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--04E5DFD5293748308CF3ED2848CE8AE4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--04E5DFD5293748308CF3ED2848CE8AE4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--04E5DFD5293748308CF3ED2848CE8AE4--> <VALUE><![CDATA[OBUIAPP_Print]]></VALUE> +<!--04E5DFD5293748308CF3ED2848CE8AE4--> <MSGTEXT><![CDATA[Print]]></MSGTEXT> +<!--04E5DFD5293748308CF3ED2848CE8AE4--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--04E5DFD5293748308CF3ED2848CE8AE4--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--04E5DFD5293748308CF3ED2848CE8AE4--></AD_MESSAGE> + <!--07272FCDEEA64054AF2F983D9814EE00--><AD_MESSAGE> <!--07272FCDEEA64054AF2F983D9814EE00--> <AD_MESSAGE_ID><![CDATA[07272FCDEEA64054AF2F983D9814EE00]]></AD_MESSAGE_ID> <!--07272FCDEEA64054AF2F983D9814EE00--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 98f945713fd4 -r 7b271be20db9 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 Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Sun Jan 27 11:17:24 2013 +0100 @@ -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.19434]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.19458]]></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> diff -r 98f945713fd4 -r 7b271be20db9 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 Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sun Jan 27 11:17:24 2013 +0100 @@ -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.19434]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.19458]]></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.19434]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.19458]]></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.19434]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.19458]]></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.19434]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.19458]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 98f945713fd4 -r 7b271be20db9 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java Sun Jan 27 11:17:24 2013 +0100 @@ -838,12 +838,10 @@ } } - public class PrintButton extends IconButton { - public boolean hasEmail; - - public PrintButton() { - Process process = tab.getProcess(); - String processUrl = ""; + public static String getPrintUrl(Tab myTab) { + String processUrl = ""; + if (myTab.getProcess() != null) { + Process process = myTab.getProcess(); for (ModelImplementation mo : process.getADModelImplementationList()) { if (mo.isDefault() && ("P".equals(mo.getAction()) || "R".equals(mo.getAction()))) { for (ModelImplementationMapping mom : mo.getADModelImplementationMappingList()) { @@ -861,6 +859,16 @@ if (processUrl.indexOf("/") == -1) { processUrl = "/" + FormatUtilities.replace(processUrl); } + } + return processUrl; + } + + public class PrintButton extends IconButton { + public boolean hasEmail; + + public PrintButton() { + Process process = tab.getProcess(); + String processUrl = getPrintUrl(tab); hasEmail = processUrl.contains("orders") || processUrl.contains("invoices") || processUrl.contains("payments"); diff -r 98f945713fd4 -r 7b271be20db9 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js Sun Jan 27 11:17:24 2013 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011-2012 Openbravo SLU + * All portions are Copyright (C) 2011-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -93,7 +93,7 @@ title: OB.I18N.getLabel('OBUIAPP_AlertGrid_Record'), canFilter: true, canEdit: false, - isLink: true, + clientClass: 'OBAlertGridCanvasItem_Link', filterOnKeypress: true, filterEditorType: 'OBTextItem', type: '_id_10', @@ -212,19 +212,6 @@ return this.Super('headerClick', arguments); }, - cellClick: function (record, rowNum, colNum) { - var i, tabId, field = this.getField(colNum), - length = OB.AlertManagement.alertRules.length; - for (i = 0; i < length; i++) { - if (OB.AlertManagement.alertRules[i].alertRuleId === record.alertRule) { - tabId = OB.AlertManagement.alertRules[i].tabId; - } - } - if (field.isLink && tabId && tabId !== '') { - OB.Utilities.openDirectTab(tabId, record.referenceSearchKey); - } - }, - recordClick: function (viewer, record, recordNum, field, fieldNum, value, rawValue) { this.handleRecordSelection(viewer, record, recordNum, field, fieldNum, value, rawValue, false, true); }, @@ -519,4 +506,23 @@ this.Super('draw', arguments); } +}); + +isc.defineClass('OBAlertGridCanvasItem_Link', isc.OBGridLinkItem); + +isc.OBAlertGridCanvasItem_Link.addProperties({ + setRecord: function () { + this.setTitle(this.grid.formatLinkValue(this.record, this.field, this.colNum, this.rowNum, this.record[this.field.name])); + }, + doAction: function () { + var i, tabId, length = OB.AlertManagement.alertRules.length; + for (i = 0; i < length; i++) { + if (OB.AlertManagement.alertRules[i].alertRuleId === this.record.alertRule) { + tabId = OB.AlertManagement.alertRules[i].tabId; + } + } + if (tabId && tabId !== '') { + OB.Utilities.openDirectTab(tabId, this.record.referenceSearchKey); + } + } }); \ No newline at end of file diff -r 98f945713fd4 -r 7b271be20db9 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js Sun Jan 27 11:17:24 2013 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2012 Openbravo SLU + * All portions are Copyright (C) 2010-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -356,9 +356,10 @@ // * {{{showCloseControl}}} type: Boolean - to specify if the popup should show the close control or not. The default value is "true" if it is not specified // * {{{postParams}}} type: Object - parameters to be sent to the url using POST instead of GET // * {{{isModal}}} type: Boolean - to specify if the popup should be modal or not. The default value is "true" if it is not specified + // * {{{show}}} type: Boolean - to specify if the popup should be shown or not. The default value is "true" if it is not specified // // returns the created OBClassicPopupWindow - open: function (name, width, height, url, title, theOpener, showMinimizeControl, showMaximizeControl, showCloseControl, postParams, isModal) { + open: function (name, width, height, url, title, theOpener, showMinimizeControl, showMaximizeControl, showCloseControl, postParams, isModal, show) { var urlCharacter = (url && url.indexOf('?') !== -1) ? '&' : '?'; if (showMinimizeControl !== false) { @@ -373,6 +374,9 @@ if (isModal !== false) { isModal = true; } + if (show !== false) { + show = true; + } var _htmlCode, _navUserAgent = navigator.userAgent.toUpperCase(); if (OB.Utilities.isIE9Strict || _navUserAgent.indexOf("MSIE") === -1) { // IE >= 9 (Strict) or any other browser _htmlCode = '<html><head></head><body style="margin: 0; padding: 0; border: none;">' + '<iframe id="MDIPopupContainer" name="MDIPopupContainer" style="margin: 0; padding: 0; border: none; width: 100%; height: 100%;"></iframe>' + '<iframe name="frameMenu" scrolling="no" src="' + OB.Application.contextUrl + 'utility/VerticalMenu.html?Command=HIDE" id="paramFrameMenuLoading" style="margin: 0px; padding: 0px; border: 0px; height: 0px; width: 0px;"></iframe>' + '</body></html>'; @@ -396,6 +400,9 @@ popupURL: url + urlCharacter + 'IsPopUpCall=1' }); cPopup.show(); + if (!show) { + cPopup.hide(); + } if (cPopup.getIframeHtmlObj) { cPopup.getIframeHtmlObj().name = 'OBClassicPopup_iframe'; //To be used in automated tests: https://issues.openbravo.com/view.php?id=16786 } diff -r 98f945713fd4 -r 7b271be20db9 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js Fri Jan 25 15:26:55 2013 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js Sun Jan 27 11:17:24 2013 +0100 @@ -93,12 +93,11 @@ overflow: 'visible', setRecord: function (record) { - var fld = this.grid.getField(this.fieldName), - val = record[this.fieldName]; - if (fld && fld.type && isc.SimpleType.getType(fld.type).normalDisplayFormatter) { - this.showValue(isc.SimpleType.getType(fld.type).normalDisplayFormatter(val), val); + var val = record[this.field.name]; + if (this.field && this.field.type && isc.SimpleType.getType(this.field.type).normalDisplayFormatter) { + this.showValue(isc.SimpleType.getType(this.field.type).normalDisplayFormatter(val), val); } else { - this.showValue(String(record[this.fieldName])); + this.showValue(String(record[this.field.name])); } }, @@ -124,12 +123,11 @@ overflow: 'visible', setRecord: function (record) { ------------------------------------------------------------------------------ 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 Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
