details: /erp/devel/main/rev/08a220fdf2ea
changeset: 12119:08a220fdf2ea
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Wed May 11 18:06:05 2011 +0200
summary: Fixes issue 17122. GLR in XLS format gets numbers
details: /erp/devel/main/rev/ff48f6570c57
changeset: 12120:ff48f6570c57
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Wed May 11 18:07:12 2011 +0200
summary: Fixes issue 16229 Payment Method added to callout in Multiphase
Project Window
details: /erp/devel/main/rev/9069258ded36
changeset: 12121:9069258ded36
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed May 11 17:24:52 2011 +0200
summary: [attachments] Improved alignment of attachment components and styling
details: /erp/devel/main/rev/999211f9625a
changeset: 12122:999211f9625a
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu May 12 10:00:22 2011 +0200
summary: [attachments] Improved styling of upload button
details: /erp/devel/main/rev/40eaf826d462
changeset: 12123:40eaf826d462
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu May 12 10:28:21 2011 +0200
summary: fixed bug 17070: Reconcilliation child tab (cleared items) is not
filtered by parent
details: /erp/devel/main/rev/596c462d355a
changeset: 12124:596c462d355a
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu May 12 11:27:52 2011 +0200
summary: Following Tabs should be marked as Professional
* Product - Purchasing (239)
* Product - Org. Specific (800241)
So these Tabs have to be removed from the Configuration Script
In addition to that new report has also be marked as Professional
* Pareto Product Report
details: /erp/devel/main/rev/6cf49fbe4734
changeset: 12125:6cf49fbe4734
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu May 12 13:23:38 2011 +0200
summary: CI: merge back from main
details: /erp/devel/main/rev/66ef6ecb0b86
changeset: 12126:66ef6ecb0b86
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Thu May 12 11:25:13 2011 +0200
summary: [cleanup] Reapplied changeset 5defe5fe3c5f
fixes issue 16503: Taxes in demo were wrong. Change organizations
details: /erp/devel/main/rev/8586a30d5a1b
changeset: 12127:8586a30d5a1b
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Thu May 12 11:51:28 2011 +0200
summary: [cleanup] Reapplied changeset fde0a5fe03ea
Fixes issue 16624
details: /erp/devel/main/rev/ad377edeedcd
changeset: 12128:ad377edeedcd
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Thu May 12 12:24:34 2011 +0200
summary: [cleanup] Reapplied changeset 0735ae63ec2b
Issue 16175: Sample Data updated to this issue commit
details: /erp/devel/main/rev/9c2ea7e89365
changeset: 12129:9c2ea7e89365
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Thu May 12 12:28:07 2011 +0200
summary: [cleanup] Reapplied changeset 53ddd0ec0d40
Fixes issue 16791
details: /erp/devel/main/rev/1b57600d5691
changeset: 12130:1b57600d5691
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 14:57:37 2011 +0200
summary: Fixes issue 16611: Initial request done by UI selector element in
form view does not use any filters or paging
details: /erp/devel/main/rev/33867e2a810b
changeset: 12131:33867e2a810b
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu May 12 15:41:09 2011 +0200
summary: Fixed issue 17129. Key columns will be explicitly set in the session.
This change is necessary because a big number of fields corresponding to key
columns have been removed as part of the cleanup project, so in several tabs,
the key column no longer has a field.
details: /erp/devel/main/rev/9121d767d7f3
changeset: 12132:9121d767d7f3
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 15:46:33 2011 +0200
summary: Fixes issue 17136: You cannot enter to Menu window but an ugly error
shows up
details: /erp/devel/main/rev/184bd464aefe
changeset: 12133:184bd464aefe
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 15:46:50 2011 +0200
summary: Related to issue 16611: Initial request done by UI selector element
in form view does not use any filters or paging
details: /erp/devel/main/rev/3299a3e1ad8f
changeset: 12134:3299a3e1ad8f
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu May 12 16:44:43 2011 +0200
summary: Fixes issue 0016534: the invoice date, when the invoice is voided,
should be updatable
It has been modified also the condition needed in the trigger to finish fixing
this issue
details: /erp/devel/main/rev/ccdcc3aca320
changeset: 12135:ccdcc3aca320
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 17:01:11 2011 +0200
summary: Fixes issue 17138: When you try to move the child tab, the focus
goes directly to the header launching the autosave
details: /erp/devel/main/rev/fa4d6a6b3d7d
changeset: 12136:fa4d6a6b3d7d
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Thu May 12 17:36:54 2011 +0200
summary: Fixed 17143: fixed hql where clause in two tabs
- Employee Expense
- Invoiceable Expenses
in both tabs the conversion from sql-whereclause -> hql-whereclause introduced
some bug which this cset fixes.
details: /erp/devel/main/rev/14155037e51d
changeset: 12137:14155037e51d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu May 12 17:51:53 2011 +0200
summary: Fixes issue 17145: Column headers for alerts have shifted and are
now incorrect
details: /erp/devel/main/rev/d221ad9e329e
changeset: 12138:d221ad9e329e
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri May 13 06:06:56 2011 +0200
summary: CI: update AD_MODULE to version 12137
diffstat:
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.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/ApplicationUtils.java
| 19 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 11 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
| 5 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-eventhandler.js
| 8 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 34 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-attachments.js
| 121 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 13 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 62 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 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.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.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 58 +-
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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
| 11 +
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/configScript.xml
| 8 -
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 14 +-
referencedata/sampledata/F_B_International_Group.xml
| 7726 +++++----
src-db/database/model/triggers/C_INVOICE_TRG.xml
| 4 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_TAB.xml
| 4 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java
| 9 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml
| 4 +-
src/org/openbravo/erpCommon/obps/licenseRestrictions
| 2 +-
57 files changed, 4837 insertions(+), 3461 deletions(-)
diffs (truncated from 32357 to 300 lines):
diff -r 32377e637a05 -r d221ad9e329e
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Thu May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri May 13 06:06:56 2011 +0200
@@ -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.11592]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.12137]]></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[RC6]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--A918E3331C404B889D69AA9BFAFB23AC-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
diff -r 32377e637a05 -r d221ad9e329e
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 May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri May 13 06:06:56 2011 +0200
@@ -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.11592]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.12137]]></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.11592]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.12137]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 32377e637a05 -r d221ad9e329e
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 May 12 00:45:35 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Fri May 13 06:06:56 2011 +0200
@@ -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.11592]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.12137]]></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[RC6]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--C70732EA90A14EC0916078B85CC33D2D-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
diff -r 32377e637a05 -r d221ad9e329e
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 May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri May 13 06:06:56 2011 +0200
@@ -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.11592]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.12137]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 32377e637a05 -r d221ad9e329e
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 May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Fri May 13 06:06:56 2011 +0200
@@ -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.11592]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.12137]]></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[RC6]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
diff -r 32377e637a05 -r d221ad9e329e
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 May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri May 13 06:06:56 2011 +0200
@@ -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.11592]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.12137]]></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.11592]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.12137]]></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.11592]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.12137]]></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.11592]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.12137]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 32377e637a05 -r d221ad9e329e
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
Thu May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
Fri May 13 06:06:56 2011 +0200
@@ -27,6 +27,7 @@
import org.openbravo.base.model.Entity;
import org.openbravo.base.model.ModelProvider;
import org.openbravo.base.model.Property;
+import org.openbravo.client.kernel.KernelUtils;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
@@ -35,6 +36,7 @@
import org.openbravo.model.ad.access.RoleOrganization;
import org.openbravo.model.ad.access.User;
import org.openbravo.model.ad.access.UserRoles;
+import org.openbravo.model.ad.datamodel.Column;
import org.openbravo.model.ad.ui.Field;
import org.openbravo.model.ad.ui.Tab;
import org.openbravo.model.ad.ui.Window;
@@ -146,6 +148,23 @@
}
}
}
+
+ // handle a special case: it is possible to define a column in the child
tab to be linked to a
+ // secondary key in the parent tab
+ if (returnProperty == null) {
+ for (Column parentCol : parentTab.getTable().getADColumnList()) {
+ if (!parentCol.isSecondaryKey()) {
+ continue;
+ }
+ for (Column childCol : tab.getTable().getADColumnList()) {
+ if (childCol.isLinkToParentColumn()
+ &&
childCol.getDBColumnName().equalsIgnoreCase(parentCol.getDBColumnName())) {
+ returnProperty =
KernelUtils.getInstance().getPropertyFromColumn(childCol);
+ }
+ }
+ }
+ }
+
return (returnProperty != null ? returnProperty.getName() : "");
}
diff -r 32377e637a05 -r d221ad9e329e
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Thu May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri May 13 06:06:56 2011 +0200
@@ -173,6 +173,9 @@
jsonValue = uiDef.createFromClassicString((String) jsonValue);
}
convertedJson.put(property.getName(), jsonValue);
+ if (property.isId()) {
+ setSessionValue(tab.getWindow().getId() + "|" +
property.getColumnName(), jsonValue);
+ }
}
}
}
@@ -181,6 +184,14 @@
convertedJson.put(JsonConstants.ENTITYNAME, entity.getName());
row = fromJsonConverter.toBaseOBObject(convertedJson);
row.setNewOBObject(true);
+ } else {
+ final Entity entity = ModelProvider.getInstance().getEntityByTableName(
+ tab.getTable().getDBTableName());
+ for (Property property : entity.getProperties()) {
+ if (property.isId()) {
+ setSessionValue(tab.getWindow().getId() + "|" +
property.getColumnName(), row.getId());
+ }
+ }
}
// First the parent record is retrieved and the session variables for
the parent records are
diff -r 32377e637a05 -r d221ad9e329e
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
Thu May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
Fri May 13 06:06:56 2011 +0200
@@ -128,6 +128,11 @@
// open the first time.
this.setFields(this.gridFields);
this.setSelectionAppearance('checkbox');
+
+ // this extra call is needed to solve this issue:
+ https://issues.openbravo.com/view.php?id=17145
+ this.refreshFields();
+
this.sort('creationDate', 'descending');
this.fetchData();
diff -r 32377e637a05 -r d221ad9e329e
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-eventhandler.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-eventhandler.js
Thu May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-eventhandler.js
Fri May 13 06:06:56 2011 +0200
@@ -47,6 +47,14 @@
canvas.pane.setAsActiveView();
return true;
}
+
+ // when clicking in the tabbar
+ if (canvas.tabSet && canvas.tabSet.getSelectedTab() &&
canvas.tabSet.getSelectedTab().pane
+ && canvas.tabSet.getSelectedTab().pane.setAsActiveView) {
+ canvas.tabSet.getSelectedTab().pane.setAsActiveView();
+ return true;
+ }
+
do {
if (canvas.view && canvas.view.setAsActiveView) {
canvas.view.setAsActiveView();
diff -r 32377e637a05 -r d221ad9e329e
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Thu May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Fri May 13 06:06:56 2011 +0200
@@ -23,6 +23,8 @@
// grid implementations.
isc.OBGrid.addProperties({
+ dragTrackerMode: 'none',
+
recordComponentPoolingMode: 'recycle',
showRecordComponentsByCell: true,
recordComponentPosition: 'within',
diff -r 32377e637a05 -r d221ad9e329e
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
Thu May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js
Fri May 13 06:06:56 2011 +0200
@@ -155,8 +155,8 @@
if (errorStatus) {
var handled = this.view.setErrorMessageFromResponse(dsResponse,
jsonData, dsRequest);
- if (!handled && !dsRequest.willHandleError) {
- OB.KernelUtilities.handleSystemException(error.message);
+ if (!handled && !dsRequest.willHandleError && jsonData.response &&
jsonData.response.error) {
+
OB.KernelUtilities.handleSystemException(jsonData.response.error.message);
}
} else {
// there are some cases where the jsonData is not passed, in case of
diff -r 32377e637a05 -r d221ad9e329e
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Thu May 12 00:45:35 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Fri May 13 06:06:56 2011 +0200
@@ -138,8 +138,8 @@
buttonType: 'eliminate',
prompt: OB.I18N.getLabel('OBUIAPP_DeleteRow'),
updateState: function(){
- var view = this.view, form = view.viewForm, grid = view.viewGrid,
selectedRecords = grid.getSelectedRecords();
- for (var i = 0; i < selectedRecords.length; i++) {
+ var view = this.view, form = view.viewForm, grid = view.viewGrid,
selectedRecords = grid.getSelectedRecords(), i;
+ for (i = 0; i < selectedRecords.length; i++) {
if (!grid.isWritable(selectedRecords[i])) {
this.setDisabled(true);
return;
@@ -186,7 +186,7 @@
buttonType: 'undo',
prompt: OB.I18N.getLabel('OBUIAPP_Undo'),
updateState: function(){
- var view = this.view, form = view.viewForm, grid = view.viewGrid,
hasErrors = false, editRow;
+ var view = this.view, form = view.viewForm, grid = view.viewGrid,
hasErrors = false, editRow, i;
if (view.isShowingForm) {
this.setDisabled(form.isSaving || form.readOnly ||
!view.hasValidState() ||
!form.hasChanged);
@@ -200,7 +200,7 @@
!form.hasChanged));
} else {
var selectedRecords = grid.getSelectedRecords(), allRowsHaveErrors =
true;
- for (var i = 0; i < selectedRecords.length; i++) {
+ for (i = 0; i < selectedRecords.length; i++) {
var rowNum = grid.getRecordIndex(selectedRecords[i]);
allRowsHaveErrors = allRowsHaveErrors && grid.rowHasErrors(rowNum);
}
@@ -276,15 +276,7 @@
{name: 'buttonId', type: 'hidden', value: this.ID},
{name: 'inpKey', type: 'hidden', value:
this.view.viewGrid.getSelectedRecord().id},
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
