details: /erp/devel/pi/rev/ed461b7731e5
changeset: 11623:ed461b7731e5
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Apr 20 22:12:41 2011 +0200
summary: Fixed issue 16561: Now some manual pages with manual date fields
autocomplete the date if required
diffstat:
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html | 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html | 4
++--
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html | 2 +-
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupHistory.html | 4
++--
src/org/openbravo/erpCommon/info/DebtPayment.html | 4
++--
src/org/openbravo/erpCommon/info/Invoice.html | 4
++--
src/org/openbravo/erpCommon/info/InvoiceLine.html | 4
++--
src/org/openbravo/erpCommon/info/SalesOrder.html | 4
++--
src/org/openbravo/erpCommon/info/SalesOrderLine.html | 2 +-
src/org/openbravo/erpCommon/info/ShipmentReceipt.html | 4
++--
src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html | 4
++--
web/js/default/DateTextBox.js | 8
+++++---
12 files changed, 24 insertions(+), 22 deletions(-)
diffs (222 lines):
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html
--- a/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html Wed Apr
20 21:29:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html Wed Apr
20 22:12:41 2011 +0200
@@ -438,7 +438,7 @@
<table
style="border:0px;border-collapse:collapse;">
<tr>
<td style="padding-top: 0px;">
- <input displayFormat="xx"
saveFormat="yy" class="dojoValidateValid TextBox_btn_OneCell_width required"
required="true" type="text" name="inpDateReceiptxx" id="paramDateReceiptxx"
onchange="validateDateTextBox(this.id);logChanges(this);return true;" size="10"
maxlength="10" value="" onkeyup="autoCompleteDate(this);"></input>
+ <input
onblur="expandDateYear(this.id);" displayFormat="xx" saveFormat="yy"
class="dojoValidateValid TextBox_btn_OneCell_width required" required="true"
type="text" name="inpDateReceiptxx" id="paramDateReceiptxx"
onchange="validateDateTextBox(this.id);logChanges(this);return true;" size="10"
maxlength="10" value="" onkeyup="autoCompleteDate(this);"></input>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html Wed Apr
20 21:29:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html Wed Apr
20 22:12:41 2011 +0200
@@ -300,7 +300,7 @@
class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10"
name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
- displayformat="xx" saveformat="yy"/>
+ onblur="expandDateYear(this.id);" displayformat="xx"
saveformat="yy"/>
</td>
<td class="FieldButton_ContentCell">
<a class="FieldButtonLink" href="#"
onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;"
onblur="window.status=''; return true;"
onkeypress="this.className='FieldButtonLink_active'; return true;"
onkeyup="this.className='FieldButtonLink_focus'; return true;"
onclick="showCalendar('frmMain.inpDateFrom',
document.frmMain.inpDateFrom.value, false);return false;">
@@ -326,7 +326,7 @@
class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10"
name="inpDateTo"
onkeyup="autoCompleteDate(this);"
- displayformat="xx" saveformat="yy"/>
+ onblur="expandDateYear(this.id);" displayformat="xx"
saveformat="yy"/>
</td>
<td class="FieldButton_ContentCell">
<a class="FieldButtonLink" href="#"
onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;"
onblur="window.status=''; return true;"
onkeypress="this.className='FieldButtonLink_active'; return true;"
onkeyup="this.className='FieldButtonLink_focus'; return true;"
onclick="showCalendar('frmMain.inpDateTo', document.frmMain.inpDateTo.value,
false);return false;">
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html
--- a/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html
Wed Apr 20 21:29:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupDeleted.html
Wed Apr 20 22:12:41 2011 +0200
@@ -201,7 +201,7 @@
required="false" value=""
maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
- displayformat="xx"
saveformat="yy"/>
+ onblur="expandDateYear(this.id);"
displayformat="xx" saveformat="yy"/>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupHistory.html
--- a/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupHistory.html
Wed Apr 20 21:29:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/AuditTrailPopupHistory.html
Wed Apr 20 22:12:41 2011 +0200
@@ -193,7 +193,7 @@
required="false" value=""
maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
- displayformat="xx"
saveformat="yy"/>
+ onblur="expandDateYear(this.id);"
displayformat="xx" saveformat="yy"/>
</td>
</tr>
</table>
@@ -286,7 +286,7 @@
required="false" value=""
maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
- displayformat="xx"
saveformat="yy"/>
+
onblur="expandDateYear(this.id);" displayformat="xx" saveformat="yy"/>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/info/DebtPayment.html
--- a/src/org/openbravo/erpCommon/info/DebtPayment.html Wed Apr 20 21:29:00
2011 +0200
+++ b/src/org/openbravo/erpCommon/info/DebtPayment.html Wed Apr 20 22:12:41
2011 +0200
@@ -262,7 +262,7 @@
required="false" value="" maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
-
displayformat="xx" saveformat="yy"></input>
+
onblur="expandDateYear(this.id);" displayformat="xx"
saveformat="yy"></input>
</td>
</tr>
</table>
@@ -354,7 +354,7 @@
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return
true;"
-
displayformat="xx" saveformat="yy"></input>
+
onblur="expandDateYear(this.id);" displayformat="xx"
saveformat="yy"></input>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/info/Invoice.html
--- a/src/org/openbravo/erpCommon/info/Invoice.html Wed Apr 20 21:29:00
2011 +0200
+++ b/src/org/openbravo/erpCommon/info/Invoice.html Wed Apr 20 22:12:41
2011 +0200
@@ -258,7 +258,7 @@
required="false" value="" maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
-
displayformat="xx" saveformat="yy"></input>
+
onblur="expandDateYear(this.id);" displayformat="xx"
saveformat="yy"></input>
</td>
</tr>
</table>
@@ -350,7 +350,7 @@
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return
true;"
-
displayformat="xx" saveformat="yy"></input>
+
onblur="expandDateYear(this.id);" displayformat="xx"
saveformat="yy"></input>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/info/InvoiceLine.html
--- a/src/org/openbravo/erpCommon/info/InvoiceLine.html Wed Apr 20 21:29:00
2011 +0200
+++ b/src/org/openbravo/erpCommon/info/InvoiceLine.html Wed Apr 20 22:12:41
2011 +0200
@@ -286,7 +286,7 @@
required="false" value="" maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
-
displayformat="xx" saveformat="yy"></input>
+
onblur="expandDateYear(this.id);" displayformat="xx"
saveformat="yy"></input>
</td>
</tr>
</table>
@@ -378,7 +378,7 @@
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return
true;"
-
displayformat="xx" saveformat="yy"></input>
+
onblur="expandDateYear(this.id);" displayformat="xx"
saveformat="yy"></input>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/info/SalesOrder.html
--- a/src/org/openbravo/erpCommon/info/SalesOrder.html Wed Apr 20 21:29:00
2011 +0200
+++ b/src/org/openbravo/erpCommon/info/SalesOrder.html Wed Apr 20 22:12:41
2011 +0200
@@ -255,7 +255,7 @@
<tr>
<td style="padding-top: 0px;">
- <input type="text"
id="paramDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
displayformat="xx" saveformat="yy"></input>
+ <input type="text"
id="paramDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
onblur="expandDateYear(this.id);" displayformat="xx" saveformat="yy"></input>
</td>
</tr>
</table>
@@ -321,7 +321,7 @@
<tr>
<td style="padding-top: 0px;">
- <input type="text"
id="paramDateTo" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
displayformat="xx" saveformat="yy"></input>
+ <input type="text"
id="paramDateTo" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
onblur="expandDateYear(this.id);" displayformat="xx" saveformat="yy"></input>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/info/SalesOrderLine.html
--- a/src/org/openbravo/erpCommon/info/SalesOrderLine.html Wed Apr 20
21:29:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/info/SalesOrderLine.html Wed Apr 20
22:12:41 2011 +0200
@@ -336,7 +336,7 @@
<tr>
<td style="padding-top: 0px;">
- <input type="text"
id="paramDateTo" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
displayformat="xx" saveformat="yy"></input>
+ <input type="text"
id="paramDateTo" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
onblur="expandDateYear(this.id);" displayformat="xx" saveformat="yy"></input>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/info/ShipmentReceipt.html
--- a/src/org/openbravo/erpCommon/info/ShipmentReceipt.html Wed Apr 20
21:29:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/info/ShipmentReceipt.html Wed Apr 20
22:12:41 2011 +0200
@@ -256,7 +256,7 @@
<tr>
<td style="padding-top: 0px;">
- <input type="text"
id="paramDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
displayformat="xx" saveformat="yy"></input>
+ <input type="text"
id="paramDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
onblur="expandDateYear(this.id);" displayformat="xx" saveformat="yy"></input>
</td>
</tr>
</table>
@@ -322,7 +322,7 @@
<tr>
<td style="padding-top: 0px;">
- <input type="text"
id="paramDateTo" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
displayformat="xx" saveformat="yy"></input>
+ <input type="text"
id="paramDateTo" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
onblur="expandDateYear(this.id);" displayformat="xx" saveformat="yy"></input>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5
src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html
--- a/src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html Wed Apr 20
21:29:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html Wed Apr 20
22:12:41 2011 +0200
@@ -286,7 +286,7 @@
<tr>
<td style="padding-top: 0px;">
- <input type="text"
id="paramDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
displayformat="xx" saveformat="yy"></input>
+ <input type="text"
id="paramDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateFrom"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
onblur="expandDateYear(this.id);" displayformat="xx" saveformat="yy"></input>
</td>
</tr>
</table>
@@ -352,7 +352,7 @@
<tr>
<td style="padding-top: 0px;">
- <input type="text"
id="paramDateTo" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
displayformat="xx" saveformat="yy"></input>
+ <input type="text"
id="paramDateTo" class="dojoValidateValid TextBox_btn_OneCell_width"
required="false" value="" maxlength="10" name="inpDateTo"
onkeyup="autoCompleteDate(this);"
onchange="validateDateTextBox(this.id);logChanges(this);return true;"
onblur="expandDateYear(this.id);" displayformat="xx" saveformat="yy"></input>
</td>
</tr>
</table>
diff -r 4a6414a2e680 -r ed461b7731e5 web/js/default/DateTextBox.js
--- a/web/js/default/DateTextBox.js Wed Apr 20 21:29:00 2011 +0200
+++ b/web/js/default/DateTextBox.js Wed Apr 20 22:12:41 2011 +0200
@@ -73,9 +73,11 @@
getDateBlock= function(/*String*/ str_date, block){
// date parsing and formatting routimes. modify them if you wish other date
format
//function str2dt (str_date) {
- var re_date = /^(\d+)[\-|\/|/|:|.|\.](\d+)[\-|\/|/|:|.|\.](\d+)$/;
- if (!re_date.exec(str_date))
- return false;
+ var datePattern =
"^(\\d+)[\\-|\\/|/|:|.|\\.](\\d+)[\\-|\\/|/|:|.|\\.](\\d+)$";
+ var dateRegExp = new RegExp(datePattern);
+ if (!dateRegExp.exec(str_date)) {
+ return false;
+ }
var dateBlock = new Array();
dateBlock[1] = RegExp.$1;
dateBlock[2] = RegExp.$2;
------------------------------------------------------------------------------
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
