details: /erp/devel/main/rev/f3ea0bb14d56
changeset: 10278:f3ea0bb14d56
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Feb 01 10:33:07 2011 +0100
summary: Right click selects record
details: /erp/devel/main/rev/a0cf9d9a2b36
changeset: 10279:a0cf9d9a2b36
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Feb 01 11:02:41 2011 +0100
summary: Split classes into files
details: /erp/devel/main/rev/8ff121e5fd91
changeset: 10280:8ff121e5fd91
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Feb 01 11:23:24 2011 +0100
summary: Solved failing open on tab
details: /erp/devel/main/rev/a933118e54d2
changeset: 10281:a933118e54d2
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Feb 01 11:24:36 2011 +0100
summary: Enabled toolbar buttons for grid editing, solved tab title updating
for grid editing
details: /erp/devel/main/rev/8a996de72113
changeset: 10282:8a996de72113
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Feb 01 11:25:46 2011 +0100
summary: Changed log of DAL initializing tasks so that the log was shown when
run from the application
details: /erp/devel/main/rev/a5a11ef50cf1
changeset: 10283:a5a11ef50cf1
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Feb 01 11:34:58 2011 +0100
summary: [OBUISEL] Avoid FK Domain check for custom query selectors.
details: /erp/devel/main/rev/93729a77026f
changeset: 10284:93729a77026f
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Feb 01 11:36:44 2011 +0100
summary: New menu items
details: /erp/devel/main/rev/ef82f1a1ca47
changeset: 10285:ef82f1a1ca47
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Feb 01 11:37:07 2011 +0100
summary: Added button tooltips
details: /erp/devel/main/rev/eb7fd9704ce6
changeset: 10286:eb7fd9704ce6
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Feb 01 12:31:39 2011 +0100
summary: Reformatted, solved issue with discard confirmation msg failure,
disabled row selection on right click
details: /erp/devel/main/rev/86e361c7ab6e
changeset: 10287:86e361c7ab6e
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Feb 01 12:32:21 2011 +0100
summary: Attempt to solve not setting of filter field in case of combo FK item
details: /erp/devel/main/rev/708b6b4e9b3b
changeset: 10288:708b6b4e9b3b
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Feb 01 12:57:49 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/06516bf37145
changeset: 10289:06516bf37145
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Feb 01 15:59:01 2011 +0100
summary: Windows with a tab which corresponds to a manual form will be
rendered in classic mode
details: /erp/devel/main/rev/75aea1c8d887
changeset: 10290:75aea1c8d887
user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date: Tue Feb 01 16:04:22 2011 +0100
summary: core: update copyright year in Login and About
details: /erp/devel/main/rev/cd2222d2b80b
changeset: 10291:cd2222d2b80b
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Tue Feb 01 17:19:07 2011 +0100
summary: [APRM][modulescript] Include FIN_BankStatement table in
AcctSchemaTables
details: /erp/devel/main/rev/8b43579700c5
changeset: 10292:8b43579700c5
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Feb 01 16:17:18 2011 +0100
summary: Issue 15833: DB Inconsistency in Sample Data. Step 1.
Dataset Definition changed, so exported tables are the same than in the
original environment -the one where F&B client was created-, and in the same
order.
Added changes to F&B Client xml file for:
- New Table FIN_Finacc_Transaction
- New Window Payment Priority
- New Process Update Payment Plan
- fINPaymentPriority and updatePaymentPlan new columns in FIN_Payment_Schedule
table
- fINPaymentPriority column in Order and Invoice tables
- createdByAlgorithm column in FIN_Payment and FIN_Finacc_Transaction tables
details: /erp/devel/main/rev/d8e596990146
changeset: 10293:d8e596990146
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Feb 02 01:14:21 2011 +0100
summary: Issue 15833: DB Inconsistency in Sample Data. Step 2.
- Created new regions, no present in core, but in Spanish Regions modules
- Removed passwords from users of the client
details: /erp/devel/main/rev/fe93148fa4a7
changeset: 10294:fe93148fa4a7
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Feb 02 01:35:22 2011 +0100
summary: Issue 15833: DB Inconsistency in Sample Data. Step 3.
- Posted the not-posted documents
details: /erp/devel/main/rev/99f6fa0c1059
changeset: 10295:99f6fa0c1059
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Feb 02 01:39:09 2011 +0100
summary: Issue 15833: DB Inconsistency in Sample Data. Step 4.
- Added the AdClientModule entry for core dataset.
details: /erp/devel/main/rev/d5d04ffe208c
changeset: 10296:d5d04ffe208c
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Feb 02 07:05:34 2011 +0100
summary: Back out of unstable changeset
details: /erp/devel/main/rev/0be4568f8f30
changeset: 10297:0be4568f8f30
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Feb 02 09:41:36 2011 +0100
summary: Back out of unstable changeset
details: /erp/devel/main/rev/df812e1571b4
changeset: 10298:df812e1571b4
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Wed Feb 02 09:48:52 2011 +0100
summary: Fixes issue 15795: Java Class Name on Accounting templates is too
short.
details: /erp/devel/main/rev/9e5bcbfcf7c6
changeset: 10299:9e5bcbfcf7c6
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Feb 02 14:14:14 2011 +0100
summary: CI: update AD_MODULE to version 10298
diffstat:
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class
| 0
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.java
| 3 +-
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
| 77 +++
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 8 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
| 4 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
| 5 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 19 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
| 15 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 8 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 221 ++++++---
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.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
| 9 +
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.myob/src/org/openbravo/client/myob/MyOpenbravoComponentProvider.java
| 4 +
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-showparameter-widget.js
| 90 ++++
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-url-widget.js
| 40 +
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
| 94 ----
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.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.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.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.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 8 +-
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
| 4 +-
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
| 22 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 10 +-
src-db/database/lib/dbsourcemanager.jar
| 0
src-db/database/model/tables/AD_CREATEFACT_TEMPLATE.xml
| 2 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 22 +-
src/org/openbravo/erpCommon/ad_forms/About.html
| 4 +-
src/org/openbravo/erpCommon/security/Login.html
| 2 +-
52 files changed, 484 insertions(+), 275 deletions(-)
diffs (truncated from 1938 to 300 lines):
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class
Binary file
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class
has changed
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed Feb 02 14:14:14 2011 +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.10255]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10298]]></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 48cfda6b7dd6 -r 9e5bcbfcf7c6
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
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Feb 02 14:14:14 2011 +0100
@@ -8,7 +8,7 @@
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.0.0]]></STARTVERSION>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<ENDVERSION><![CDATA[2.1.10255]]></ENDVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<ENDVERSION><![CDATA[2.1.10298]]></ENDVERSION>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Selector]]></DEPENDANT_MODULE_NAME>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -22,7 +22,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.10255]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10298]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.java
---
a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.java
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.java
Wed Feb 02 14:14:14 2011 +0100
@@ -52,7 +52,8 @@
void createAcctSchemaTables(ConnectionProvider cp) throws Exception{
CreateAccountingConfigurationData[] data =
CreateAccountingConfigurationData.selectAcctSchema(cp);
//Tables to be added hardcoded due to problem when executing module
script. The tables sometimes do not exist yet
- String tables[] = {"4D8C3B3C31D1410DA046140C9F024D17",
"B1B7075C46934F0A9FD4C4D0F1457B42", "D1A97202E832470285C9B1EB026D54E2"};
+ String tables[] = {"4D8C3B3C31D1410DA046140C9F024D17",
"B1B7075C46934F0A9FD4C4D0F1457B42",
+ "D1A97202E832470285C9B1EB026D54E2",
"D4C23A17190649E7B78F55A05AF3438C"};
for (int i = 0; i < data.length; i++) {
for (int j = 0; j < tables.length; j++) {
boolean exist = CreateAccountingConfigurationData.selectTables(cp,
data[i].cAcctschemaId, tables[j]);
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
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
Tue Feb 01 10:20:53 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Wed Feb 02 14:14:14 2011 +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.10255]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10298]]></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 48cfda6b7dd6 -r 9e5bcbfcf7c6
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
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Feb 02 14:14:14 2011 +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.10255]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10298]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
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
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Feb 02 14:14:14 2011 +0100
@@ -651,6 +651,83 @@
<!--FBA2F11416C4413F8E2D554119461964-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FBA2F11416C4413F8E2D554119461964--></AD_MESSAGE>
+<!--FF8080812DDB247F012DDB685F940080--><AD_MESSAGE>
+<!--FF8080812DDB247F012DDB685F940080-->
<AD_MESSAGE_ID><![CDATA[FF8080812DDB247F012DDB685F940080]]></AD_MESSAGE_ID>
+<!--FF8080812DDB247F012DDB685F940080-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812DDB247F012DDB685F940080--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812DDB247F012DDB685F940080--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812DDB247F012DDB685F940080-->
<VALUE><![CDATA[OBUIAPP_CreateNewRecord]]></VALUE>
+<!--FF8080812DDB247F012DDB685F940080--> <MSGTEXT><![CDATA[Create New
Record]]></MSGTEXT>
+<!--FF8080812DDB247F012DDB685F940080--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812DDB247F012DDB685F940080-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812DDB247F012DDB685F940080--></AD_MESSAGE>
+
+<!--FF8080812DDB247F012DDB68A46E0086--><AD_MESSAGE>
+<!--FF8080812DDB247F012DDB68A46E0086-->
<AD_MESSAGE_ID><![CDATA[FF8080812DDB247F012DDB68A46E0086]]></AD_MESSAGE_ID>
+<!--FF8080812DDB247F012DDB68A46E0086-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812DDB247F012DDB68A46E0086--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812DDB247F012DDB68A46E0086--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812DDB247F012DDB68A46E0086-->
<VALUE><![CDATA[OBUIAPP_DeleteRecord]]></VALUE>
+<!--FF8080812DDB247F012DDB68A46E0086--> <MSGTEXT><![CDATA[Delete
Record]]></MSGTEXT>
+<!--FF8080812DDB247F012DDB68A46E0086--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812DDB247F012DDB68A46E0086-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812DDB247F012DDB68A46E0086--></AD_MESSAGE>
+
+<!--FF8080812DDB247F012DDCF7D6060189--><AD_MESSAGE>
+<!--FF8080812DDB247F012DDCF7D6060189-->
<AD_MESSAGE_ID><![CDATA[FF8080812DDB247F012DDCF7D6060189]]></AD_MESSAGE_ID>
+<!--FF8080812DDB247F012DDCF7D6060189-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812DDB247F012DDCF7D6060189--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812DDB247F012DDCF7D6060189--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812DDB247F012DDCF7D6060189-->
<VALUE><![CDATA[OBUIAPP_PREVIOUSBUTTON]]></VALUE>
+<!--FF8080812DDB247F012DDCF7D6060189--> <MSGTEXT><![CDATA[Go to previous
record]]></MSGTEXT>
+<!--FF8080812DDB247F012DDCF7D6060189--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812DDB247F012DDCF7D6060189-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812DDB247F012DDCF7D6060189--></AD_MESSAGE>
+
+<!--FF8080812DDB247F012DDCF82BFF018B--><AD_MESSAGE>
+<!--FF8080812DDB247F012DDCF82BFF018B-->
<AD_MESSAGE_ID><![CDATA[FF8080812DDB247F012DDCF82BFF018B]]></AD_MESSAGE_ID>
+<!--FF8080812DDB247F012DDCF82BFF018B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812DDB247F012DDCF82BFF018B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812DDB247F012DDCF82BFF018B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812DDB247F012DDCF82BFF018B-->
<VALUE><![CDATA[OBUIAPP_NEXTBUTTON]]></VALUE>
+<!--FF8080812DDB247F012DDCF82BFF018B--> <MSGTEXT><![CDATA[Go to next
record]]></MSGTEXT>
+<!--FF8080812DDB247F012DDCF82BFF018B--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812DDB247F012DDCF82BFF018B-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812DDB247F012DDCF82BFF018B--></AD_MESSAGE>
+
+<!--FF8080812DDB247F012DDCF92A140198--><AD_MESSAGE>
+<!--FF8080812DDB247F012DDCF92A140198-->
<AD_MESSAGE_ID><![CDATA[FF8080812DDB247F012DDCF92A140198]]></AD_MESSAGE_ID>
+<!--FF8080812DDB247F012DDCF92A140198-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812DDB247F012DDCF92A140198--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812DDB247F012DDCF92A140198--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812DDB247F012DDCF92A140198-->
<VALUE><![CDATA[OBUIAPP_CLOSEBUTTON]]></VALUE>
+<!--FF8080812DDB247F012DDCF92A140198--> <MSGTEXT><![CDATA[Close the current
record and return to grid view]]></MSGTEXT>
+<!--FF8080812DDB247F012DDCF92A140198--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812DDB247F012DDCF92A140198-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812DDB247F012DDCF92A140198--></AD_MESSAGE>
+
+<!--FF8080812DDB247F012DDCFA2B1B019E--><AD_MESSAGE>
+<!--FF8080812DDB247F012DDCFA2B1B019E-->
<AD_MESSAGE_ID><![CDATA[FF8080812DDB247F012DDCFA2B1B019E]]></AD_MESSAGE_ID>
+<!--FF8080812DDB247F012DDCFA2B1B019E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812DDB247F012DDCFA2B1B019E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812DDB247F012DDCFA2B1B019E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812DDB247F012DDCFA2B1B019E-->
<VALUE><![CDATA[OBUIAPP_MAXIMIZEBUTTON]]></VALUE>
+<!--FF8080812DDB247F012DDCFA2B1B019E--> <MSGTEXT><![CDATA[Maximize the
current tab]]></MSGTEXT>
+<!--FF8080812DDB247F012DDCFA2B1B019E--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812DDB247F012DDCFA2B1B019E-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812DDB247F012DDCFA2B1B019E--></AD_MESSAGE>
+
+<!--FF8080812DDB247F012DDCFAB5EC01A4--><AD_MESSAGE>
+<!--FF8080812DDB247F012DDCFAB5EC01A4-->
<AD_MESSAGE_ID><![CDATA[FF8080812DDB247F012DDCFAB5EC01A4]]></AD_MESSAGE_ID>
+<!--FF8080812DDB247F012DDCFAB5EC01A4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812DDB247F012DDCFAB5EC01A4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812DDB247F012DDCFAB5EC01A4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812DDB247F012DDCFAB5EC01A4-->
<VALUE><![CDATA[OBUIAPP_RESTOREBUTTON]]></VALUE>
+<!--FF8080812DDB247F012DDCFAB5EC01A4--> <MSGTEXT><![CDATA[Restore the tab to
previous size]]></MSGTEXT>
+<!--FF8080812DDB247F012DDCFAB5EC01A4--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812DDB247F012DDCFAB5EC01A4-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812DDB247F012DDCFAB5EC01A4--></AD_MESSAGE>
+
<!--FF8081812D6761CF012D676DF2A70045--><AD_MESSAGE>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_MESSAGE_ID><![CDATA[FF8081812D6761CF012D676DF2A70045]]></AD_MESSAGE_ID>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
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
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Wed Feb 02 14:14:14 2011 +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.10255]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10298]]></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 48cfda6b7dd6 -r 9e5bcbfcf7c6
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
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Feb 02 14:14:14 2011 +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.10255]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10298]]></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.10255]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10298]]></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.10255]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10298]]></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.10255]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10298]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
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
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
Wed Feb 02 14:14:14 2011 +0100
@@ -61,6 +61,10 @@
// There is a tab with a SQL filter clause, but without a defined HQL
filter clause
return true;
}
+ if (tab.getMasterDetailForm() != null) {
+ // There is a tab which is a manual form
+ return true;
+ }
}
return false;
}
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Wed Feb 02 14:14:14 2011 +0100
@@ -24,6 +24,7 @@
autoExpand: ${field.autoExpand}, type: '${field.type}',
editorProperties: {
${field.gridEditorFieldProperties}
+ // note need to be repeated for editor fields
, columnName: '${field.columnName?js_string}'
, inpColumnName: '${field.inpColumnName?js_string}'
, referencedKeyColumnName:
'${field.referencedKeyColumnName?js_string}'
@@ -34,6 +35,10 @@
, title: '${field.title?js_string}'
, prompt: '${field.title?js_string}'
, showIf: '${field.initialShow?string}'
+ , columnName: '${field.columnName?js_string}'
+ , inpColumnName: '${field.inpColumnName?js_string}'
+ , referencedKeyColumnName:
'${field.referencedKeyColumnName?js_string}'
+ , targetEntity: '${field.targetEntity?js_string}'
}
<#if field_has_next>,</#if>
</#list>
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Wed Feb 02 14:14:14 2011 +0100
@@ -977,7 +977,7 @@
var prefix = '', postFix;
var suffix = '';
var hasChanged = this.isShowingForm && (this.viewForm.isNew ||
this.viewForm.hasChanged);
- hasChanged = hasChanged || (this.isEditingGrid &&
(this.viewGrid.getEditForm().isNew || this.viewGrid.getEditForm().hasChanged));
+ hasChanged = hasChanged || (this.isEditingGrid &&
(this.viewGrid.hasErrors() || this.viewGrid.getEditForm().isNew ||
this.viewGrid.getEditForm().hasChanged));
if (hasChanged) {
if (isc.Page.isRTL()) {
suffix = ' *';
@@ -1099,7 +1099,11 @@
},
saveRow: function(){
- this.viewForm.saveRow();
+ if (this.isEditingGrid) {
+ this.viewGrid.endEditing();
+ } else {
+ this.viewForm.saveRow();
+ }
},
deleteRow: function(){
@@ -1177,11 +1181,16 @@
},
undo: function(){
- var view = this, callback;
- if (this.viewForm.hasChanged) {
+ var view = this, callback, form;
+ if (this.isEditingGrid) {
+ form = this.viewGrid.getEditForm();
+ } else {
+ form = this.viewForm;
+ }
+ if (form.hasChanged) {
callback = function(ok){
if (ok) {
- view.viewForm.undo();
+ form.undo();
}
};
isc.ask(OB.I18N.getLabel('OBUIAPP_ConfirmUndo', callback), callback);
diff -r 48cfda6b7dd6 -r 9e5bcbfcf7c6
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
Tue Feb 01 10:20:53 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
Wed Feb 02 14:14:14 2011 +0100
@@ -104,24 +104,29 @@
this.previousButton = isc.OBStatusBarIconButton.create({
view: this.view,
- buttonType: 'previous'
+ buttonType: 'previous',
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
