OFBiz › OFBiz - Commits

svn commit: r935260 - in /ofbiz/trunk/applications/accounting: webapp/accounting/ledger/ webapp/accounting/payment/ webapp/accounting/period/ webapp/ap/invoices/ widget/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

buscob

svn commit: r935260 - in /ofbiz/trunk/applications/accounting: webapp/accounting/ledger/ webapp/accounting/payment/ webapp/accounting/period/ webapp/ap/invoices/ widget/

Author: buscob
Date: Sat Apr 17 21:52:20 2010
New Revision: 935260

URL: http://svn.apache.org/viewvc?rev=935260&view=rev
Log:
A patch from Blas Rodriguez Somoza
OFBIZ-3690 - XHTML validation errors round 2 (accounting)
https://issues.apache.org/jira/browse/OFBIZ-3690
XHTML validation errors

* Unclosed tags
* attributes without values (checked, selected, disabled, etc)
* attribute values without "
* Uppercase tags or attributes.
* Unencoded ampersands in urls.

Other errors:

CostCenters.ftl
Lines 37,51: input must be inside td.
Lines 45,47: duplicated id, and invalid character "|"

EditCustomTimePeriods.ftl
Form must be outside table

CommisionReport.ftl
Line 77: invalid td outside tr and there is no open table at this point

Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl
ofbiz/trunk/applications/accounting/widget/PaymentForms.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl?rev=935260&r1=935259&r2=935260&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl Sat Apr 17 21:52:20 2010
@@ -34,21 +34,21 @@ under the License.

<#assign alt_row = false>
<#list glAcctgAndAmountPercentageList as glAcctgAndAmountPercentage>
- <input type="hidden" id="glAccountId_${glAcctgAndAmountPercentage.glAccountId}" name="glAccountId_o_${glAcctgAndAmountPercentage_index}" value="${glAcctgAndAmountPercentage.glAccountId!}"/>
<tr id="row_${glAcctgAndAmountPercentage.glAccountId}" <#if alt_row> class="alternate-row"</#if>>
- <td>${glAcctgAndAmountPercentage.glAccountId}</td>
+ <td><input type="hidden" id="glAccountId_${glAcctgAndAmountPercentage.glAccountId}" name="glAccountId_o_${glAcctgAndAmountPercentage_index}" value="${glAcctgAndAmountPercentage.glAccountId!}"/>
+ <input name="_rowSubmit_o_${glAcctgAndAmountPercentage_index}" type="hidden" value="Y"/>
+ ${glAcctgAndAmountPercentage.glAccountId}</td>
<td>${glAcctgAndAmountPercentage.accountCode!}</td>
<td>${glAcctgAndAmountPercentage.accountName!}</td>
<#list glAccountCategories as glAccountCategory>
<td>
<#if (glAcctgAndAmountPercentage[glAccountCategory.glAccountCategoryId!])??>
- <input type="text" id="${glAcctgAndAmountPercentage.glAccountId}|${glAccountCategory.glAccountCategoryId}" name="amp_${glAccountCategory.glAccountCategoryId!}_o_${glAcctgAndAmountPercentage_index}" value="${(glAcctgAndAmountPercentage[glAccountCategory.glAccountCategoryId!])!}"/>
+ <input type="text" id="cc_${glAcctgAndAmountPercentage.glAccountId}_${glAccountCategory.glAccountCategoryId}" name="amp_${glAccountCategory.glAccountCategoryId!}_o_${glAcctgAndAmountPercentage_index}" value="${(glAcctgAndAmountPercentage[glAccountCategory.glAccountCategoryId!])!}"/>
<#else>
- <input type="text" id="${glAcctgAndAmountPercentage.glAccountId}|${glAccountCategory.glAccountCategoryId}" name="amp_${glAccountCategory.glAccountCategoryId!}_o_${glAcctgAndAmountPercentage_index}" value=""/>
+ <input type="text" id="cc_${glAcctgAndAmountPercentage.glAccountId}_${glAccountCategory.glAccountCategoryId}" name="amp_${glAccountCategory.glAccountCategoryId!}_o_${glAcctgAndAmountPercentage_index}" value=""/>
</#if>
</td>
</#list>
- <input name="_rowSubmit_o_${glAcctgAndAmountPercentage_index}" type="hidden" value="Y"/>
</tr>
<#assign alt_row = !alt_row>
</#list>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl?rev=935260&r1=935259&r2=935260&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl Sat Apr 17 21:52:20 2010
@@ -24,7 +24,7 @@ under the License.
<#assign validTx = true>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingReferenceNumber}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingReferenceNumber}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="referenceNum" />
@@ -32,7 +32,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.FormFieldTitle_orderPaymentPreferenceId}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.FormFieldTitle_orderPaymentPreferenceId}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="20" maxlength="20" name="orderPaymentPreferenceId" />
@@ -64,9 +64,9 @@ under the License.
document.manualTxForm.action = "<@ofbizUrl>processManualCcTx</@ofbizUrl>";
// -->
</script>
- <tr><td colspan="3"><hr></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyFirstName}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyFirstName}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="firstName" value="${(person.firstName)?if_exists}" />
@@ -74,7 +74,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyLastName}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyLastName}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="lastName" value="${(person.lastName)?if_exists}" />
@@ -82,20 +82,20 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyEmailAddress}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyEmailAddress}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="infoString" value="" />
<span class="tooltip">${uiLabelMap.CommonRequired}</span>
</td>
</tr>
- <tr><td colspan="3"><hr></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<#assign showToolTip = "true">
${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
- <tr><td colspan="3"><hr></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<#-- first / last name -->
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyFirstName}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyFirstName}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="firstName" value="${(person.firstName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> />
@@ -103,7 +103,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyLastName}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.PartyLastName}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="lastName" value="${(person.lastName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> />
@@ -112,7 +112,7 @@ under the License.
</tr>
<#-- credit card address -->
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingBillToAddress1}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingBillToAddress1}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="address1" value="${(postalFields.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> />
@@ -120,14 +120,14 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingBillToAddress2}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingBillToAddress2}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="address2" value="${(postalFields.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> />
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonCity}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonCity}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="city" value="${(postalFields.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> />
@@ -135,7 +135,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonStateProvince}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonStateProvince}</b></td>
<td width="5"> </td>
<td width="74%">
<select name="stateProvinceGeoId" <#if requestParameters.useShipAddr?exists>disabled</#if>>
@@ -150,7 +150,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonZipPostalCode}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonZipPostalCode}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if> />
@@ -158,7 +158,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonCountry}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonCountry}</b></td>
<td width="5"> </td>
<td width="74%">
<select name="countryGeoId" <#if requestParameters.useShipAddr?exists>disabled</#if>>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=935260&r1=935259&r2=935260&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl Sat Apr 17 21:52:20 2010
@@ -85,7 +85,7 @@ under the License.
</#if>

<#if requestAttributes.validTx?default("false") == "true">
- <tr><td colspan="3"><hr></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<#-- amount field -->
<tr>
<td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonAmount}</b></td>
@@ -97,7 +97,7 @@ under the License.
</tr>
<#-- submit button -->
<tr>
- <td width="26%" align="right" valign=middle> </td>
+ <td width="26%" align="right" valign="middle"> </td>
<td width="5"> </td>
<td width="74%">
<input type="submit" value="${uiLabelMap.CommonSubmit}" />

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=935260&r1=935259&r2=935260&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Sat Apr 17 21:52:20 2010
@@ -47,6 +47,9 @@ under the License.
</#if>
</div>
<#if currentCustomTimePeriod?has_content>
+ <form method="post" action="<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>" name="updateCustomTimePeriodForm">
+ <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" />
+ <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" />
<table class="basic-table" cellspacing="0">
<tr class="header-row">
<td>${uiLabelMap.CommonId}</td>
@@ -59,9 +62,6 @@ under the License.
<td>${uiLabelMap.CommonThruDate}</td>
<td> </td>
</tr>
- <form method="post" action="<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>" name="updateCustomTimePeriodForm">
- <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}" />
- <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriodId?if_exists}" />
<tr>
<td>${currentCustomTimePeriod.customTimePeriodId}</td>
<td>
@@ -128,8 +128,8 @@ under the License.
${uiLabelMap.CommonDelete}</a>
</td>
</tr>
- </form>
</table>
+ </form>
<#else>
<div class="screenlet-body">${uiLabelMap.AccountingNoCurrentCustomTimePeriodSelected}</div>
</#if>

Modified: ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl?rev=935260&r1=935259&r2=935260&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl Sat Apr 17 21:52:20 2010
@@ -74,5 +74,5 @@ under the License.
</ul>
</div>
<#else>
- <td colspan='4'><h3>${uiLabelMap.CommonNoRecordFound}</h3></td>
+ <h3>${uiLabelMap.CommonNoRecordFound}</h3>
</#if>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentForms.xml?rev=935260&r1=935259&r2=935260&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentForms.xml Sat Apr 17 21:52:20 2010
@@ -115,7 +115,7 @@ under the License.
</actions>
<field name="statusId"><hidden value="PMNT_NOT_PAID"/></field>
<field name="currencyUomId"><hidden value="${defaultOrganizationPartyCurrencyUomId}"/></field>
- <field position="1" name="organizationPartyId" parameter-name="partyIdFrom" event="onChange" action="javascript:(document.NewPaymentOut.action = 'newPayment'),(document.NewPaymentOut.submit())">
+ <field position="1" name="organizationPartyId" parameter-name="partyIdFrom" event="onchange" action="javascript:(document.NewPaymentOut.action = 'newPayment'),(document.NewPaymentOut.submit())">
<drop-down allow-empty="false" no-current-selected-key="${defaultOrganizationPartyId}">
<option key="${parameters.partyIdFrom}" description="${partyGroupName}"/>
<entity-options description="${groupName}" entity-name="PartyAcctgPrefAndGroup" key-field-name="partyId">