details: /erp/devel/pi/rev/0788bc676892
changeset: 11601:0788bc676892
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 09:47:25 2011 +0200
summary: fixed bug 16794: Planning Method Line: line no is not increased by
default
details: /erp/devel/pi/rev/4bcc6d3bc239
changeset: 11602:4bcc6d3bc239
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 12:01:31 2011 +0200
summary: fixed bug 16805: Modal Processes: Order and Invoice
Window Tab Process
-----------------------------------
Purchase Order Header Copy Lines
Purchase Order Header Copy from Order
Sales Order Header Copy Lines
Sales Order Header Copy from Order
Purchase Invoice Header Add Payment In/Out
Purchase Invoice Header APRM Process Invoice
Purchase Invoice Header Copy Lines
Sales Invoice Header Add Payment In/Out
Sales Invoice Header APRM Process Invoice
Sales Invoice Header Copy Lines
details: /erp/devel/pi/rev/e1e7137b54eb
changeset: 11603:e1e7137b54eb
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 12:52:42 2011 +0200
summary: fixed bug 16806: Modal Processes: Payments
Window Tab Process
------------------------------------------------
Payment In Header Add Details
Payment In Header Execute Payment
Payment Out Header Add Details
Payment Out Header Execute Payment
Payment Proposal Header Select Expected Payments
Payment Proposal Header Process Payment Proposal
Payment Proposal Header Execute Payment
Tax Payment Header Create Vat Registers
details: /erp/devel/pi/rev/b76deca062df
changeset: 11604:b76deca062df
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 13:12:51 2011 +0200
summary: fixed bug 16807: Modal Processes: Pocess Request
Schedule Process
Reschedule Process
Unschedule Process
Display Jasper Report (not used)
details: /erp/devel/pi/rev/3d8860717402
changeset: 11605:3d8860717402
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 13:32:14 2011 +0200
summary: fixed bug 16810: Modal Processes: Projects
Window Tab Process
------------------------------------------------------------
Multiphase Project Multiphase Project Set Project Type
Multiphase Project Multiphase Project Copy Details
Service Project Service Project Copy Details
details: /erp/devel/pi/rev/d86147412325
changeset: 11606:d86147412325
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 14:30:07 2011 +0200
summary: fixed bug 16812: Modal Processes: Accounting
Window Tab
Process
-----------------------------------------------------
Accounting Dimension Project Dimension Close Project
Fiscal Calendar Year Create Reg Fact
Acct
Fiscal Calendar Year Drop Reg Fact
Acct
G/L Journal Batch Copy
Details
details: /erp/devel/pi/rev/d1f58b943d29
changeset: 11607:d1f58b943d29
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 15:12:55 2011 +0200
summary: fixed bug 16814: Modal Processes: Configuration
Window Tab
Process
-----------------------------------------------------------------------
Dataset Dataset
Export Reference Data
Heartbeat Configuration Heartbeat Configuration TestHeartbeat
Heartbeat Configuration Heartbeat Configuration Disable Heartbeat
Module Module
Register Module
Role Role
Grant Access
Instance Management (Manual Form)
details: /erp/devel/pi/rev/e92ed091c0cc
changeset: 11608:e92ed091c0cc
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 17:14:35 2011 +0200
summary: fixed issue 16609: Left-align dates
details: /erp/devel/pi/rev/46438c323822
changeset: 11609:46438c323822
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 17:35:24 2011 +0200
summary: fixed bug 16768: Date changed using calendar icon not detected as
change
details: /erp/devel/pi/rev/7d56cd330ed3
changeset: 11610:7d56cd330ed3
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 14 18:40:33 2011 +0200
summary: fixed issue 16573: Insert row below the selected row when adding row
via toolbar
details: /erp/devel/pi/rev/4ff40eabc82e
changeset: 11611:4ff40eabc82e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 15 11:20:46 2011 +0200
summary: fixed bug 16753: Read only Date fields can be changed
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml
| 66 ---
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
| 6 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
| 6 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.html
| 6 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessPaymentProposal.html
| 6 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html
| 6 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 2 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
| 5 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
| 3 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 12 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 14 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
| 7 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 12 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
src-db/database/sourcedata/AD_PREFERENCE.xml
| 198 ----------
src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromOrder.html
| 6 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters.html
| 20 +-
src/org/openbravo/erpCommon/ad_actionButton/DropRegFactAcct.html
| 32 +-
src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.html
| 28 +-
src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.html
| 42 +-
src/org/openbravo/erpCommon/ad_actionButton/ProjectClose.html
| 30 +-
src/org/openbravo/erpCommon/ad_actionButton/ProjectCopyFrom.html
| 30 +-
src/org/openbravo/erpCommon/ad_actionButton/ProjectSetType.html
| 30 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html
| 8 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html
| 7 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html
| 7 +-
src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html
| 8 +-
src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.html
| 18 +-
src/org/openbravo/erpCommon/ad_process/RegisterModule.html
| 4 +-
30 files changed, 200 insertions(+), 425 deletions(-)
diffs (truncated from 1377 to 300 lines):
diff -r 1d16cc5f261c -r 4ff40eabc82e
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml
Thu Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PREFERENCE.xml
Fri Apr 15 11:20:46 2011 +0200
@@ -44,28 +44,6 @@
<!--9B4A5EB695FEA841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--9B4A5EB695FEA841E040A8C0E1077381--></AD_PREFERENCE>
-<!--9B4A5EB6974FA841E040A8C0E1077381--><AD_PREFERENCE>
-<!--9B4A5EB6974FA841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB6974FA841E040A8C0E1077381]]></AD_PREFERENCE_ID>
-<!--9B4A5EB6974FA841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9B4A5EB6974FA841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9B4A5EB6974FA841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9B4A5EB6974FA841E040A8C0E1077381-->
<ATTRIBUTE><![CDATA[ModalProcess12016E2EDE0245B5A36B84CBA144DBDF]]></ATTRIBUTE>
-<!--9B4A5EB6974FA841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE>
-<!--9B4A5EB6974FA841E040A8C0E1077381-->
<ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST>
-<!--9B4A5EB6974FA841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9B4A5EB6974FA841E040A8C0E1077381--></AD_PREFERENCE>
-
-<!--9B4A5EB69750A841E040A8C0E1077381--><AD_PREFERENCE>
-<!--9B4A5EB69750A841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB69750A841E040A8C0E1077381]]></AD_PREFERENCE_ID>
-<!--9B4A5EB69750A841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9B4A5EB69750A841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9B4A5EB69750A841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9B4A5EB69750A841E040A8C0E1077381-->
<ATTRIBUTE><![CDATA[ModalProcess2EED9BC16DB34D2B80BA40A21564BECF]]></ATTRIBUTE>
-<!--9B4A5EB69750A841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE>
-<!--9B4A5EB69750A841E040A8C0E1077381-->
<ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST>
-<!--9B4A5EB69750A841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9B4A5EB69750A841E040A8C0E1077381--></AD_PREFERENCE>
-
<!--9B4A5EB69751A841E040A8C0E1077381--><AD_PREFERENCE>
<!--9B4A5EB69751A841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB69751A841E040A8C0E1077381]]></AD_PREFERENCE_ID>
<!--9B4A5EB69751A841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -88,17 +66,6 @@
<!--9B4A5EB69752A841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--9B4A5EB69752A841E040A8C0E1077381--></AD_PREFERENCE>
-<!--9B4A5EB69753A841E040A8C0E1077381--><AD_PREFERENCE>
-<!--9B4A5EB69753A841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB69753A841E040A8C0E1077381]]></AD_PREFERENCE_ID>
-<!--9B4A5EB69753A841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9B4A5EB69753A841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9B4A5EB69753A841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9B4A5EB69753A841E040A8C0E1077381-->
<ATTRIBUTE><![CDATA[ModalProcess62E6270312534380B9A8BDF603CA8FBB]]></ATTRIBUTE>
-<!--9B4A5EB69753A841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE>
-<!--9B4A5EB69753A841E040A8C0E1077381-->
<ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST>
-<!--9B4A5EB69753A841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9B4A5EB69753A841E040A8C0E1077381--></AD_PREFERENCE>
-
<!--9B4A5EB69754A841E040A8C0E1077381--><AD_PREFERENCE>
<!--9B4A5EB69754A841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB69754A841E040A8C0E1077381]]></AD_PREFERENCE_ID>
<!--9B4A5EB69754A841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -110,17 +77,6 @@
<!--9B4A5EB69754A841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--9B4A5EB69754A841E040A8C0E1077381--></AD_PREFERENCE>
-<!--9B4A5EB69755A841E040A8C0E1077381--><AD_PREFERENCE>
-<!--9B4A5EB69755A841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB69755A841E040A8C0E1077381]]></AD_PREFERENCE_ID>
-<!--9B4A5EB69755A841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9B4A5EB69755A841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9B4A5EB69755A841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9B4A5EB69755A841E040A8C0E1077381-->
<ATTRIBUTE><![CDATA[ModalProcessB54318B49E984B9CB855AEFB1F474CD6]]></ATTRIBUTE>
-<!--9B4A5EB69755A841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE>
-<!--9B4A5EB69755A841E040A8C0E1077381-->
<ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST>
-<!--9B4A5EB69755A841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9B4A5EB69755A841E040A8C0E1077381--></AD_PREFERENCE>
-
<!--9B4A5EB69756A841E040A8C0E1077381--><AD_PREFERENCE>
<!--9B4A5EB69756A841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB69756A841E040A8C0E1077381]]></AD_PREFERENCE_ID>
<!--9B4A5EB69756A841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -154,28 +110,6 @@
<!--9B4A5EB69758A841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--9B4A5EB69758A841E040A8C0E1077381--></AD_PREFERENCE>
-<!--9B4A5EB69759A841E040A8C0E1077381--><AD_PREFERENCE>
-<!--9B4A5EB69759A841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB69759A841E040A8C0E1077381]]></AD_PREFERENCE_ID>
-<!--9B4A5EB69759A841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9B4A5EB69759A841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9B4A5EB69759A841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9B4A5EB69759A841E040A8C0E1077381-->
<ATTRIBUTE><![CDATA[ModalProcessDC23BB9234174E52879E4B21C8CD1F4B]]></ATTRIBUTE>
-<!--9B4A5EB69759A841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE>
-<!--9B4A5EB69759A841E040A8C0E1077381-->
<ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST>
-<!--9B4A5EB69759A841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9B4A5EB69759A841E040A8C0E1077381--></AD_PREFERENCE>
-
-<!--9B4A5EB6975AA841E040A8C0E1077381--><AD_PREFERENCE>
-<!--9B4A5EB6975AA841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB6975AA841E040A8C0E1077381]]></AD_PREFERENCE_ID>
-<!--9B4A5EB6975AA841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9B4A5EB6975AA841E040A8C0E1077381--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9B4A5EB6975AA841E040A8C0E1077381--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9B4A5EB6975AA841E040A8C0E1077381-->
<ATTRIBUTE><![CDATA[ModalProcessE011F492B0814A74B63CD1F3B9FF0526]]></ATTRIBUTE>
-<!--9B4A5EB6975AA841E040A8C0E1077381--> <VALUE><![CDATA[N]]></VALUE>
-<!--9B4A5EB6975AA841E040A8C0E1077381-->
<ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST>
-<!--9B4A5EB6975AA841E040A8C0E1077381-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9B4A5EB6975AA841E040A8C0E1077381--></AD_PREFERENCE>
-
<!--9B4A5EB6975BA841E040A8C0E1077381--><AD_PREFERENCE>
<!--9B4A5EB6975BA841E040A8C0E1077381-->
<AD_PREFERENCE_ID><![CDATA[9B4A5EB6975BA841E040A8C0E1077381]]></AD_PREFERENCE_ID>
<!--9B4A5EB6975BA841E040A8C0E1077381-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 1d16cc5f261c -r 4ff40eabc82e
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Thu Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Fri Apr 15 11:20:46 2011 +0200
@@ -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) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
*************************************************************************
@@ -80,7 +80,7 @@
var temp = document.getElementById('sectionGrid');
temp.parentNode.removeChild(temp);
}
- submitCommandForm(strCommand, false, null, null, '_top');
+ submitCommandForm(strCommand, false, null, null);
return true;
}
return true;
@@ -283,7 +283,7 @@
initialize_MessageBox('messageBoxID');
if (paramXMLParticular != null) {
- parent.window.close();
+ closePage();
return true;
}
diff -r 1d16cc5f261c -r 4ff40eabc82e
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
Thu Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
Fri Apr 15 11:20:46 2011 +0200
@@ -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) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
*************************************************************************
@@ -90,12 +90,12 @@
</script>
<script language="JavaScript" type="text/javascript">
function closeThisPage() {
- parent.window.close();
+ closePage();
return true;
}
function submitThisPage(strCommand) {
if (validate(strCommand)) {
- submitCommandForm(strCommand, false, null, null, '_top');
+ submitCommandForm(strCommand, false, null, null);
return true;
}
return true;
diff -r 1d16cc5f261c -r 4ff40eabc82e
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.html
Thu Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.html
Fri Apr 15 11:20:46 2011 +0200
@@ -13,7 +13,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): ______________________________________.
*************************************************************************
@@ -47,12 +47,12 @@
}
function submitThisPage() {
- submitCommandForm('PROCESS', true, frmMain, null, '_top');
+ submitCommandForm('PROCESS', true, frmMain, null);
// window.close();
return true;
}
function closeThisPage() {
- parent.window.close();
+ closePage();
return true;
}
diff -r 1d16cc5f261c -r 4ff40eabc82e
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessPaymentProposal.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessPaymentProposal.html
Thu Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessPaymentProposal.html
Fri Apr 15 11:20:46 2011 +0200
@@ -13,7 +13,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): ______________________________________.
*************************************************************************
@@ -51,12 +51,12 @@
</script>
<SCRIPT language="JavaScript" type="text/javascript">
function closeThisPage() {
- parent.window.close();
+ closePage();
return true;
}
function submitThisPage(strCommand) {
- submitCommandForm(strCommand, false, null, null, '_top');
+ submitCommandForm(strCommand, false, null, null);
return true;
}
diff -r 1d16cc5f261c -r 4ff40eabc82e
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html
Thu Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html
Fri Apr 15 11:20:46 2011 +0200
@@ -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) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
*************************************************************************
@@ -103,12 +103,12 @@
</script>
<script language="JavaScript" type="text/javascript">
function closeThisPage() {
- parent.window.close();
+ closePage();
return true;
}
function submitThisPage(strCommand) {
if (validate(strCommand)) {
- submitCommandForm(strCommand, false, null, null, '_top');
+ submitCommandForm(strCommand, false, null, null);
return true;
}
return true;
diff -r 1d16cc5f261c -r 4ff40eabc82e
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 Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Apr 15 11:20:46 2011 +0200
@@ -436,7 +436,7 @@
<!--8ED6AE4FCFA9483EB97B9109BBDFADBD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--8ED6AE4FCFA9483EB97B9109BBDFADBD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8ED6AE4FCFA9483EB97B9109BBDFADBD-->
<VALUE><![CDATA[OBUIAPP_NewRow]]></VALUE>
-<!--8ED6AE4FCFA9483EB97B9109BBDFADBD--> <MSGTEXT><![CDATA[Create a new record
in the grid]]></MSGTEXT>
+<!--8ED6AE4FCFA9483EB97B9109BBDFADBD--> <MSGTEXT><![CDATA[Insert
row]]></MSGTEXT>
<!--8ED6AE4FCFA9483EB97B9109BBDFADBD--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--8ED6AE4FCFA9483EB97B9109BBDFADBD-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--8ED6AE4FCFA9483EB97B9109BBDFADBD--></AD_MESSAGE>
diff -r 1d16cc5f261c -r 4ff40eabc82e
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Thu Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl
Fri Apr 15 11:20:46 2011 +0200
@@ -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): ______________________________________.
************************************************************************
@@ -22,6 +22,9 @@
<#list data.fields as field>
{
autoExpand: ${field.autoExpand}, type: '${field.type}',
+ <#if field.cellAlign??>
+ cellAlign: '${field.cellAlign?js_string}',
+ </#if>
editorProperties: {
${field.gridEditorFieldProperties}
// note need to be repeated for editor fields
diff -r 1d16cc5f261c -r 4ff40eabc82e
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
Thu Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
Fri Apr 15 11:20:46 2011 +0200
@@ -434,6 +434,9 @@
return field.getDisplayedLength();
}
+ public String getCellAlign() {
+ return uiDefinition.getCellAlign();
+ }
}
private class GridFieldComparator implements Comparator<Field> {
diff -r 1d16cc5f261c -r 4ff40eabc82e
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 Apr 14 16:07:08 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Fri Apr 15 11:20:46 2011 +0200
@@ -607,6 +607,7 @@
// When data has changed, force the OBDateItem to get it. Other case
OBDateItem.blur
// gets incorrect value on getValue()
this.callingFormItem.setValue(this.getData());
+ this.callingFormItem.changed();
},
dateClick: function() {
var ret = this.Super('dateClick', arguments);
@@ -614,7 +615,14 @@
this.callingForm.focusInNextItem(this.callingFormItem.name);
}
return ret;
- }
+ },
+
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
