[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/d83f41f2e0d7 changeset: 10458:d83f41f2e0d7 user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 12:46:54 2011 +0100 summary: CI: update AD_MODULE to version 10454 details: /erp/devel/pi/rev/20fde2c0c6f5 changeset: 10459:20fde2c0c6f5 user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 13:01:28 2011 +0100 summary: CI: merge back from main 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_MODULE.xml |2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml |8 +- 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/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.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.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.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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient-labels.js | 343 + modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/2.50_emulation/smartclient/load_skin.js |2 +-
[OpenbravoERP-commits] devel/pi: Remove document types from QA Testing data
details: /erp/devel/pi/rev/a57fa02ec57b changeset: 10461:a57fa02ec57b user: Pablo Sarobe pablo.sarobe at openbravo.com date: Wed Feb 09 13:33:14 2011 +0100 summary: Remove document types from QA Testing data diffstat: referencedata/sampledata/QA_Testing.xml | 240 1 files changed, 0 insertions(+), 240 deletions(-) diffs (truncated from 341 to 300 lines): diff -r c5f39b5f9b3f -r a57fa02ec57b referencedata/sampledata/QA_Testing.xml --- a/referencedata/sampledata/QA_Testing.xml Wed Feb 09 13:31:14 2011 +0100 +++ b/referencedata/sampledata/QA_Testing.xml Wed Feb 09 13:33:14 2011 +0100 @@ -74622,30 +74622,6 @@ documentCancelled xsi:nil=true/ expensefalse/expense /DocumentType - DocumentType id=FF8080812C2ABFC6012C2B3BE4970090 -idFF8080812C2ABFC6012C2B3BE4970090/id -client id=4028E6C72959682B01295A070852010D/ -organization id=0/ -activetrue/active -nameManual Settlement/name -printTextManual Settlement/printText -description xsi:nil=true/ -documentCategorySTM/documentCategory -salesTransactionfalse/salesTransaction -sOSubType xsi:nil=true/ -documentTypeForShipment id=0/ -documentTypeForInvoice id=0/ -sequencedDocumenttrue/sequencedDocument -documentSequence id=FF8080812C2ABFC6012C2B3BE496008E/ -gLCategory id=FF8080812C2ABFC6012C2B3BE496008F/ -comments xsi:nil=true/ -defaultfalse/default -numberOfCopies0/numberOfCopies -table id=800019/ -filterByOrganizationfalse/filterByOrganization -documentCancelled xsi:nil=true/ -expensefalse/expense - /DocumentType DocumentType id=FF8080812C2ABFC6012C2B3BE4970093 idFF8080812C2ABFC6012C2B3BE4970093/id client id=4028E6C72959682B01295A070852010D/ @@ -74670,30 +74646,6 @@ documentCancelled xsi:nil=true/ expensefalse/expense /DocumentType - DocumentType id=FF8080812C2ABFC6012C2B3BE4980096 -idFF8080812C2ABFC6012C2B3BE4980096/id -client id=4028E6C72959682B01295A070852010D/ -organization id=0/ -activetrue/active -nameBank Statement/name -printTextBank Statement/printText -description xsi:nil=true/ -documentCategoryCMB/documentCategory -salesTransactionfalse/salesTransaction -sOSubType xsi:nil=true/ -documentTypeForShipment id=0/ -documentTypeForInvoice id=0/ -sequencedDocumenttrue/sequencedDocument -documentSequence id=FF8080812C2ABFC6012C2B3BE4970094/ -gLCategory id=FF8080812C2ABFC6012C2B3BE4980095/ -comments xsi:nil=true/ -defaultfalse/default -numberOfCopies0/numberOfCopies -table id=392/ -filterByOrganizationfalse/filterByOrganization -documentCancelled xsi:nil=true/ -expensefalse/expense - /DocumentType DocumentType id=FF8080812C2ABFC6012C2B3BE4980099 idFF8080812C2ABFC6012C2B3BE4980099/id client id=4028E6C72959682B01295A070852010D/ @@ -74814,54 +74766,6 @@ documentCancelled xsi:nil=true/ expensefalse/expense /DocumentType - DocumentType id=FF8080812C2ABFC6012C2B3BE49C00A6 -idFF8080812C2ABFC6012C2B3BE49C00A6/id -client id=4028E6C72959682B01295A070852010D/ -organization id=0/ -activetrue/active -nameSettlement/name -printTextSettlement/printText -description xsi:nil=true/ -documentCategorySTT/documentCategory -salesTransactiontrue/salesTransaction -sOSubType xsi:nil=true/ -documentTypeForShipment id=0/ -documentTypeForInvoice id=0/ -sequencedDocumenttrue/sequencedDocument -documentSequence id=FF8080812C2ABFC6012C2B3BE49C00A5/ -gLCategory id=FF8080812C2ABFC6012C2B3BE496008F/ -comments xsi:nil=true/ -defaultfalse/default -numberOfCopies0/numberOfCopies -table id=800019/ -filterByOrganizationfalse/filterByOrganization -documentCancelled xsi:nil=true/ -expensefalse/expense - /DocumentType - DocumentType id=FF8080812C2ABFC6012C2B3BE49D00A8 -idFF8080812C2ABFC6012C2B3BE49D00A8/id -client id=4028E6C72959682B01295A070852010D/ -organization id=0/ -activetrue/active -nameDebt Payment Management/name -printTextDebt Payment Management/printText -description xsi:nil=true/ -documentCategoryDPM/documentCategory -salesTransactionfalse/salesTransaction -sOSubType xsi:nil=true/ -documentTypeForShipment id=0/ -documentTypeForInvoice id=0/ -sequencedDocumenttrue/sequencedDocument -documentSequence id=FF8080812C2ABFC6012C2B3BE49D00A7/ -gLCategory id=FF8080812C2ABFC6012C2B3BE4980098/ -comments xsi:nil=true/ -defaultfalse/default -numberOfCopies0/numberOfCopies -table id=800176/ -filterByOrganizationfalse/filterByOrganization -documentCancelled xsi:nil=true/ -expensefalse/expense - /DocumentType DocumentType id=FF8080812C2ABFC6012C2B3BE49D00AB idFF8080812C2ABFC6012C2B3BE49D00AB/id client id=4028E6C72959682B01295A070852010D/ @@ -74886,30 +74790,6 @@ documentCancelled xsi:nil=true/ expensefalse/expense
[OpenbravoERP-commits] devel/pi: Removes new button for bankstatement and lines
details: /erp/devel/pi/rev/ed51b9f4041f changeset: 10462:ed51b9f4041f user: Eduardo Argal Guibert eduardo.argal at openbravo.com date: Wed Feb 09 13:38:28 2011 +0100 summary: Removes new button for bankstatement and lines diffstat: src-db/database/sourcedata/AD_TAB.xml | 8 1 files changed, 4 insertions(+), 4 deletions(-) diffs (39 lines): diff -r a57fa02ec57b -r ed51b9f4041f src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml Wed Feb 09 13:33:14 2011 +0100 +++ b/src-db/database/sourcedata/AD_TAB.xml Wed Feb 09 13:38:28 2011 +0100 @@ -13334,7 +13334,7 @@ !--7F5E8E4C55914138A358F5087B532B59-- AD_WINDOW_ID![CDATA[94EAA455D2644E04AB25D93BE5157B6D]]/AD_WINDOW_ID !--7F5E8E4C55914138A358F5087B532B59-- SEQNO![CDATA[40]]/SEQNO !--7F5E8E4C55914138A358F5087B532B59-- TABLEVEL![CDATA[2]]/TABLEVEL -!--7F5E8E4C55914138A358F5087B532B59-- ISSINGLEROW![CDATA[N]]/ISSINGLEROW +!--7F5E8E4C55914138A358F5087B532B59-- ISSINGLEROW![CDATA[Y]]/ISSINGLEROW !--7F5E8E4C55914138A358F5087B532B59-- ISINFOTAB![CDATA[N]]/ISINFOTAB !--7F5E8E4C55914138A358F5087B532B59-- ISTRANSLATIONTAB![CDATA[N]]/ISTRANSLATIONTAB !--7F5E8E4C55914138A358F5087B532B59-- ISREADONLY![CDATA[N]]/ISREADONLY @@ -13343,7 +13343,7 @@ !--7F5E8E4C55914138A358F5087B532B59-- IMPORTFIELDS![CDATA[N]]/IMPORTFIELDS !--7F5E8E4C55914138A358F5087B532B59-- ISSORTTAB![CDATA[N]]/ISSORTTAB !--7F5E8E4C55914138A358F5087B532B59-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID -!--7F5E8E4C55914138A358F5087B532B59-- UIPATTERN![CDATA[STD]]/UIPATTERN +!--7F5E8E4C55914138A358F5087B532B59-- UIPATTERN![CDATA[SR]]/UIPATTERN !--7F5E8E4C55914138A358F5087B532B59--/AD_TAB !--81F3CB82FABC4208BA76DEBB3728A14B--AD_TAB @@ -13770,7 +13770,7 @@ !--C56E698100314AD3A89626CA551C-- AD_WINDOW_ID![CDATA[94EAA455D2644E04AB25D93BE5157B6D]]/AD_WINDOW_ID !--C56E698100314AD3A89626CA551C-- SEQNO![CDATA[30]]/SEQNO !--C56E698100314AD3A89626CA551C-- TABLEVEL![CDATA[1]]/TABLEVEL -!--C56E698100314AD3A89626CA551C-- ISSINGLEROW![CDATA[N]]/ISSINGLEROW +!--C56E698100314AD3A89626CA551C-- ISSINGLEROW![CDATA[Y]]/ISSINGLEROW !--C56E698100314AD3A89626CA551C-- ISINFOTAB![CDATA[N]]/ISINFOTAB !--C56E698100314AD3A89626CA551C-- ISTRANSLATIONTAB![CDATA[N]]/ISTRANSLATIONTAB !--C56E698100314AD3A89626CA551C-- ISREADONLY![CDATA[N]]/ISREADONLY @@ -13780,7 +13780,7 @@ !--C56E698100314AD3A89626CA551C-- IMPORTFIELDS![CDATA[N]]/IMPORTFIELDS !--C56E698100314AD3A89626CA551C-- ISSORTTAB![CDATA[N]]/ISSORTTAB !--C56E698100314AD3A89626CA551C-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID -!--C56E698100314AD3A89626CA551C-- UIPATTERN![CDATA[STD]]/UIPATTERN +!--C56E698100314AD3A89626CA551C-- UIPATTERN![CDATA[SR]]/UIPATTERN !--C56E698100314AD3A89626CA551C-- HQLORDERBYCLAUSE![CDATA[-transactionDate]]/HQLORDERBYCLAUSE !--C56E698100314AD3A89626CA551C--/AD_TAB -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: [quickaction] Change 'form' view types icon with prope...
details: /erp/devel/pi/rev/11ca56569ffd
changeset: 10463:11ca56569ffd
user: David Baz Fayos david.baz at openbravo.com
date: Wed Feb 09 13:41:01 2011 +0100
summary: [quickaction] Change 'form' view types icon with proper one - part2
diffstat:
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
| 6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (24 lines):
diff -r ed51b9f4041f -r 11ca56569ffd
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
---
a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
Wed Feb 09 13:41:01 2011 +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 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -356,8 +356,10 @@
icon =
'[SKINIMG]../../org.openbravo.client.application/images/icons/iconProcess.png';
} else if (recent.icon === 'Report') {
icon =
'[SKINIMG]../../org.openbravo.client.application/images/icons/iconReport.png';
+} else if (recent.icon === 'Form') {
+ icon =
'[SKINIMG]../../org.openbravo.client.application/images/icons/iconForm.png';
} else {
- icon =
'[SKINIMG]../../org.openbravo.client.application/images/icons/iconAutoForm.png';
+ icon =
'[SKINIMG]../../org.openbravo.client.application/images/icons/iconWindow.png';
}
}
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] stable/2.50: fixed bug 15891: When click on 'Show Audit Trail' i...
details: /erp/stable/2.50/rev/fe47bc58a8ae changeset: 9191:fe47bc58a8ae user: Asier Lostalé asier.lostale at openbravo.com date: Wed Feb 09 12:30:53 2011 +0100 summary: fixed bug 15891: When click on 'Show Audit Trail' in Community Edition, link on the modal screen is incorrect diffstat: src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 73811c44632e -r fe47bc58a8ae src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Wed Feb 09 12:42:35 2011 +0100 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Wed Feb 09 12:30:53 2011 +0100 @@ -29857,7 +29857,7 @@ !--11509F0E2D6E4D4A96518FECB69A5B8F-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID !--11509F0E2D6E4D4A96518FECB69A5B8F-- ISACTIVE![CDATA[Y]]/ISACTIVE !--11509F0E2D6E4D4A96518FECB69A5B8F-- VALUE![CDATA[LearnHowToActivate]]/VALUE -!--11509F0E2D6E4D4A96518FECB69A5B8F-- MSGTEXT![CDATA[a href='http://www.openbravo.com/product/erp/module/acquire' target='_blank'Learn how to/a activate your instance.]]/MSGTEXT +!--11509F0E2D6E4D4A96518FECB69A5B8F-- MSGTEXT![CDATA[a href='http://www.openbravo.com/product/erp/get-basic' target='_blank'Learn how to/a activate your instance.]]/MSGTEXT !--11509F0E2D6E4D4A96518FECB69A5B8F-- MSGTYPE![CDATA[I]]/MSGTYPE !--11509F0E2D6E4D4A96518FECB69A5B8F-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID !--11509F0E2D6E4D4A96518FECB69A5B8F--/AD_MESSAGE diff -r 73811c44632e -r fe47bc58a8ae src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html --- a/src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html Wed Feb 09 12:42:35 2011 +0100 +++ b/src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html Wed Feb 09 12:30:53 2011 +0100 @@ -215,7 +215,7 @@ td class=PlainText_normal colspan=4 style=padding: 0 0 10 0; text-align: left; p class=Label_ReadOnly_Text id=info/p pnbsp;/p -pa class=Label_ReadOnly_Text LabelLink_noicon href=http://www.openbravo.com/product/erp/module/acquire; target=_blank id=link1/anbsp; FIELD_TMP id=link2/FIELD_TMP/p +pa class=Label_ReadOnly_Text LabelLink_noicon href=http://www.openbravo.com/product/erp/get-basic; target=_blank id=link1/anbsp; FIELD_TMP id=link2/FIELD_TMP/p br/ /td /tr -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Change test be independent on special behavior of Mode...
details: /erp/devel/pi/rev/0e5e7efe3769
changeset: 10466:0e5e7efe3769
user: Stefan Hühner stefan.huehner at openbravo.com
date: Wed Feb 09 13:53:35 2011 +0100
summary: Change test be independent on special behavior of
ModelProvider.getTables()
Needed in preperation of planned behavior change of the mentioned method
diffstat:
src-test/org/openbravo/test/model/RuntimeModelTest.java | 58 ++--
1 files changed, 49 insertions(+), 9 deletions(-)
diffs (147 lines):
diff -r 94a11e5a4603 -r 0e5e7efe3769
src-test/org/openbravo/test/model/RuntimeModelTest.java
--- a/src-test/org/openbravo/test/model/RuntimeModelTest.java Wed Feb 09
13:44:43 2011 +0100
+++ b/src-test/org/openbravo/test/model/RuntimeModelTest.java Wed Feb 09
13:53:35 2011 +0100
@@ -23,14 +23,20 @@
import java.util.List;
import org.apache.log4j.Logger;
+import org.hibernate.Criteria;
+import org.hibernate.Transaction;
+import org.hibernate.classic.Session;
+import org.hibernate.criterion.Order;
import org.openbravo.base.model.Column;
import org.openbravo.base.model.Entity;
import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.model.ModelSessionFactoryController;
import org.openbravo.base.model.NamingUtil;
import org.openbravo.base.model.Property;
import org.openbravo.base.model.Reference;
import org.openbravo.base.model.Table;
import org.openbravo.base.model.domaintype.BasePrimitiveDomainType;
+import org.openbravo.base.session.SessionFactoryController;
import org.openbravo.test.base.BaseTest;
/**
@@ -45,10 +51,13 @@
private static final Logger log = Logger.getLogger(RuntimeModelTest.class);
- // don't initialize dal layer for model tests
+ // cached list of all tables columns as used by several tests
+ private ListTable allTables;
+
@Override
protected void setUp() throws Exception {
super.setUp();
+allTables = getTables();
}
/**
@@ -68,7 +77,7 @@
*/
public void testPK() {
final ArrayListTable tablesWithoutPK = new ArrayListTable();
-for (final Table t : ModelProvider.getInstance().getTables()) {
+for (final Table t : allTables) {
if (!t.isView() t.getPrimaryKeyColumns().size() == 0) {
tablesWithoutPK.add(t);
}
@@ -89,7 +98,7 @@
* handled better, currently the entity name contains a space resulting in
errors in HQL
*/
public void testTableName() {
-for (final Table t : ModelProvider.getInstance().getTables()) {
+for (final Table t : allTables) {
final char[] chars = t.getName().toCharArray();
for (char c : chars) {
for (char illegalChar : NamingUtil.ILLEGAL_ENTITY_NAME_CHARS) {
@@ -162,7 +171,7 @@
*/
public void testOnePK() {
int total = 0;
-for (final Table t : ModelProvider.getInstance().getTables()) {
+for (final Table t : allTables) {
if (!t.isView() t.getPrimaryKeyColumns().size() 1) {
log.debug(Table: + t.getId() + - + t.getTableName());
log.debug( Columns : );
@@ -187,7 +196,7 @@
public void testIdentifiers() {
final ArrayListString tables = new ArrayListString();
-for (final Table t : ModelProvider.getInstance().getTables()) {
+for (final Table t : allTables) {
if (!t.isView() t.isActive() t.getIdentifierColumns().size() == 0)
tables.add(t.getTableName());
}
@@ -222,7 +231,7 @@
public void testIsParent() {
final ArrayListString columns = new ArrayListString();
-for (final Table t : ModelProvider.getInstance().getTables()) {
+for (final Table t : allTables) {
for (final Column c : t.getColumns()) {
if (c.isParent() !c.getReference().getId().equals(Reference.TABLE)
!c.getReference().getId().equals(Reference.TABLEDIR)
@@ -246,7 +255,7 @@
public void testIsParent2() {
final ArrayListString columns = new ArrayListString();
-for (final Table t : ModelProvider.getInstance().getTables()) {
+for (final Table t : allTables) {
for (final Column c : t.getColumns()) {
if (c.isParent() c.isPrimitiveType()) {
columns.add(t.getTableName() + - + c.getColumnName());
@@ -265,7 +274,7 @@
*/
public void testIsParent3() {
final ArrayListString columns = new ArrayListString();
-for (final Table t : ModelProvider.getInstance().getTables()) {
+for (final Table t : allTables) {
for (final Column c : t.getColumns()) {
if (c.isParent() c.getReference().getId().equals(Reference.TABLE)
c.getReferenceValue() == null) {
@@ -286,7 +295,7 @@
*/
public void testIsParent4() {
final ArrayListString columns = new ArrayListString();
-for (final Table t : ModelProvider.getInstance().getTables()) {
+for (final Table t : allTables) {
for (final Column c : t.getColumns()) {
if (c.isParent()
c.getReference().getId().equals(Reference.TABLEDIR)) {
final String obNamingConvention = c.getColumnName().substring(
@@
[OpenbravoERP-commits] devel/pi: Fixed 15900. Change getTables() to only return tables ...
details: /erp/devel/pi/rev/d98f5745a830
changeset: 10467:d98f5745a830
user: Stefan Hühner stefan.huehner at openbravo.com
date: Wed Feb 09 15:12:04 2011 +0100
summary: Fixed 15900. Change getTables() to only return tables usable with
DAL.
This changes the list of tables returned by ModelProvider.getTables() to only
return the list of tables usable with dal and not all the tables which are
defined in ad_table. Difference between those are tables not supported by dal
i.e. which do not have any column defined which is marked as primary key.
diffstat:
src/org/openbravo/base/model/ModelProvider.java | 22 +-
1 files changed, 5 insertions(+), 17 deletions(-)
diffs (35 lines):
diff -r 0e5e7efe3769 -r d98f5745a830
src/org/openbravo/base/model/ModelProvider.java
--- a/src/org/openbravo/base/model/ModelProvider.java Wed Feb 09 13:53:35
2011 +0100
+++ b/src/org/openbravo/base/model/ModelProvider.java Wed Feb 09 15:12:04
2011 +0100
@@ -331,26 +331,14 @@
}
/**
- * Returns the tables in the database, is usefull for debugging purposes.
+ * Returns list of tables known in the dal in memory model.
*
- * @return list of tables in the database
+ * This excludes i.e. tables which do not have any column defined with
iskey='Y'
+ *
+ * @return list of tables known by dal in no particular stable order
*/
public ListTable getTables() {
-final SessionFactoryController sessionFactoryController = new
ModelSessionFactoryController();
-final Session session =
sessionFactoryController.getSessionFactory().openSession();
-final Transaction tx = session.beginTransaction();
-try {
- tables = list(session, Table.class);
- // read the columns in one query and assign them to the table
- final ListColumn cols = readColumns(session);
- assignColumnsToTable(cols);
- return tables;
-} finally {
- log.debug(Closing session and sessionfactory used during model read);
- tx.commit();
- session.close();
- sessionFactoryController.getSessionFactory().close();
-}
+return new ArrayListTable(tablesByTableName.values());
}
/**
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Improve performance of first login after tomcat startup.
details: /erp/devel/pi/rev/9cc8c8a6dfd1
changeset: 10468:9cc8c8a6dfd1
user: Stefan Hühner stefan.huehner at openbravo.com
date: Wed Feb 09 15:17:13 2011 +0100
summary: Improve performance of first login after tomcat startup.
UIDefinitionController fills a in-memory cache on its first use (normally
on first login after tomcat start). Improve this by reusing the list of columns
already present in the DAL in memory model (from ModelProvider) instead of
it again from the db. Saves around 3-4s on first login.
Note: This removes around 367 entries from this cache. However those are never
needed as they are linked to tables which cannot be used via DAL so the reduced
entry set in the cache is now consistent with DAL-usable columns.
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
| 50 +
1 files changed, 26 insertions(+), 24 deletions(-)
diffs (82 lines):
diff -r d98f5745a830 -r 9cc8c8a6dfd1
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
Wed Feb 09 15:12:04 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
Wed Feb 09 15:17:13 2011 +0100
@@ -20,21 +20,23 @@
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import org.dom4j.Document;
import org.dom4j.Element;
import org.hibernate.Hibernate;
+import org.openbravo.base.model.Column;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.model.Table;
import org.openbravo.base.session.OBPropertiesProvider;
import org.openbravo.base.util.OBClassLoader;
import org.openbravo.client.kernel.BaseTemplateComponent;
import org.openbravo.client.kernel.UserInterfaceDefinition;
-import org.openbravo.dal.core.DalUtil;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.dal.service.OBQuery;
-import org.openbravo.model.ad.datamodel.Column;
import org.openbravo.model.ad.domain.Reference;
import org.openbravo.model.ad.domain.ReferencedTable;
@@ -141,30 +143,30 @@
}
}
- final OBQueryColumn columnQry =
OBDal.getInstance().createQuery(Column.class, );
- columnQry.setFilterOnActive(false);
- for (Column column : columnQry.list()) {
-String referenceId;
-if (column.getReferenceSearchKey() != null) {
- referenceId = (String) DalUtil.getId(column.getReferenceSearchKey());
-} else {
- referenceId = (String) DalUtil.getId(column.getReference());
+ for (Table table : ModelProvider.getInstance().getTables()) {
+ListColumn cols = table.getColumns();
+for (Column column : cols) {
+ String referenceId;
+ if (column.getReferenceValue() != null) {
+referenceId = column.getReferenceValue().getId();
+ } else {
+referenceId = column.getReference().getId();
+ }
+
+ // if one of the old hardcoded pwd-column - move to new-style
reference
+ // Companion-code in org.openbravo.base.mode.Property (for for
domaintype)
+ String colReferenceId = column.getReference().getId();
+ if (column.isEncrypted() colReferenceId !=
EncryptedStringReferenceID
+ colReferenceId != HashedStringReferenecID) {
+if (column.isDecryptable()) {
+ referenceId = EncryptedStringReferenceID;
+} else {
+ referenceId = HashedStringReferenecID;
+}
+ }
+ localUIDefinitionsByColumn.put(column.getId(),
localCachedDefinitions.get(referenceId));
}
-
-// if one of the old hardcoded pwd-column - move to new-style
reference
-// Companion-code in org.openbravo.base.mode.Property (for for
domaintype)
-String colReferenceId = (String) DalUtil.getId(column.getReference());
-if (column.isDisplayEncription() colReferenceId !=
EncryptedStringReferenceID
- colReferenceId != HashedStringReferenecID) {
- if (column.isDeencryptable()) {
-referenceId = EncryptedStringReferenceID;
- } else {
-referenceId = HashedStringReferenecID;
- }
-}
-localUIDefinitionsByColumn.put(column.getId(),
localCachedDefinitions.get(referenceId));
}
-
} finally {
OBContext.restorePreviousMode();
}
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/46acd1f6b156 changeset: 10469:46acd1f6b156 user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 15:16:45 2011 +0100 summary: CI: update AD_MODULE to version 10462 details: /erp/devel/pi/rev/e9931b4858fb changeset: 10470:e9931b4858fb user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 15:31:55 2011 +0100 summary: CI: merge back from main 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_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js | 8 +- 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/UIDefinitionController.java | 50 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/web/org.openbravo.client.myob/js/ob-myopenbravo.js | 6 +- 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.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.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.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 | 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 | 12 +- src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-test/org/openbravo/test/model/RuntimeModelTest.java | 58 - src/org/openbravo/base/model/ModelProvider.java
[OpenbravoERP-commits] devel/pi: [form][style] Fixed webkit browser default's disabled ...
details: /erp/devel/pi/rev/e6ffe83b821a
changeset: 10471:e6ffe83b821a
user: David Baz Fayos david.baz at openbravo.com
date: Wed Feb 09 15:50:36 2011 +0100
summary: [form][style] Fixed webkit browser default's disabled style
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diffs (19 lines):
diff -r e9931b4858fb -r e6ffe83b821a
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Wed Feb 09 15:31:55 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Wed Feb 09 15:50:36 2011 +0100
@@ -125,6 +125,7 @@
.OBFormFieldStaticDisabled {
color: #7d7d7d;
+ -webkit-text-fill-color: #7d7d7d;
}
.OBFormFieldInputDisabled,
@@ -133,6 +134,7 @@
border: 1px solid #d7d7d7;
background-color: #ff;
color: #7d7d7d;
+ -webkit-text-fill-color: #7d7d7d;
}
.OBFormFieldDateInput,
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 3 new changesets
details: /erp/devel/pi/rev/85e53b4d0fb0
changeset: 10474:85e53b4d0fb0
user: Antonio Moreno antonio.moreno at openbravo.com
date: Wed Feb 09 12:40:06 2011 +0100
summary: Fix SetDocumentNoHandler. Take into account that docTypeTarget and
docType can be null.
details: /erp/devel/pi/rev/c22b1225
changeset: 10475:c22b1225
user: Antonio Moreno antonio.moreno at openbravo.com
date: Wed Feb 09 16:01:38 2011 +0100
summary: Refresh in form and grid view when is needed.
details: /erp/devel/pi/rev/6fff697189e9
changeset: 10476:6fff697189e9
user: Antonio Moreno antonio.moreno at openbravo.com
date: Wed Feb 09 16:30:07 2011 +0100
summary: Windows with a column of reference ImageBLOB will be shown in
classic mode until the reference is implemented in 3.0 windows.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
| 10 +++
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java
| 7 +++--
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 13 -
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 4 +++
4 files changed, 24 insertions(+), 10 deletions(-)
diffs (83 lines):
diff -r 0bea82161179 -r 6fff697189e9
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
Wed Feb 09 16:26:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
Wed Feb 09 16:30:07 2011 +0100
@@ -49,6 +49,16 @@
static boolean showWindowInClassicMode(Window window) {
for (Tab tab : window.getADTabList()) {
+
+ // FIXME Remove this once ImageBLOB is implemented
+ // Currently, windows with ImageBLOB reference columns will be shown in
classic mode
+ String tableName = tab.getTable().getDBTableName();
+ org.openbravo.base.model.Table table =
ModelProvider.getInstance().getTable(tableName);
+ for (org.openbravo.base.model.Column col : table.getColumns()) {
+if
(col.getReference().getId().equals(4AA6C3BE9D3B4D84A3B80489505A23E5)) {
+ return true;
+}
+ }
if (tab.getSQLWhereClause() != null tab.getHqlwhereclause() == null) {
// There is a tab with a SQL whereclause, but without a defined HQL
whereclause
return true;
diff -r 0bea82161179 -r 6fff697189e9
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java
Wed Feb 09 16:26:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java
Wed Feb 09 16:30:07 2011 +0100
@@ -68,9 +68,10 @@
String documentNo = (String) event.getCurrentState(documentNoProperty);
if (documentNo == null || documentNo.startsWith()) {
-final DocumentType docTypeTarget = (DocumentType) event
-.getCurrentState(docTypeTargetProperty);
-final DocumentType docType = (DocumentType)
event.getCurrentState(documentTypeProperty);
+final DocumentType docTypeTarget = (docTypeTargetProperty == null ?
null
+: (DocumentType) event.getCurrentState(docTypeTargetProperty));
+final DocumentType docType = (documentTypeProperty == null ? null :
(DocumentType) event
+.getCurrentState(documentTypeProperty));
// use empty strings instead of null
final String docTypeTargetId = docTypeTarget != null ?
docTypeTarget.getId() : ;
final String docTypeId = docType != null ? docType.getId() : ;
diff -r 0bea82161179 -r 6fff697189e9
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
Wed Feb 09 16:26:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Wed Feb 09 16:30:07 2011 +0100
@@ -1115,22 +1115,21 @@
if (!this.isShowingForm) {
this.messageBar.hide();
- this.viewGrid.filterData(this.viewGrid.getCriteria(), refreshCallback);
+ this.viewGrid.targetRecordId =
this.viewGrid.getSelectedRecord()[OB.Constants.ID];
+ this.viewGrid.invalidateCache();
} else {
var view = this;
if (this.viewForm.hasChanged) {
var callback = function(ok){
if (ok) {
-var criteria = [];
-criteria[OB.Constants.ID] =
[OpenbravoERP-commits] devel/pi: Fixes issue 15898: Payment methods modify in FB
details: /erp/devel/pi/rev/ddde82ccfd59 changeset: 10477:ddde82ccfd59 user: Pablo Sarobe pablo.sarobe at openbravo.com date: Wed Feb 09 16:49:19 2011 +0100 summary: Fixes issue 15898: Payment methods modify in FB diffstat: referencedata/sampledata/F_B_International_Group.xml | 276 +- 1 files changed, 138 insertions(+), 138 deletions(-) diffs (truncated from 519 to 300 lines): diff -r 6fff697189e9 -r ddde82ccfd59 referencedata/sampledata/F_B_International_Group.xml --- a/referencedata/sampledata/F_B_International_Group.xml Wed Feb 09 16:30:07 2011 +0100 +++ b/referencedata/sampledata/F_B_International_Group.xml Wed Feb 09 16:49:19 2011 +0100 @@ -1677,24 +1677,24 @@ activetrue/active nameWire Transfer/name descriptionWire Transfer/description -automaticReceipttrue/automaticReceipt +automaticReceiptfalse/automaticReceipt automaticPaymentfalse/automaticPayment automaticDeposittrue/automaticDeposit automaticWithdrawntrue/automaticWithdrawn payinAllowtrue/payinAllow payoutAllowtrue/payoutAllow -payinExecutionTypeA/payinExecutionType -payoutExecutionTypeA/payoutExecutionType -payinExecutionProcess id=717D521D5F454FAD9199B831001BB4E0/ -payoutExecutionProcess id=717D521D5F454FAD9199B831001BB4E0/ +payinExecutionTypeM/payinExecutionType +payoutExecutionTypeM/payoutExecutionType +payinExecutionProcess xsi:nil=true/ +payoutExecutionProcess xsi:nil=true/ payinDeferredfalse/payinDeferred payoutDeferredfalse/payoutDeferred -uponReceiptUseCLE/uponReceiptUse +uponReceiptUse xsi:nil=true/ uponDepositUse xsi:nil=true/ -iNUponClearingUse xsi:nil=true/ -uponPaymentUseCLE/uponPaymentUse +iNUponClearingUseCLE/iNUponClearingUse +uponPaymentUse xsi:nil=true/ uponWithdrawalUse xsi:nil=true/ -oUTUponClearingUse xsi:nil=true/ +oUTUponClearingUseCLE/oUTUponClearingUse /FIN_PaymentMethod FIN_PaymentMethod id=2E5CF8F5016F4E319BD45C6001B3E1AA id2E5CF8F5016F4E319BD45C6001B3E1AA/id @@ -1715,11 +1715,11 @@ payoutExecutionProcess xsi:nil=true/ payinDeferredfalse/payinDeferred payoutDeferredfalse/payoutDeferred -uponReceiptUseCLE/uponReceiptUse -uponDepositUse xsi:nil=true/ +uponReceiptUse xsi:nil=true/ +uponDepositUseDEP/uponDepositUse iNUponClearingUse xsi:nil=true/ -uponPaymentUseCLE/uponPaymentUse -uponWithdrawalUse xsi:nil=true/ +uponPaymentUse xsi:nil=true/ +uponWithdrawalUseWIT/uponWithdrawalUse oUTUponClearingUse xsi:nil=true/ /FIN_PaymentMethod FIN_PaymentMethod id=45A202BF44884F05B8A1BF741E2063B6 @@ -1728,7 +1728,7 @@ organization id=4F68EB1C1B734E79B27DE9D2DF56089F/ activetrue/active nameAl contado/name -description xsi:nil=true/ +descriptionAl contado/description automaticReceiptfalse/automaticReceipt automaticPaymentfalse/automaticPayment automaticDeposittrue/automaticDeposit @@ -1741,11 +1741,11 @@ payoutExecutionProcess xsi:nil=true/ payinDeferredfalse/payinDeferred payoutDeferredfalse/payoutDeferred -uponReceiptUseCLE/uponReceiptUse -uponDepositUse xsi:nil=true/ +uponReceiptUse xsi:nil=true/ +uponDepositUseDEP/uponDepositUse iNUponClearingUse xsi:nil=true/ -uponPaymentUseCLE/uponPaymentUse -uponWithdrawalUse xsi:nil=true/ +uponPaymentUse xsi:nil=true/ +uponWithdrawalUseWIT/uponWithdrawalUse oUTUponClearingUse xsi:nil=true/ /FIN_PaymentMethod FIN_PaymentMethod id=5A741F883A31408CA3AC097D76AA6D32 @@ -1755,32 +1755,6 @@ activetrue/active nameTransferencia/name description xsi:nil=true/ -automaticReceipttrue/automaticReceipt -automaticPaymentfalse/automaticPayment -automaticDeposittrue/automaticDeposit -automaticWithdrawntrue/automaticWithdrawn -payinAllowtrue/payinAllow -payoutAllowtrue/payoutAllow -payinExecutionTypeA/payinExecutionType -payoutExecutionTypeA/payoutExecutionType -payinExecutionProcess id=717D521D5F454FAD9199B831001BB4E0/ -payoutExecutionProcess id=717D521D5F454FAD9199B831001BB4E0/ -payinDeferredfalse/payinDeferred -payoutDeferredfalse/payoutDeferred -uponReceiptUseCLE/uponReceiptUse -uponDepositUse xsi:nil=true/ -iNUponClearingUse xsi:nil=true/ -uponPaymentUseCLE/uponPaymentUse -uponWithdrawalUse xsi:nil=true/ -oUTUponClearingUse xsi:nil=true/ - /FIN_PaymentMethod - FIN_PaymentMethod id=868AF7B2177A4FBBB772995FEF52C072 -id868AF7B2177A4FBBB772995FEF52C072/id -client id=FF8080812AFBCB14012AFBD3E373001F/ -organization id=B9C7088AB859483A9B1FB342AC2BE17A/ -activetrue/active -nameCheck/name -descriptionCheck/description automaticReceiptfalse/automaticReceipt automaticPaymentfalse/automaticPayment automaticDeposittrue/automaticDeposit @@ -1788,9 +1762,35 @@ payinAllowtrue/payinAllow payoutAllowtrue/payoutAllow
[OpenbravoERP-commits] devel/pi: Fixes issue 15905: Activate POS Order document in FB ...
details: /erp/devel/pi/rev/88b76805cac7 changeset: 10479:88b76805cac7 user: Pablo Sarobe pablo.sarobe at openbravo.com date: Wed Feb 09 17:31:48 2011 +0100 summary: Fixes issue 15905: Activate POS Order document in FB demo data diffstat: referencedata/sampledata/F_B_International_Group.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 52ad9b93930a -r 88b76805cac7 referencedata/sampledata/F_B_International_Group.xml --- a/referencedata/sampledata/F_B_International_Group.xml Wed Feb 09 17:21:22 2011 +0100 +++ b/referencedata/sampledata/F_B_International_Group.xml Wed Feb 09 17:31:48 2011 +0100 @@ -119858,7 +119858,7 @@ id4028E6C72E099470012E0A2F53560036/id client id=FF8080812AFBCB14012AFBD3E373001F/ organization id=B9C7088AB859483A9B1FB342AC2BE17A/ -activefalse/active +activetrue/active nameUS POS Order/name printTextOrder confirmation/printText description xsi:nil=true/ @@ -120098,7 +120098,7 @@ id511A9371A0F74195AA3F6D66C722729D/id client id=FF8080812AFBCB14012AFBD3E373001F/ organization id=4F68EB1C1B734E79B27DE9D2DF56089F/ -activefalse/active +activetrue/active namePOS Order/name printTextOrder Confirmation/printText description xsi:nil=true/ -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: fixed issue 15874: Permissions to processes are not re...
details: /erp/devel/pi/rev/3cc3d1a740b2
changeset: 10480:3cc3d1a740b2
user: Asier Lostalé asier.lostale at openbravo.com
date: Wed Feb 09 17:32:12 2011 +0100
summary: fixed issue 15874: Permissions to processes are not respected
diffstat:
src-db/database/sourcedata/AD_REF_LIST.xml | 12
src-wad/src/org/openbravo/wad/javasource.javaxml | 23 ++-
2 files changed, 34 insertions(+), 1 deletions(-)
diffs (76 lines):
diff -r 88b76805cac7 -r 3cc3d1a740b2 src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xmlWed Feb 09 17:31:48
2011 +0100
+++ b/src-db/database/sourcedata/AD_REF_LIST.xmlWed Feb 09 17:32:12
2011 +0100
@@ -10736,4 +10736,16 @@
!--FEAB443F9CF94815B0306F85A245AD40-- SEQNO![CDATA[1]]/SEQNO
!--FEAB443F9CF94815B0306F85A245AD40--/AD_REF_LIST
+!--FF8081812E0A7E62012E0A8326F7000C--AD_REF_LIST
+!--FF8081812E0A7E62012E0A8326F7000C--
AD_REF_LIST_ID![CDATA[FF8081812E0A7E62012E0A8326F7000C]]/AD_REF_LIST_ID
+!--FF8081812E0A7E62012E0A8326F7000C--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--FF8081812E0A7E62012E0A8326F7000C-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--FF8081812E0A7E62012E0A8326F7000C-- ISACTIVE![CDATA[Y]]/ISACTIVE
+!--FF8081812E0A7E62012E0A8326F7000C--
VALUE![CDATA[SecuredProcess]]/VALUE
+!--FF8081812E0A7E62012E0A8326F7000C-- NAME![CDATA[Secured
Process]]/NAME
+!--FF8081812E0A7E62012E0A8326F7000C-- DESCRIPTION![CDATA[Generated UI
processes called from buttons within tabs can be secured by setting this
property to 'Y'. If this property is not set, they can be executed without
giving explicit access by all roles with access to that window.]]/DESCRIPTION
+!--FF8081812E0A7E62012E0A8326F7000C--
AD_REFERENCE_ID![CDATA[A26BA480E2014707B47257024C3CBFF7]]/AD_REFERENCE_ID
+!--FF8081812E0A7E62012E0A8326F7000C--
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--FF8081812E0A7E62012E0A8326F7000C--/AD_REF_LIST
+
/data
diff -r 88b76805cac7 -r 3cc3d1a740b2
src-wad/src/org/openbravo/wad/javasource.javaxml
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml Wed Feb 09 17:31:48
2011 +0100
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml Wed Feb 09 17:32:12
2011 +0100
@@ -12,7 +12,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) 2001-2010 Openbravo SLU
+ * All portions are Copyright (C) 2001-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -74,12 +74,25 @@
ServletException {
VariablesSecureApp vars = new VariablesSecureApp(request);
String command = vars.getCommand();
+
+boolean securedProcess = false;
if (command.contains(BUTTON)) {
+ try {
+securedProcess =
Y.equals(org.openbravo.erpCommon.businessUtility.Preferences
+.getPreferenceValue(SecuredProcess, true, vars.getClient(),
vars.getOrg(), vars
+.getUser(), vars.getRole(), windowId));
+ } catch (PropertyException e) {
+ }
+
FIELDS_TMP id=sectionActionButtonsService
if (command.contains(FIELD_TMP
id=ProcessIDsrvprocessId/FIELD_TMP)) {
SessionInfo.setProcessType(P);
SessionInfo.setProcessId(FIELD_TMP
id=ProcessIDsrvprocessId/FIELD_TMP);
SessionInfo.setModuleId(FIELD_TMP
id=ProcessModulesrvmoduleId/FIELD_TMP);
+if (securedProcess) {
+ classInfo.type = P;
+ classInfo.id = FIELD_TMP id=ProcessIDsrvprocessId/FIELD_TMP;
+}
}
/FIELDS_TMP
FIELDS_TMP id=sectionActionButtonsServiceJava
@@ -87,9 +100,17 @@
SessionInfo.setProcessType(P);
SessionInfo.setProcessId(FIELD_TMP
id=ProcessIDsrvJprocessId/FIELD_TMP);
SessionInfo.setModuleId(FIELD_TMP
id=ProcessModulesrvJmoduleId/FIELD_TMP);
+if (securedProcess) {
+ classInfo.type = P;
+ classInfo.id = FIELD_TMP id=ProcessIDsrvJprocessId/FIELD_TMP;
+}
}
/FIELDS_TMP
}
+if (!securedProcess) {
+ classInfo.type = W;
+ classInfo.id = windowId;
+}
super.service(request, response);
}
/PARAMETER_TMP
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] stable/2.50: fixed bug 15907: Permissions to processes are not r...
details: /erp/stable/2.50/rev/ce8c13ed21b7
changeset: 9192:ce8c13ed21b7
user: Asier Lostalé asier.lostale at openbravo.com
date: Wed Feb 09 17:33:28 2011 +0100
summary: fixed bug 15907: Permissions to processes are not respected
diffstat:
src-db/database/sourcedata/AD_REF_LIST.xml | 12
src-wad/src/org/openbravo/wad/javasource.javaxml | 23 ++-
2 files changed, 34 insertions(+), 1 deletions(-)
diffs (76 lines):
diff -r fe47bc58a8ae -r ce8c13ed21b7 src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xmlWed Feb 09 12:30:53
2011 +0100
+++ b/src-db/database/sourcedata/AD_REF_LIST.xmlWed Feb 09 17:33:28
2011 +0100
@@ -10736,4 +10736,16 @@
!--FEAB443F9CF94815B0306F85A245AD40-- SEQNO![CDATA[1]]/SEQNO
!--FEAB443F9CF94815B0306F85A245AD40--/AD_REF_LIST
+!--FF8081812E0A7E62012E0A8326F7000C--AD_REF_LIST
+!--FF8081812E0A7E62012E0A8326F7000C--
AD_REF_LIST_ID![CDATA[FF8081812E0A7E62012E0A8326F7000C]]/AD_REF_LIST_ID
+!--FF8081812E0A7E62012E0A8326F7000C--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--FF8081812E0A7E62012E0A8326F7000C-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--FF8081812E0A7E62012E0A8326F7000C-- ISACTIVE![CDATA[Y]]/ISACTIVE
+!--FF8081812E0A7E62012E0A8326F7000C--
VALUE![CDATA[SecuredProcess]]/VALUE
+!--FF8081812E0A7E62012E0A8326F7000C-- NAME![CDATA[Secured
Process]]/NAME
+!--FF8081812E0A7E62012E0A8326F7000C-- DESCRIPTION![CDATA[Generated UI
processes called from buttons within tabs can be secured by setting this
property to 'Y'. If this property is not set, they can be executed without
giving explicit access by all roles with access to that window.]]/DESCRIPTION
+!--FF8081812E0A7E62012E0A8326F7000C--
AD_REFERENCE_ID![CDATA[A26BA480E2014707B47257024C3CBFF7]]/AD_REFERENCE_ID
+!--FF8081812E0A7E62012E0A8326F7000C--
AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID
+!--FF8081812E0A7E62012E0A8326F7000C--/AD_REF_LIST
+
/data
diff -r fe47bc58a8ae -r ce8c13ed21b7
src-wad/src/org/openbravo/wad/javasource.javaxml
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml Wed Feb 09 12:30:53
2011 +0100
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml Wed Feb 09 17:33:28
2011 +0100
@@ -12,7 +12,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) 2001-2010 Openbravo SLU
+ * All portions are Copyright (C) 2001-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
@@ -67,12 +67,25 @@
ServletException {
VariablesSecureApp vars = new VariablesSecureApp(request);
String command = vars.getCommand();
+
+boolean securedProcess = false;
if (command.contains(BUTTON)) {
+ try {
+securedProcess =
Y.equals(org.openbravo.erpCommon.businessUtility.Preferences
+.getPreferenceValue(SecuredProcess, true, vars.getClient(),
vars.getOrg(), vars
+.getUser(), vars.getRole(), windowId));
+ } catch (PropertyException e) {
+ }
+
FIELDS_TMP id=sectionActionButtonsService
if (command.contains(FIELD_TMP
id=ProcessIDsrvprocessId/FIELD_TMP)) {
SessionInfo.setProcessType(P);
SessionInfo.setProcessId(FIELD_TMP
id=ProcessIDsrvprocessId/FIELD_TMP);
SessionInfo.setModuleId(FIELD_TMP
id=ProcessModulesrvmoduleId/FIELD_TMP);
+if (securedProcess) {
+ classInfo.type = P;
+ classInfo.id = FIELD_TMP id=ProcessIDsrvprocessId/FIELD_TMP;
+}
}
/FIELDS_TMP
FIELDS_TMP id=sectionActionButtonsServiceJava
@@ -80,9 +93,17 @@
SessionInfo.setProcessType(P);
SessionInfo.setProcessId(FIELD_TMP
id=ProcessIDsrvJprocessId/FIELD_TMP);
SessionInfo.setModuleId(FIELD_TMP
id=ProcessModulesrvJmoduleId/FIELD_TMP);
+if (securedProcess) {
+ classInfo.type = P;
+ classInfo.id = FIELD_TMP id=ProcessIDsrvJprocessId/FIELD_TMP;
+}
}
/FIELDS_TMP
}
+if (!securedProcess) {
+ classInfo.type = W;
+ classInfo.id = windowId;
+}
super.service(request, response);
}
/PARAMETER_TMP
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/9a61e6cef524
changeset: 10483:9a61e6cef524
user: Gorka Ion Damián gorkaion.damian at openbravo.com
date: Wed Feb 09 17:38:56 2011 +0100
summary: [OBUISEL] Properly define foreign key fields on the grid.
details: /erp/devel/pi/rev/1e14058a7dec
changeset: 10484:1e14058a7dec
user: Gorka Ion Damián gorkaion.damian at openbravo.com
date: Wed Feb 09 17:39:38 2011 +0100
summary: [OBUISEL] Implement default expressions on grid fields.
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 16 +++-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
| 42 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 2 +-
3 files changed, 57 insertions(+), 3 deletions(-)
diffs (132 lines):
diff -r 9158261ee690 -r 1e14058a7dec
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Wed Feb 09 17:36:03 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Wed Feb 09 17:39:38 2011 +0100
@@ -539,7 +539,8 @@
// in that case always show the identifier
final DomainType domainType = getDomainType(selectorField);
if (domainType instanceof ForeignKeyDomainType) {
-fieldName = fieldName + . + JsonConstants.IDENTIFIER;
+String displayField = fieldName + . + JsonConstants.IDENTIFIER;
+localSelectorField.setDisplayField(displayField);
}
localSelectorField.setName(fieldName);
@@ -639,6 +640,7 @@
public static class LocalSelectorField {
private String title;
private String name;
+private String displayField;
private boolean filter;
private boolean sort;
private DomainType domainType;
@@ -667,6 +669,14 @@
this.name = name;
}
+public String getDisplayField() {
+ return displayField;
+}
+
+public void setDisplayField(String displayField) {
+ this.displayField = displayField;
+}
+
public ListLocalSelectorFieldProperty getProperties() {
final ListLocalSelectorFieldProperty result = new
ArrayListLocalSelectorFieldProperty();
result.add(createLocalSelectorFieldProperty(title, title));
@@ -685,6 +695,10 @@
function(value) { return
OB.Utilities.getYesNoDisplayValue(value);}));
}
}
+ if (domainType instanceof ForeignKeyDomainType) {
+result.add(createLocalSelectorFieldProperty(displayField,
displayField));
+
result.add(createNonStringLocalSelectorFieldProperty(filterEditorType,
OBTextItem));
+ }
return result;
}
diff -r 9158261ee690 -r 1e14058a7dec
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
Wed Feb 09 17:36:03 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
Wed Feb 09 17:39:38 2011 +0100
@@ -29,12 +29,21 @@
import org.apache.log4j.Logger;
import org.codehaus.jettison.json.JSONObject;
import org.hibernate.criterion.Expression;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.model.Property;
+import org.openbravo.base.model.Reference;
+import org.openbravo.base.model.domaintype.DomainType;
+import org.openbravo.base.model.domaintype.ForeignKeyDomainType;
+import org.openbravo.base.util.Check;
import org.openbravo.client.application.OBBindings;
import org.openbravo.client.kernel.BaseActionHandler;
import org.openbravo.client.kernel.KernelConstants;
+import org.openbravo.dal.core.DalUtil;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
+import org.openbravo.service.json.JsonConstants;
/**
*
@@ -77,10 +86,17 @@
for (SelectorField f : obc.list()) {
try {
exprResult = engine.eval(f.getDefaultExpression());
+
if (sel.isCustomQuery()) {
result.put(f.getDisplayColumnAlias(), exprResult);
} else {
-result.put(f.getProperty(), exprResult);
+final DomainType domainType = getDomainType(f);
+String fieldName = f.getProperty();
+if (domainType instanceof ForeignKeyDomainType) {
+ fieldName = fieldName + . + JsonConstants.IDENTIFIER;
+}
+
+result.put(fieldName,
[OpenbravoERP-commits] devel/pi: Fixed 'Installation History' Search button html
details: /erp/devel/pi/rev/a5da93a71cd6
changeset: 10485:a5da93a71cd6
user: David Baz Fayos david.baz at openbravo.com
date: Wed Feb 09 17:48:09 2011 +0100
summary: Fixed 'Installation History' Search button html
diffstat:
src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html | 30
+++---
1 files changed, 21 insertions(+), 9 deletions(-)
diffs (40 lines):
diff -r 1e14058a7dec -r a5da93a71cd6
src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html Wed Feb
09 17:39:38 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html Wed Feb
09 17:48:09 2011 +0100
@@ -361,15 +361,27 @@
td class=TitleCell/td
td class=Button_LeftAlign_ContentCell colspan=2
div
-a class=ButtonLink_default href=#
onfocus=setWindowElementFocus(this); window.status='Search'; return true;
onblur=window.status=''; return true;
onkeypress=this.className='ButtonLink_active'; return true;
onkeyup=this.className='ButtonLink_focus'; return true;
onclick=submitCommandForm('HISTORY_SEARCH', false, null,
'ModuleManagement.html', '_self', null, false);return false; id=buttonHTML
-table class=Button
onmouseout=this.className='Button';window.status='';return true;
onmouseover=this.className='Button_hover';window.status='Search';return true;
onmousedown=this.className='Button_active';return true;
onmouseup=this.className='Button';return true;
- tbodytr
-td class=Button_leftimg class=Button_Icon
Button_Icon_search alt=Search title=Search
src=../../../../../web/images/blank.gif border=0/td
-td class=Button_textSearch/td
-td class=Button_right/td
- /tr
-/tbody/table
-/a
+button type=button
+ id=buttonHTML
+ class=ButtonLink
+ onclick=submitCommandForm('HISTORY_SEARCH', false,
null, 'ModuleManagement.html', '_self', null, false);return false;
+ onfocus=buttonEvent('onfocus', this);
window.status='Search'; return true;
+ onblur=buttonEvent('onblur', this);
+ onkeyup=buttonEvent('onkeyup', this);
+ onkeydown=buttonEvent('onkeydown', this);
+ onkeypress=buttonEvent('onkeypress', this);
+ onmouseup=buttonEvent('onmouseup', this);
+ onmousedown=buttonEvent('onmousedown', this);
+ onmouseover=buttonEvent('onmouseover', this);
window.status='Search'; return true;
+ onmouseout=buttonEvent('onmouseout', this);
+ table class=Button id=fieldTable
+tr
+ td class=Button_leftimg class=Button_Icon
Button_Icon_search alt=Search title=Search
src=../../../../../web/images/blank.gif border=0 //td
+ td class=Button_text Button_widthSearch/td
+ td class=Button_right/td
+/tr
+ /table
+/button
/div
/td
td class=ContentCell/td
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] stable/2.50: Removes new button for bankstatement and lines
details: /erp/stable/2.50/rev/b2219dd654ed changeset: 9193:b2219dd654ed user: Eduardo Argal Guibert eduardo.argal at openbravo.com date: Wed Feb 09 18:05:26 2011 +0100 summary: Removes new button for bankstatement and lines diffstat: src-db/database/sourcedata/AD_TAB.xml | 8 1 files changed, 4 insertions(+), 4 deletions(-) diffs (39 lines): diff -r ce8c13ed21b7 -r b2219dd654ed src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml Wed Feb 09 17:33:28 2011 +0100 +++ b/src-db/database/sourcedata/AD_TAB.xml Wed Feb 09 18:05:26 2011 +0100 @@ -13282,7 +13282,7 @@ !--7F5E8E4C55914138A358F5087B532B59-- AD_WINDOW_ID![CDATA[94EAA455D2644E04AB25D93BE5157B6D]]/AD_WINDOW_ID !--7F5E8E4C55914138A358F5087B532B59-- SEQNO![CDATA[40]]/SEQNO !--7F5E8E4C55914138A358F5087B532B59-- TABLEVEL![CDATA[2]]/TABLEVEL -!--7F5E8E4C55914138A358F5087B532B59-- ISSINGLEROW![CDATA[N]]/ISSINGLEROW +!--7F5E8E4C55914138A358F5087B532B59-- ISSINGLEROW![CDATA[Y]]/ISSINGLEROW !--7F5E8E4C55914138A358F5087B532B59-- ISINFOTAB![CDATA[N]]/ISINFOTAB !--7F5E8E4C55914138A358F5087B532B59-- ISTRANSLATIONTAB![CDATA[N]]/ISTRANSLATIONTAB !--7F5E8E4C55914138A358F5087B532B59-- ISREADONLY![CDATA[N]]/ISREADONLY @@ -13291,7 +13291,7 @@ !--7F5E8E4C55914138A358F5087B532B59-- IMPORTFIELDS![CDATA[N]]/IMPORTFIELDS !--7F5E8E4C55914138A358F5087B532B59-- ISSORTTAB![CDATA[N]]/ISSORTTAB !--7F5E8E4C55914138A358F5087B532B59-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID -!--7F5E8E4C55914138A358F5087B532B59-- UIPATTERN![CDATA[STD]]/UIPATTERN +!--7F5E8E4C55914138A358F5087B532B59-- UIPATTERN![CDATA[SR]]/UIPATTERN !--7F5E8E4C55914138A358F5087B532B59--/AD_TAB !--81F3CB82FABC4208BA76DEBB3728A14B--AD_TAB @@ -13712,7 +13712,7 @@ !--C56E698100314AD3A89626CA551C-- AD_WINDOW_ID![CDATA[94EAA455D2644E04AB25D93BE5157B6D]]/AD_WINDOW_ID !--C56E698100314AD3A89626CA551C-- SEQNO![CDATA[30]]/SEQNO !--C56E698100314AD3A89626CA551C-- TABLEVEL![CDATA[1]]/TABLEVEL -!--C56E698100314AD3A89626CA551C-- ISSINGLEROW![CDATA[N]]/ISSINGLEROW +!--C56E698100314AD3A89626CA551C-- ISSINGLEROW![CDATA[Y]]/ISSINGLEROW !--C56E698100314AD3A89626CA551C-- ISINFOTAB![CDATA[N]]/ISINFOTAB !--C56E698100314AD3A89626CA551C-- ISTRANSLATIONTAB![CDATA[N]]/ISTRANSLATIONTAB !--C56E698100314AD3A89626CA551C-- ISREADONLY![CDATA[N]]/ISREADONLY @@ -13722,7 +13722,7 @@ !--C56E698100314AD3A89626CA551C-- IMPORTFIELDS![CDATA[N]]/IMPORTFIELDS !--C56E698100314AD3A89626CA551C-- ISSORTTAB![CDATA[N]]/ISSORTTAB !--C56E698100314AD3A89626CA551C-- AD_MODULE_ID![CDATA[0]]/AD_MODULE_ID -!--C56E698100314AD3A89626CA551C-- UIPATTERN![CDATA[STD]]/UIPATTERN +!--C56E698100314AD3A89626CA551C-- UIPATTERN![CDATA[SR]]/UIPATTERN !--C56E698100314AD3A89626CA551C--/AD_TAB !--C65BA4DF317D46CDA72EF9414A3A23ED--AD_TAB -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/0e36af6daf59
changeset: 10487:0e36af6daf59
user: Antonio Moreno antonio.moreno at openbravo.com
date: Wed Feb 09 17:31:26 2011 +0100
summary: Improved refresh so that it still calls the callback, so the final
message of processes is shown
details: /erp/devel/pi/rev/89d852da8661
changeset: 10488:89d852da8661
user: Antonio Moreno antonio.moreno at openbravo.com
date: Wed Feb 09 18:38:33 2011 +0100
summary: Do not hide the message box after a refresh
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 11 +++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 13 ++
2 files changed, 17 insertions(+), 7 deletions(-)
diffs (58 lines):
diff -r 16e1d3817f01 -r 89d852da8661
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
Wed Feb 09 18:36:01 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Wed Feb 09 18:38:33 2011 +0100
@@ -1114,24 +1114,21 @@
}
if (!this.isShowingForm) {
- this.messageBar.hide();
- this.viewGrid.targetRecordId =
this.viewGrid.getSelectedRecord()[OB.Constants.ID];
- this.viewGrid.invalidateCache();
+ this.viewGrid.refreshGrid();
} else {
var view = this;
if (this.viewForm.hasChanged) {
var callback = function(ok){
if (ok) {
-this.viewGrid.targetRecordId =
this.viewGrid.getSelectedRecord()[OB.Constants.ID];
-this.viewGrid.invalidateCache();
+this.viewGrid.refreshGrid();
}
};
isc.ask(OB.I18N.getLabel('OBUIAPP_ConfirmRefresh'), callback);
} else {
-this.viewGrid.targetRecordId =
this.viewGrid.getSelectedRecord()[OB.Constants.ID];
-this.viewGrid.invalidateCache();
+this.viewGrid.refreshGrid();
}
}
+refreshCallback();
},
saveRow: function(){
diff -r 16e1d3817f01 -r 89d852da8661
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Wed Feb 09 18:36:01 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Wed Feb 09 18:38:33 2011 +0100
@@ -425,9 +425,22 @@
}
}
+if(this.actionAfterDataArrived){
+ this.actionAfterDataArrived();
+ this.actionAfterDataArrived = null;
+}
+
return ret;
},
+ refreshGrid: function(callback){
+ if(this.getSelectedRecord()){
+ this.targetRecordId = this.getSelectedRecord()[OB.Constants.ID];
+ }
+this.actionAfterDataArrived = callback;
+this.invalidateCache();
+ },
+
// with a delay to handle the target record when the body has been drawn
delayedHandleTargetRecord: function(startRow, endRow){
var rowTop, recordIndex, i, data = this.data, tmpTargetRecordId =
this.targetRecordId;
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/389529e55ba6 changeset: 10489:389529e55ba6 user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 19:39:32 2011 +0100 summary: CI: update AD_MODULE to version 10485 details: /erp/devel/pi/rev/d50877adc158 changeset: 10490:d50877adc158 user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 19:55:40 2011 +0100 summary: CI: merge back from main 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_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js | 11 +--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js | 13 + 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/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.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.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.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 | 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 | 12 ++-- src-db/database/sourcedata/AD_MODULE.xml | 2 +- web/skins/Default/Openbravo_ERP_250.css | 11 ++-- 36 files changed, 91 insertions(+), 80 deletions(-) diffs (truncated from 805 to 300 lines): diff -r a5da93a71cd6 -r d50877adc158 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 09 17:48:09 2011 +0100 +++
[OpenbravoERP-commits] devel/main: 6 new changesets
details: /erp/devel/main/rev/16e1d3817f01 changeset: 10487:16e1d3817f01 user: David Baz Fayos david.baz at openbravo.com date: Wed Feb 09 18:36:01 2011 +0100 summary: [classic][style] Popup contents are now centered in Google Chrome details: /erp/devel/main/rev/0e36af6daf59 changeset: 10488:0e36af6daf59 user: Antonio Moreno antonio.moreno at openbravo.com date: Wed Feb 09 17:31:26 2011 +0100 summary: Improved refresh so that it still calls the callback, so the final message of processes is shown details: /erp/devel/main/rev/89d852da8661 changeset: 10489:89d852da8661 user: Antonio Moreno antonio.moreno at openbravo.com date: Wed Feb 09 18:38:33 2011 +0100 summary: Do not hide the message box after a refresh details: /erp/devel/main/rev/d50877adc158 changeset: 10490:d50877adc158 user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 19:55:40 2011 +0100 summary: CI: merge back from main details: /erp/devel/main/rev/8f91d7bd686d changeset: 10491:8f91d7bd686d user: David Baz Fayos david.baz at openbravo.com date: Wed Feb 09 20:53:47 2011 +0100 summary: Fixed issue 15564: Put default Chrome input type file button details: /erp/devel/main/rev/0efb0229cdcd changeset: 10492:0efb0229cdcd user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 21:59:00 2011 +0100 summary: CI: update AD_MODULE to version 10491 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_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js | 11 +--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js | 13 + 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/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.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.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.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 +-
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: /erp/devel/pi/rev/0efb0229cdcd changeset: 10492:0efb0229cdcd user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 21:59:00 2011 +0100 summary: CI: update AD_MODULE to version 10491 details: /erp/devel/pi/rev/6e6c31b37e01 changeset: 10493:6e6c31b37e01 user: RM packaging bot staff.rm at openbravo.com date: Wed Feb 09 22:14:30 2011 +0100 summary: CI: merge back from main 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_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- 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/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.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.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.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 | 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 | 12 ++-- src-db/database/sourcedata/AD_MODULE.xml | 2 +- 33 files changed, 68 insertions(+), 68 deletions(-) diffs (truncated from 711 to 300 lines): diff -r 8f91d7bd686d -r 6e6c31b37e01 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 09 20:53:47 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Feb 09 22:14:30 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
[OpenbravoERP-commits] devel/pi: Implemented grid row insert
details: /erp/devel/pi/rev/72ebe51eaba1 changeset: 10494:72ebe51eaba1 user: Martin Taal martin.taal at openbravo.com date: Thu Feb 10 01:38:24 2011 +0100 summary: Implemented grid row insert diffstat: modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 11 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java |8 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js | 51 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js | 59 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js | 42 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js | 14 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js | 13 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js | 105 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js | 235 +++-- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css | 15 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js |3 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java |4 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java |2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java | 1 + modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 11 + modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js |1 + 16 files changed, 411 insertions(+), 164 deletions(-) diffs (truncated from 1285 to 300 lines): diff -r 6e6c31b37e01 -r 72ebe51eaba1 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Wed Feb 09 22:14:30 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Thu Feb 10 01:38:24 2011 +0100 @@ -1091,4 +1091,15 @@ !--FF8081812DEFDA2B012DEFEDE770003A-- AD_MODULE_ID![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]/AD_MODULE_ID !--FF8081812DEFDA2B012DEFEDE770003A--/AD_MESSAGE +!--FF8081812E0CE808012E0CF95450002B--AD_MESSAGE +!--FF8081812E0CE808012E0CF95450002B-- AD_MESSAGE_ID![CDATA[FF8081812E0CE808012E0CF95450002B]]/AD_MESSAGE_ID +!--FF8081812E0CE808012E0CF95450002B-- AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID +!--FF8081812E0CE808012E0CF95450002B-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID +!--FF8081812E0CE808012E0CF95450002B-- ISACTIVE![CDATA[Y]]/ISACTIVE +!--FF8081812E0CE808012E0CF95450002B-- VALUE![CDATA[OBUIAPP_ParentIsNew]]/VALUE +!--FF8081812E0CE808012E0CF95450002B-- MSGTEXT![CDATA[The parent record is an unsaved new record, save it to create child records.]]/MSGTEXT +!--FF8081812E0CE808012E0CF95450002B-- MSGTYPE![CDATA[I]]/MSGTYPE +!--FF8081812E0CE808012E0CF95450002B-- AD_MODULE_ID![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]/AD_MODULE_ID +!--FF8081812E0CE808012E0CF95450002B--/AD_MESSAGE + /data diff -r 6e6c31b37e01 -r 72ebe51eaba1 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 Wed Feb 09 22:14:30 2011 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Thu Feb 10 01:38:24 2011 +0100 @@ -41,6 +41,7 @@ import
[OpenbravoERP-commits] devel/pi: Solved active view not set when clicking in filter field
details: /erp/devel/pi/rev/3f43472db631
changeset: 10495:3f43472db631
user: Martin Taal martin.taal at openbravo.com
date: Thu Feb 10 01:54:25 2011 +0100
summary: Solved active view not set when clicking in filter field
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-eventhandler.js
| 11 +++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
| 19 +++
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
| 26 +
3 files changed, 31 insertions(+), 25 deletions(-)
diffs (91 lines):
diff -r 72ebe51eaba1 -r 3f43472db631
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 Feb 10 01:38:24 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-eventhandler.js
Thu Feb 10 01:54:25 2011 +0100
@@ -52,10 +52,15 @@
canvas.view.setAsActiveView();
return true;
}
- if (isc.FormItem.isA(canvas) canvas.grid) {
+ if (isc.FormItem.isA(canvas)) {
+var view = OB.Utilities.determineViewOfFormItem(item);
+if (view view.setAsActiveView) {
+ view.setAsActiveView();
+ return true;
+}
+ }
+ if (!canvas.parentElement canvas.grid) {
canvas = canvas.grid;
- } if (isc.FormItem.isA(canvas) canvas.form) {
-canvas = canvas.form;
} else {
canvas = canvas.parentElement;
}
diff -r 72ebe51eaba1 -r 3f43472db631
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Thu Feb 10 01:38:24 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Thu Feb 10 01:54:25 2011 +0100
@@ -21,6 +21,25 @@
// are related to opening views, opening popups, displaying yes/no, etc.
OB.Utilities = {};
+// ** {{{OB.Utilities.determineViewOfFormItem}}} **
+// Handles the different ways to find the view of a form item.
+OB.Utilities.determineViewOfFormItem = function(item) {
+ var form = item.form;
+ if (form.view) {
+// form item in standard form
+return form.view;
+ } else if (form.grid) {
+// row editor form item
+if (form.grid.view) {
+ return form.grid.view;
+} else if (isc.isA.RecordEditor(form.grid) form.grid.sourceWidget
form.grid.sourceWidget.view) {
+ // filter editor form item
+ return form.grid.sourceWidget.view;
+}
+ }
+ return null;
+};
+
// ** {{{OB.Utilities.callAction}}} **
// Calls the action defined by the action object, if the action object has a
callback
// property, it is assumed to be a function and it is called. Otherwise the
following
diff -r 72ebe51eaba1 -r 3f43472db631
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
---
a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
Thu Feb 10 01:38:24 2011 +0100
+++
b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
Thu Feb 10 01:54:25 2011 +0100
@@ -44,32 +44,14 @@
},
focus: function(form, item){
-var view = this.getView();
-if (!view) {
- return;
+var view = OB.Utilities.determineViewOfFormItem(item);
+if (view) {
+ view.lastFocusedItem = this;
}
-view.lastFocusedItem = this;
- },
-
- getView: function() {
-var form = this.form;
-if (form.view) {
- // form item in standard form
- return form.view;
-} else if (form.grid) {
- // row editor form item
- if (form.grid.view) {
-return form.grid.view;
- } else if (isc.isA.RecordEditor(form.grid) form.grid.sourceWidget
form.grid.sourceWidget.view) {
-// filter editor form item
-return form.grid.sourceWidget.view;
- }
-}
-return null;
},
click: function() {
-var view = this.getView();
+var view = OB.Utilities.determineViewOfFormItem(this);
if (view) {
view.lastFocusedItem = this;
// this handles the case that there was a direct click on picker icon
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
[OpenbravoERP-commits] devel/pi: Prevent undefined error in refresh
details: /erp/devel/pi/rev/bbb89ed3377e
changeset: 10496:bbb89ed3377e
user: Martin Taal martin.taal at openbravo.com
date: Thu Feb 10 02:03:56 2011 +0100
summary: Prevent undefined error in refresh
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (14 lines):
diff -r 3f43472db631 -r bbb89ed3377e
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
Thu Feb 10 01:54:25 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Thu Feb 10 02:03:56 2011 +0100
@@ -1156,7 +1156,9 @@
this.viewGrid.refreshGrid();
}
}
-refreshCallback();
+if (refreshCallback) {
+ refreshCallback();
+}
},
saveRow: function(){
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Handle empty value of combos as a real null
details: /erp/devel/pi/rev/930935b2eaaa
changeset: 10498:930935b2eaaa
user: Martin Taal martin.taal at openbravo.com
date: Thu Feb 10 02:36:13 2011 +0100
summary: Handle empty value of combos as a real null
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 10 ++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 2 +-
2 files changed, 11 insertions(+), 1 deletions(-)
diffs (33 lines):
diff -r 64ca5cc8ca5f -r 930935b2eaaa
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Thu Feb 10 02:16:20 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Thu Feb 10 02:36:13 2011 +0100
@@ -421,7 +421,17 @@
return '';
}
return ret;
+ },
+
+ // the empty value is a string null instead of a 'null'
+ mapDisplayToValue: function(displayValue) {
+var ret = this.Super('mapDisplayToValue', arguments);
+if (ret === 'null') {
+ return null;
+}
+return ret;
}
+
});
// == OBFKItem ==
diff -r 64ca5cc8ca5f -r 930935b2eaaa
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Thu Feb 10 02:16:20 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Thu Feb 10 02:36:13 2011 +0100
@@ -362,7 +362,7 @@
// don't set the entries
if (field.form entries) {
for (i = 0; i entries.length; i++) {
-id = entries[i][OB.Constants.ID] || 'null';
+id = entries[i][OB.Constants.ID] || null;
identifier = entries[i][OB.Constants.IDENTIFIER] || '';
valueMap[id] = (identifier === 'null' ? null : identifier);
}
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Added confirmation for logout
details: /erp/devel/pi/rev/5626365994da
changeset: 10499:5626365994da
user: Martin Taal martin.taal at openbravo.com
date: Thu Feb 10 02:47:15 2011 +0100
summary: Added confirmation for logout
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 11 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
| 113 +
2 files changed, 71 insertions(+), 53 deletions(-)
diffs (196 lines):
diff -r 930935b2eaaa -r 5626365994da
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
Thu Feb 10 02:36:13 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Thu Feb 10 02:47:15 2011 +0100
@@ -1102,4 +1102,15 @@
!--FF8081812E0CE808012E0CF95450002B--
AD_MODULE_ID![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]/AD_MODULE_ID
!--FF8081812E0CE808012E0CF95450002B--/AD_MESSAGE
+!--FF8081812E0CE808012E0D37FF720093--AD_MESSAGE
+!--FF8081812E0CE808012E0D37FF720093--
AD_MESSAGE_ID![CDATA[FF8081812E0CE808012E0D37FF720093]]/AD_MESSAGE_ID
+!--FF8081812E0CE808012E0D37FF720093--
AD_CLIENT_ID![CDATA[0]]/AD_CLIENT_ID
+!--FF8081812E0CE808012E0D37FF720093-- AD_ORG_ID![CDATA[0]]/AD_ORG_ID
+!--FF8081812E0CE808012E0D37FF720093-- ISACTIVE![CDATA[Y]]/ISACTIVE
+!--FF8081812E0CE808012E0D37FF720093--
VALUE![CDATA[OBUIAPP_LogoutConfirmation]]/VALUE
+!--FF8081812E0CE808012E0D37FF720093-- MSGTEXT![CDATA[Are you sure that
you want to logout from the application?]]/MSGTEXT
+!--FF8081812E0CE808012E0D37FF720093-- MSGTYPE![CDATA[I]]/MSGTYPE
+!--FF8081812E0CE808012E0D37FF720093--
AD_MODULE_ID![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]/AD_MODULE_ID
+!--FF8081812E0CE808012E0D37FF720093--/AD_MESSAGE
+
/data
diff -r 930935b2eaaa -r 5626365994da
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Thu Feb 10 02:36:13 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Thu Feb 10 02:47:15 2011 +0100
@@ -23,7 +23,7 @@
// ** {{{OB.Utilities.determineViewOfFormItem}}} **
// Handles the different ways to find the view of a form item.
-OB.Utilities.determineViewOfFormItem = function(item) {
+OB.Utilities.determineViewOfFormItem = function(item){
var form = item.form;
if (form.view) {
// form item in standard form
@@ -53,14 +53,14 @@
}
if (action.callback) {
action.callback();
- } else {
+ } else {
action.method.apply(action.target, action.parameters);
- }
+ }
};
// ** {{{OB.Utilities.replaceNullStringValue}}} **
// Replaces values which are 'null' with null
-OB.Utilities.replaceNullStringValue = function(form, values) {
+OB.Utilities.replaceNullStringValue = function(form, values){
for (var prop in values) {
if (values.hasOwnProperty(prop)) {
var value = values[prop];
@@ -92,47 +92,47 @@
// Open a view taking into account if a specific window should be opened in
classic mode or not.
// Returns the object used to open the window.
OB.Utilities.openView = function(windowId, tabId, tabTitle, recordId, command,
icon){
-var isClassicEnvironment = OB.Utilities.useClassicMode(windowId);
-
-var openObject;
-if (isClassicEnvironment) {
- if (recordId) {
-OB.Layout.ClassicOBCompatibility.openLinkedItem(tabId, recordId);
-return null;
- }
- openObject = {
- viewId: 'OBClassicWindow',
- windowId: windowId,
- tabId: tabId,
- id: tabId,
- command: 'DEFAULT',
- tabTitle: tabTitle,
- icon: icon
- };
-} else if (recordId) {
- openObject = {
-viewId: '_' + windowId,
-id: tabId,
-targetRecordId: recordId,
-targetTabId: tabId,
-tabTitle: tabTitle,
-windowId: windowId
- };
-} else {
- openObject = {
-viewId: '_' + windowId,
-id: tabId,
-tabId: tabId,
-tabTitle: tabTitle,
-windowId: windowId,
-icon: icon
- };
+ var isClassicEnvironment = OB.Utilities.useClassicMode(windowId);
+
+ var openObject;
+ if (isClassicEnvironment) {
+if (recordId) {
+ OB.Layout.ClassicOBCompatibility.openLinkedItem(tabId, recordId);
+ return null;
}
-if (command) {
- openObject.command = command;
-}
-OB.Layout.ViewManager.openView(openObject.viewId, openObject);
-return openObject;
+openObject = {
+ viewId: 'OBClassicWindow',
+ windowId: windowId,
+ tabId: tabId,
+ id: tabId,
+ command: 'DEFAULT',
+ tabTitle: tabTitle,
+ icon: icon
+};
+ } else if (recordId) {
+openObject =
[OpenbravoERP-commits] devel/pi: Solve validation errors in grid filtering
details: /erp/devel/pi/rev/c4044350221b
changeset: 10500:c4044350221b
user: Martin Taal martin.taal at openbravo.com
date: Thu Feb 10 03:07:00 2011 +0100
summary: Solve validation errors in grid filtering
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 12 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
| 5
2 files changed, 16 insertions(+), 1 deletions(-)
diffs (37 lines):
diff -r 5626365994da -r c4044350221b
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Thu Feb 10 02:47:15 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Thu Feb 10 03:07:00 2011 +0100
@@ -311,7 +311,17 @@
isc.ClassFactory.defineClass('OBFKFilterTextItem', TextItem);
isc.OBFKFilterTextItem.addProperties({
- validateOnExit: true
+ validateOnExit: false,
+ validateOnChange: false
+});
+
+//== OBListFilterTextItem ==
+//Input used for filtering on list fields.
+isc.ClassFactory.defineClass('OBListFilterTextItem', TextItem);
+
+isc.OBListFilterTextItem.addProperties({
+ validateOnExit: false,
+ validateOnChange: false
});
// == OBTextAreaItem ==
diff -r 5626365994da -r c4044350221b
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
Thu Feb 10 02:47:15 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
Thu Feb 10 03:07:00 2011 +0100
@@ -41,6 +41,11 @@
}
@Override
+ public String getFilterEditorType() {
+return OBListFilterTextItem;
+ }
+
+ @Override
public String getFieldProperties(Field field, boolean getValueFromSession) {
JSONObject value;
try {
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Several improvements to inline editing
details: /erp/devel/pi/rev/ceff6c1f72dd
changeset: 10505:ceff6c1f72dd
user: Martin Taal martin.taal at openbravo.com
date: Thu Feb 10 05:55:58 2011 +0100
summary: Several improvements to inline editing
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 20 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 4 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 5 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 34 -
5 files changed, 55 insertions(+), 10 deletions(-)
diffs (164 lines):
diff -r c1ca508f8ed3 -r ceff6c1f72dd
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 Feb 10 04:51:17 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Thu Feb 10 05:55:58 2011 +0100
@@ -66,6 +66,7 @@
import org.openbravo.model.ad.ui.Field;
import org.openbravo.model.ad.ui.Tab;
import org.openbravo.service.db.DalConnectionProvider;
+import org.openbravo.service.json.JsonConstants;
import org.openbravo.service.json.JsonToDataConverter;
import org.openbravo.service.json.JsonUtils;
@@ -144,7 +145,23 @@
if (row == null) {
final JsonToDataConverter fromJsonConverter =
OBProvider.getInstance().get(
JsonToDataConverter.class);
-row = fromJsonConverter.toBaseOBObject(jsContent);
+
+// create a new json object using property names:
+final JSONObject convertedJson = new JSONObject();
+final Entity entity = ModelProvider.getInstance().getEntityByTableName(
+tab.getTable().getDBTableName());
+for (Property property : entity.getProperties()) {
+ if (property.getColumnName() != null) {
+final String inpName = inp +
Sqlc.TransformaNombreColumna(property.getColumnName());
+if (jsContent.has(inpName)) {
+ convertedJson.put(property.getName(), jsContent.get(inpName));
+}
+ }
+}
+// remove the id as it must be a new record
+convertedJson.remove(id);
+convertedJson.put(JsonConstants.ENTITYNAME, entity.getName());
+row = fromJsonConverter.toBaseOBObject(convertedJson);
row.setNewOBObject(true);
}
@@ -193,6 +210,7 @@
+ (t8 - t7) + ));
return finalObject;
} catch (Throwable t) {
+ t.printStackTrace(System.err);
final String jsonString = JsonUtils.convertExceptionToJson(t);
try {
return new JSONObject(jsonString);
diff -r c1ca508f8ed3 -r ceff6c1f72dd
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
Thu Feb 10 04:51:17 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Thu Feb 10 05:55:58 2011 +0100
@@ -552,6 +552,10 @@
this.activeBar.setActive(true);
this.setViewFocus();
} else {
+
+ // close any editors we may have
+ this.viewGrid.closeAnyOpenEditor();
+
this.toolBar.hide();
this.activeBar.setActive(false);
// note we can not check on viewForm visibility as
diff -r c1ca508f8ed3 -r ceff6c1f72dd
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Thu Feb 10 04:51:17 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Thu Feb 10 05:55:58 2011 +0100
@@ -153,7 +153,7 @@
doActionAfterAutoSave: function(action, forceDialogOnFailure) {
// if not dirty or we know that the object has errors
if (!this.isDirty() || (this.getDirtyEditForm()
this.getDirtyEditForm().hasErrors())) {
-
+
// clean up before calling the action, as the action
// can set dirty form again
this.cleanUpAutoSaveProperties();
diff -r c1ca508f8ed3 -r ceff6c1f72dd
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Thu Feb 10 04:51:17 2011 +0100
+++
[OpenbravoERP-commits] devel/pi: Actual column value is now also read for combos
details: /erp/devel/pi/rev/02a5a65d32e6 changeset: 10506:02a5a65d32e6 user: Martin Taal martin.taal at openbravo.com date: Thu Feb 10 06:07:02 2011 +0100 summary: Actual column value is now also read for combos diffstat: modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ceff6c1f72dd -r 02a5a65d32e6 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java Thu Feb 10 05:55:58 2011 +0100 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java Thu Feb 10 06:07:02 2011 +0100 @@ -356,7 +356,7 @@ ref, field.getColumn().getDBColumnName(), objectReference, validation, orgList, clientList, 0); FieldProvider tabData = generateTabData(field.getTab().getADFieldList(), field, columnValue); - comboTableData.fillParameters(tabData, field.getTab().getWindow().getId(), ); + comboTableData.fillParameters(tabData, field.getTab().getWindow().getId(), columnValue); FieldProvider[] fps = comboTableData.select(getValueFromSession !comboreload); ArrayListFieldProvider values = new ArrayListFieldProvider(); values.addAll(Arrays.asList(fps)); -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
