OFBiz › OFBiz - Commits

svn commit: r531390 [2/2] - in /ofbiz/trunk/applications/accounting: webapp/accounting/ webapp/accounting/admin/ webapp/accounting/agreement/ webapp/accounting/billingaccount/ webapp/accounting/chartofaccounts/ webapp/accounting/fixedasset/ webapp/acco...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jacopoc

svn commit: r531390 [2/2] - in /ofbiz/trunk/applications/accounting: webapp/accounting/ webapp/accounting/admin/ webapp/accounting/agreement/ webapp/accounting/billingaccount/ webapp/accounting/chartofaccounts/ webapp/accounting/fixedasset/ webapp/acco...

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Mon Apr 23 02:12:50 2007
@@ -63,7 +63,7 @@
<hyperlink description="${paymentId}" target="paymentOverview?paymentId=${paymentId}"/>
</field>
<field name="paymentTypeId"><display-entity entity-name="PaymentType" description="${description}"/></field>
- <field name="statusId" widget-style="tabletext"><display-entity entity-name="StatusItem"/></field>
+ <field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="comments"><display/></field>
<field name="partyIdFrom"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}[${partyId}]"/></field>
<field name="partyIdTo"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}[${partyId}]"/></field>
@@ -90,7 +90,7 @@
</entity-options>
</drop-down>
</field>
- <field name="statusId" use-when="payment!=null" position="1" widget-style="tabletext"><display-entity entity-name="StatusItem"/></field>
+ <field name="statusId" use-when="payment!=null" position="1"><display-entity entity-name="StatusItem"/></field>
<field name="statusId" use-when="payment==null"><hidden value="PMNT_NOT_PAID"/></field>
<field position="2" name="paymentMethodId" use-when="(payment==null)||(payment.get("partyIdFrom")==null)">
<text/>
@@ -199,7 +199,7 @@
<field name="invoiceDate"><display/></field>
<field name="amount"><display type="currency" currency="${currencyUomId}"/></field>
<field name="amountApplied" parameter-name="dummy"><display type="currency" currency="${currencyUomId}"/></field>
- <field name="amountToApply" widget-style="inputBox" parameter-name="amountApplied"><text size="10"/></field>
+ <field name="amountToApply" parameter-name="amountApplied"><text size="10"/></field>
<field name="invoiceProcessing" use-when=""${uiConfigMap.invoiceProcessing}".equals("Y")"><check/></field>
<field name="invoiceProcessing" use-when=""${uiConfigMap.invoiceProcessing}".equals("N")"><check/></field>
<field name="applyButton" widget-style="smallSubmit">
@@ -213,7 +213,7 @@
<field name="effectiveDate"><display/></field>
<field name="amount"><display type="currency" currency="${currencyUomId}"/></field>
<field name="amountApplied" parameter-name="dummy"><display type="currency" currency="${currencyUomId}"/></field>
- <field name="amountToApply" widget-style="inputBox" parameter-name="amountApplied"><text size="10"/></field>
+ <field name="amountToApply" parameter-name="amountApplied"><text size="10"/></field>
<field name="applyButton" widget-style="smallSubmit">
<submit button-type="button"/>
</field>

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?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl Mon Apr 23 02:12:50 2007
@@ -21,12 +21,12 @@
<#if txType?default("") == "PRDS_PAY_CREDIT" || txType?default("") == "PRDS_PAY_CAPTURE" || txType?default("") == "PRDS_PAY_RELEASE">
${setRequestAttribute("validTx", "true")}
<#assign validTx = true>
- <tr><td colspan="3"><hr class="sepbar"></td></tr>
+ <tr><td colspan="3"><hr/></td></tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingReferenceNumber}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingReferenceNumber}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="referenceNum">
+ <input type="text" size="30" maxlength="60" name="referenceNum">
(*)</td>
</tr>
</#if>
@@ -39,42 +39,42 @@
document.manualTxForm.action = "<@ofbizUrl>processManualCcTx</@ofbizUrl>";
// -->
</script>
- <tr><td colspan="3"><hr class="sepbar"></td></tr>
+ <tr><td colspan="3"><hr></td></tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyFirstName}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyFirstName}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="firstName" value="${(person.firstName)?if_exists}">
+ <input type="text" size="30" maxlength="60" name="firstName" value="${(person.firstName)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyLastName}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyLastName}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="lastName" value="${(person.lastName)?if_exists}">
+ <input type="text" size="30" maxlength="60" name="lastName" value="${(person.lastName)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyEmailAddress}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyEmailAddress}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="infoString" value="">
+ <input type="text" size="30" maxlength="60" name="infoString" value="">
*</td>
</tr>
- <tr><td colspan="3"><hr class="sepbar"></td></tr>
+ <tr><td colspan="3"><hr></td></tr>

<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingCompanyNameCard}</div></td>
+ <td width="26%" align="right" valign="top"><b>${uiLabelMap.AccountingCompanyNameCard}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${(creditCard.companyNameOnCard)?if_exists}">
+ <input type="text" size="30" maxlength="60" name="companyNameOnCard" value="${(creditCard.companyNameOnCard)?if_exists}">
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingPrefixCard}</div></td>
+ <td width="26%" align="right" valign="top"><b>${uiLabelMap.AccountingPrefixCard}</b></td>
<td width="5"> </td>
<td width="74%">
- <select name="titleOnCard" class="selectBox">
+ <select name="titleOnCard">
<option value="">${uiLabelMap.CommonSelectOne}</option>
<option<#if ((creditCard.titleOnCard)?default("") == "Mr.")> checked</#if>>Mr.</option>
<option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> checked</#if>>Mrs.</option>
@@ -84,31 +84,31 @@
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingFirstNameCard}</div></td>
+ <td width="26%" align="right" valign="top"><b>${uiLabelMap.AccountingFirstNameCard}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}">
+ <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingMiddleNameCard}</div></td>
+ <td width="26%" align="right" valign="top"><b>${uiLabelMap.AccountingMiddleNameCard}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}">
+ <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}">
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingLastNameCard}</div></td>
+ <td width="26%" align="right" valign="top"><b>${uiLabelMap.AccountingLastNameCard}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}">
+ <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingSuffixCard}</div></td>
+ <td width="26%" align="right" valign="top"><b>${uiLabelMap.AccountingSuffixCard}</b></td>
<td width="5"> </td>
<td width="74%">
- <select name="suffixOnCard" class="selectBox">
+ <select name="suffixOnCard">
<option value="">${uiLabelMap.CommonSelectOne}</option>
<option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> checked</#if>>Jr.</option>
<option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> checked</#if>>Sr.</option>
@@ -122,10 +122,10 @@
</tr>

<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingCardType}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingCardType}</b></td>
<td width="5"> </td>
<td width="74%">
- <select name="cardType" class="selectBox">
+ <select name="cardType">
<#if ((creditCard.cardType)?exists)>
<option>${creditCard.cardType}</option>
<option value="${creditCard.cardType}">---</option>
@@ -135,21 +135,21 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingCardNumber}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingCardNumber}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="20" maxlength="30" name="cardNumber" value="${(creditCard.cardNumber)?if_exists}">
+ <input type="text" size="20" maxlength="30" name="cardNumber" value="${(creditCard.cardNumber)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingSecurityCodeCard}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingSecurityCodeCard}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="5" maxlength="10" name="cardSecurityCode" value="">
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingExpirationDate}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingExpirationDate}</b></td>
<td width="5"> </td>
<td width="74%">
<#assign expMonth = "">
@@ -161,7 +161,7 @@
<#assign expYear = expDate.substring(expDate.indexOf("/")+1)>
</#if>
</#if>
- <select name="expMonth" class='selectBox'>
+ <select name="expMonth">
<#if creditCard?has_content && expMonth?has_content>
<#assign ccExprMonth = expMonth>
<#else>
@@ -172,7 +172,7 @@
</#if>
${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
</select>
- <select name="expYear" class='selectBox'>
+ <select name="expYear">
<#if creditCard?has_content && expYear?has_content>
<#assign ccExprYear = expYear>
<#else>
@@ -185,51 +185,51 @@
</select>
*</td>
</tr>
- <tr><td colspan="3"><hr class="sepbar"></td></tr>
+ <tr><td colspan="3"><hr></td></tr>

<#-- first / last name -->
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyFirstName}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyFirstName}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="30" name="firstName" value="${(person.firstName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" size="30" maxlength="30" name="firstName" value="${(person.firstName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyLastName}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyLastName}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="30" name="lastName" value="${(person.lastName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" size="30" maxlength="30" name="lastName" value="${(person.lastName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
*</td>
</tr>

<#-- credit card address -->
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingBillToAddress1}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingBillToAddress1}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(postalFields.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" size="30" maxlength="30" name="address1" value="${(postalFields.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingBillToAddress2}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingBillToAddress2}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(postalFields.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <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><div class="tableheadtext">${uiLabelMap.CommonCity}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonCity}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(postalFields.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" size="30" maxlength="30" name="city" value="${(postalFields.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.CommonStateProvince}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonStateProvince}</b></td>
<td width="5"> </td>
<td width="74%">
- <select name="stateProvinceGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <select name="stateProvinceGeoId" <#if requestParameters.useShipAddr?exists>disabled</#if>>
<#if (postalFields.stateProvinceGeoId)?exists>
<option>${postalFields.stateProvinceGeoId}</option>
<option value="${postalFields.stateProvinceGeoId}">---</option>
@@ -241,17 +241,17 @@
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.CommonZipPostalCode}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonZipPostalCode}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <input type="text" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.CommonCountry}</div></td>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonCountry}</b></td>
<td width="5"> </td>
<td width="74%">
- <select name="countryGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
+ <select name="countryGeoId" <#if requestParameters.useShipAddr?exists>disabled</#if>>
<#if (postalFields.countryGeoId)?exists>
<option>${postalFields.countryGeoId}</option>
<option value="${postalFields.countryGeoId}">---</option>

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?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl Mon Apr 23 02:12:50 2007
@@ -17,7 +17,7 @@
under the License.
-->

-<div class="head1">${uiLabelMap.AccountingManualTransaction}</div>
+<h1>${uiLabelMap.AccountingManualTransaction}</h1>
<br/>

<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
@@ -29,28 +29,28 @@

<table border='0' cellpadding='2' cellspacing='0'>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingPaymentMethodType}</div></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingPaymentMethodType}</b></td>
<td width="5"> </td>
<td width='74%'>
<#if paymentMethodType?has_content>
- <div class="tabletext">${paymentMethodType.get("description",locale)}</div>
+ <div>${paymentMethodType.get("description",locale)}</div>
<input type="hidden" name="paymentMethodTypeId" value="${paymentMethodType.paymentMethodTypeId}">
<#else>
- <select name="paymentMethodTypeId" class="selectBox">
+ <select name="paymentMethodTypeId">
<option value="CREDIT_CARD">${uiLabelMap.AccountingCreditCard}</option>
</select>
</#if>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.ProductProductStore}</div></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.ProductProductStore}</b></td>
<td width="5"> </td>
<td width='74%'>
<#if currentStore?has_content>
- <div class="tabletext">${currentStore.storeName}</div>
+ <div>${currentStore.storeName}</div>
<input type="hidden" name="productStoreId" value="${currentStore.productStoreId}">
<#else>
- <select name="productStoreId" class="selectBox">
+ <select name="productStoreId">
<#list productStores as productStore>
<option value="${productStore.productStoreId}">${productStore.storeName}</option>
</#list>
@@ -59,14 +59,14 @@
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingTransactionType}</div></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingTransactionType}</b></td>
<td width="5"> </td>
<td width='74%'>
<#if currentTx?has_content>
- <div class="tabletext">${currentTx.get("description",locale)}</div>
+ <div>${currentTx.get("description",locale)}</div>
<input type="hidden" name="transactionType" value="${currentTx.enumId}">
<#else>
- <select name="transactionType" class="selectBox" onchange="javascript:document.manualTxForm.submit();">
+ <select name="transactionType" onchange="javascript:document.manualTxForm.submit();">
<#list paymentSettings as setting>
<option value="${setting.enumId}">${setting.get("description",locale)}</option>
</#list>
@@ -83,15 +83,15 @@
</#if>

<#if requestAttributes.validTx?default("false") == "true">
- <tr><td colspan="3"><hr class="sepbar"></td></tr>
+ <tr><td colspan="3"><hr></td></tr>

<#-- amount field -->
<#if txType != "PRDS_PAY_RELEASE">
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.CommonAmount}</div></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonAmount}</b></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="20" maxlength="30" name="amount">
+ <input type="text" size="20" maxlength="30" name="amount">
*</td>
</tr>
</#if>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/reports/SalesInvoiceByProductCategorySummary.ftl Mon Apr 23 02:12:50 2007
@@ -30,28 +30,28 @@
<li>Root Category: ${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(rootProductCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists} [${rootProductCategoryId}]</li>
<li>Organization: ${(organizationPartyName.groupName)?if_exists} [${organizationPartyId?default("No Organization Specified")}]</li>
<li>Currency: ${(currencyUom.description)?if_exists} [${currencyUomId?default("No Currency Specified")}]</li>
-</il>
+</ul>
<div>NOTE: each set of numbers is: <quantity>:<total amount>:<average amount></div>
-<table>
+<table class="basic-table" cellspacing="0">
<#-- Create the header row -->
- <tr>
- <th>Day</th>
- <th>[No Product]</th>
+ <tr class="header-row">
+ <td>Day</td>
+ <td>[No Product]</td>
<#list productList as product>
- <th>${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))?if_exists)}<br/>P:[${product.productId}]</th>
+ <td>${product.internalName?default((Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher))?if_exists)}<br/>P:[${product.productId}]</td>
</#list>
<#list productCategoryList as productCategory>
- <th>${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists}<br/>C:[${productCategory.productCategoryId}]</th>
+ <td>${(Static["org.ofbiz.product.category.CategoryContentWrapper"].getProductCategoryContentAsText(productCategory, "CATEGORY_NAME", locale, dispatcher))?if_exists}<br/>C:[${productCategory.productCategoryId}]</td>
</#list>
</tr>
- 
+ <#-- Days of the month -->
<#list productNullResultByDayList as productNullResult>
<#assign productResultMap = productResultMapByDayList.get(productNullResult_index)/>
<#assign categoryResultMap = categoryResultMapByDayList.get(productNullResult_index)/>

<#-- now do the null product, then iterate through the products, then categories -->
<tr>
- <th>${(productNullResult_index + 1)}</th>
+ <td class="label">${(productNullResult_index + 1)}</td>
<td><@resultSummary resultMap=productNullResult/></td>
<#list productList as product>
<#assign productResult = productResultMap[product.productId]?if_exists/>
@@ -64,9 +64,9 @@
</tr>
</#list>

- 
+ <#-- Totals for the month -->
<tr>
- <th>Month Total</th>
+ <td class="label">Month Total</td>
<td><@resultSummary resultMap=monthProductNullResult/></td>
<#list productList as product>
<#assign productResult = monthProductResultMap[product.productId]?if_exists/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl Mon Apr 23 02:12:50 2007
@@ -17,13 +17,13 @@
under the License.
-->

-<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
-
-<div class="tabContainer">
- <a href="<@ofbizUrl>/AuthorizeTransaction</@ofbizUrl>" class="${selectedClassMap.authorizetransactiontab?default(unselectedClassName)}">${uiLabelMap.AccountingAuthorize}</a>
- <a href="<@ofbizUrl>/CaptureTransaction</@ofbizUrl>" class="${selectedClassMap.capturetransactiontab?default(unselectedClassName)}">${uiLabelMap.AccountingCapture}</a>
- <a href="<@ofbizUrl>/FindGatewayResponses</@ofbizUrl>" class="${selectedClassMap.gatewayresponsestab?default(unselectedClassName)}">${uiLabelMap.AccountingGatewayResponses}</a>
- <a href="<@ofbizUrl>/ManualTransaction</@ofbizUrl>" class="${selectedClassMap.manualtransactiontab?default(unselectedClassName)}">${uiLabelMap.AccountingManualTransaction}</a>
+<#assign selected = page.tabButtonItem?default("void")>
+<div class="button-bar button-style-1">
+ <ul>
+ <li<#if selected == "authorizetransactiontab"> class="selected"</#if>><a href="<@ofbizUrl>/AuthorizeTransaction</@ofbizUrl>">${uiLabelMap.AccountingAuthorize}</a></li>
+ <li<#if selected == "capturetransactiontab"> class="selected"</#if>><a href="<@ofbizUrl>/CaptureTransaction</@ofbizUrl>">${uiLabelMap.AccountingCapture}</a></li>
+ <li<#if selected == "gatewayresponsestab"> class="selected"</#if>><a href="<@ofbizUrl>/FindGatewayResponses</@ofbizUrl>">${uiLabelMap.AccountingGatewayResponses}</a></li>
+ <li<#if selected == "manualtransactiontab"> class="selected"</#if>><a href="<@ofbizUrl>/ManualTransaction</@ofbizUrl>">${uiLabelMap.AccountingManualTransaction}</a></li>
+ </ul>
+ <br class="clear"/>
</div>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Mon Apr 23 02:12:50 2007
@@ -278,7 +278,7 @@
<widgets>
<decorator-screen name="GenericDecorator">
<decorator-section name="body">
- <container>
+ <container style="button-bar">
<link target="ListGlAccountsReport" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ListGlAccountsExport" text="${uiLabelMap.CommonExport}" style="buttontext"/>
</container>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml Mon Apr 23 02:12:50 2007
@@ -20,15 +20,8 @@

<trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-tree.xsd">
-
- <tree name="GlAccountTree" entity-name="GlAccount" root-node-name="node-root" default-render-style="expand-collapse" default-wrap-style="accountItem">
- 
+ <tree name="GlAccountTree" entity-name="GlAccount" root-node-name="node-root" default-render-style="expand-collapse" default-wrap-style="accountItem">
<node name="node-root" render-style="simple">
- 
- 
- 
<sub-node node-name="node-body">
<entity-and entity-name="GlAccount">
<field-map field-name="parentGlAccountId" env-name="null"/>
@@ -36,10 +29,8 @@
</entity-and>
</sub-node>
</node>
- <node name="node-body" wrap-style="treewrapper">
- 
- 
- <link style="treeitem" target="GlAccountNavigate?glAccountId=${glAccountId}&trail=${currentNodeTrailPiped}" text="${glAccountId} ${accountName} ${postedBalance}"/>
+ <node name="node-body">
+ <link target="GlAccountNavigate?glAccountId=${glAccountId}&trail=${currentNodeTrailPiped}" text="${glAccountId} ${accountName} ${postedBalance}"/>
<sub-node node-name="node-body">
<entity-and entity-name="GlAccount">
<field-map field-name="parentGlAccountId" env-name="glAccountId"/>
@@ -59,7 +50,7 @@
</sub-node>
</node>
<node name="node-body" wrap-style="treewrapper">
- <link style="treeitem" target="FixedAssetChildren?fixedAssetId=${fixedAssetId}&trail=${fixedAssetId}" text="${fixedAssetId} ${fixedAssetName} ${instanceOfProductId} ${fixedAssetTypeId} "/>
+ <link target="FixedAssetChildren?fixedAssetId=${fixedAssetId}&trail=${fixedAssetId}" text="${fixedAssetId} ${fixedAssetName} ${instanceOfProductId} ${fixedAssetTypeId} "/>
<sub-node node-name="node-body">
<entity-and entity-name="FixedAsset">
<field-map field-name="parentFixedAssetId" env-name="fixedAssetId"/>

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Mon Apr 23 02:12:50 2007
@@ -27,7 +27,7 @@

<field name="description"><text size="60"/></field>

- <field use-when="billingAccount!=null" name="billingAccountId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field use-when="billingAccount!=null" name="billingAccountId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>

<field name="accountCurrencyUomId">
<drop-down allow-empty="false" no-current-selected-key="USD">
@@ -46,10 +46,10 @@
</entity-options>
</drop-down>
</field>
- <field name="netBalance" widget-style="tabletext" title="${uiLabelMap.AccountingBillingNetBalance}" tooltip="${uiLabelMap.AccountingBillingNetBalanceMessage}">
+ <field name="netBalance" title="${uiLabelMap.AccountingBillingNetBalance}" tooltip="${uiLabelMap.AccountingBillingNetBalanceMessage}">
<display description="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator, billingAccountId)}" type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
</field>
- <field name="availableBalance" widget-style="tabletext" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}">
+ <field name="availableBalance" title="${uiLabelMap.AccountingBillingAvailableBalance}" tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}">
<display description="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountAvailableBalance(billingAccount)}" type="currency" currency="${billingAccount.accountCurrencyUomId}"/>
</field>

@@ -67,15 +67,15 @@
<auto-fields-service service-name="updateBillingAccountRole" default-field-type="edit"/>

<field name="billingAccountId"><hidden/></field>
- <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="tabletext">
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
<sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" link-style="buttontext"/>
</display-entity>
</field>
- <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}" widget-style="tabletext">
+ <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
<display-entity entity-name="RoleType" description="${description}"/>
</field>
- <field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>

<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="" widget-style="buttontext">

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Mon Apr 23 02:12:50 2007
@@ -57,9 +57,9 @@
<alt-target use-when="finAccount==null" target="createFinAccount"/>
<auto-fields-service service-name="updateFinAccount"/>

- <field name="finAccountId" use-when="finAccountId!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field name="finAccountId" use-when="finAccountId!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="finAccountId" use-when="finAccount==null&&finAccountId==null"><ignored/></field>
- <field name="finAccountId" use-when="finAccount==null&&finAccountId!=null" tooltip="${uiLabelMap.CommonCannotBeFound}: [${finAccountId}]" widget-style="tabletext"><display also-hidden="false"/></field>
+ <field name="finAccountId" use-when="finAccount==null&&finAccountId!=null" tooltip="${uiLabelMap.CommonCannotBeFound}: [${finAccountId}]"><display also-hidden="false"/></field>

<field name="finAccountCode"><text size="20"/></field>
<field name="finAccountPin"><text size="10"/></field>
@@ -77,9 +77,9 @@
</entity-options>
</drop-down>
</field>
- <field name="organizationPartyId" widget-style="tabletext"><lookup target-form-name="LookupPartyName"/></field>
- <field name="ownerPartyId" widget-style="tabletext"><lookup target-form-name="LookupPartyName"/></field>
- <field name="postToGlAccountId" widget-style="selectBox"><lookup target-form-name="LookupGlAccount"/></field>
+ <field name="organizationPartyId"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="ownerPartyId"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="postToGlAccountId"><lookup target-form-name="LookupGlAccount"/></field>
<field name="isFrozen">
<drop-down no-current-selected-key="N"><option key="N"/><option key="Y"/></drop-down>
</field>
@@ -96,10 +96,10 @@
</entity-condition>
</actions>
<field name="finAccountId"><hidden/></field>
- <field name="roleTypeId" widget-style="tabletext"><display/></field>
- <field name="partyId" widget-style="tabletext"> <display/></field>
- <field name="fromDate" widget-style="tabletext"><display/></field>
- <field name="thruDate" widget-style="inputBox"><date-time/></field>
+ <field name="roleTypeId"><display/></field>
+ <field name="partyId"> <display/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="" widget-style="buttontext">
<hyperlink target="deleteFinAccountRole?finAccountId=${finAccountId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}"

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Mon Apr 23 02:12:50 2007
@@ -344,9 +344,8 @@
<link target="EditFixedAssetMaintOrders?fixedAssetId=${fixedAssetMaint.fixedAssetId}&maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
</menu-item>
</menu>
- <menu name="FixedAssetTabBar" default-menu-item-name="EditFixedAsset" default-selected-style="tabButtonSelected"
- default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
- orientation="horizontal" type="simple">
+ <menu name="FixedAssetTabBar" default-menu-item-name="EditFixedAsset" default-selected-style="selected"
+ menu-container-style="button-bar button-style-1" type="simple">
<menu-item name="EditFixedAsset" title="${uiLabelMap.AccountingFixedAsset}">
<link target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/>
</menu-item>
@@ -373,9 +372,8 @@
</menu-item>
</menu>

- <menu name="FinAccountTabBar" default-menu-item-name="EditFinAccount" default-selected-style="tabButtonSelected"
- default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
- orientation="horizontal" type="simple">
+ <menu name="FinAccountTabBar" default-menu-item-name="EditFinAccount" default-selected-style="selected"
+ menu-container-style="button-bar button-style-1" type="simple">
<menu-item name="EditFinAccount" title="${uiLabelMap.AccountingFinAccount}">
<link target="EditFinAccount?finAccountId=${finAccountId}"/>
</menu-item>

Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?view=diff&rev=531390&r1=531389&r2=531390
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Mon Apr 23 02:12:50 2007
@@ -45,11 +45,11 @@
<alt-target use-when="taxAuthority==null" target="createTaxAuthority"/>
<auto-fields-service service-name="updateTaxAuthority" map-name="taxAuthority"/>

- <field use-when="taxAuthority!=null" name="taxAuthPartyId" title="${uiLabelMap.PartyParty}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field use-when="taxAuthority!=null" name="taxAuthPartyId" title="${uiLabelMap.PartyParty}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="taxAuthority==null&&taxAuthPartyId==null" name="taxAuthPartyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field>
<field use-when="taxAuthority==null&&taxAuthPartyId!=null" name="taxAuthPartyId" title="${uiLabelMap.PartyParty}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${taxAuthPartyId}]"><lookup target-form-name="LookupPartyName"/></field>

- <field use-when="taxAuthority!=null" name="taxAuthGeoId" title="${uiLabelMap.CommonGeo}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field use-when="taxAuthority!=null" name="taxAuthGeoId" title="${uiLabelMap.CommonGeo}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="taxAuthority==null&&taxAuthGeoId==null" name="taxAuthGeoId" title="${uiLabelMap.CommonGeo}"><lookup target-form-name="LookupGeo"/></field>
<field use-when="taxAuthority==null&&taxAuthGeoId!=null" name="taxAuthGeoId" title="${uiLabelMap.CommonGeo}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${taxAuthGeoId}]"><lookup target-form-name="LookupGeo"/></field>

@@ -73,7 +73,7 @@

<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>
- <field name="productCategoryId" title="${uiLabelMap.ProductCategory}" widget-style="tabletext">
+ <field name="productCategoryId" title="${uiLabelMap.ProductCategory}">
<display-entity entity-name="ProductCategory" description="${description}">
<sub-hyperlink description="${productCategoryId}" target="/catalog/control/EditCategory?productCategoryId=${productCategoryId}" target-type="inter-app" link-style="buttontext"/>
</display-entity>
@@ -108,13 +108,13 @@
<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>

- <field name="toTaxAuthPartyId" widget-style="tabletext">
+ <field name="toTaxAuthPartyId">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
<sub-hyperlink description="${toTaxAuthPartyId}" target="/partymgr/control/viewprofile?partyId=${toTaxAuthPartyId}" target-type="inter-app" link-style="buttontext"/>
</display-entity>
</field>
- <field name="toTaxAuthGeoId" widget-style="tabletext"><display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoCode}] [${geoId}]"/></field>
- <field name="fromDate" widget-style="tabletext"><display/></field>
+ <field name="toTaxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoCode}] [${geoId}]"/></field>
+ <field name="fromDate"><display/></field>

<field name="taxAuthorityAssocTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="true">
@@ -162,12 +162,12 @@

<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>
- <field name="glAccountId" title="${uiLabelMap.AccountingGlAccount}" widget-style="tabletext">
+ <field name="glAccountId" title="${uiLabelMap.AccountingGlAccount}">
<display-entity entity-name="GlAccount" description="${accountName}">
<sub-hyperlink description="${glAccountId}" target="EditGlAccount?glAccountId=${glAccountId}" link-style="buttontext"/>
</display-entity>
</field>
- <field name="organizationPartyId" title="${uiLabelMap.PartyOrganizationParty}" widget-style="tabletext">
+ <field name="organizationPartyId" title="${uiLabelMap.PartyOrganizationParty}">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}">
<sub-hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile?partyId=${organizationPartyId}" target-type="inter-app" link-style="buttontext"/>
</display-entity>
@@ -325,12 +325,12 @@
<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>

- <field use-when="partyTaxAuthInfo!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="tabletext">
+ <field use-when="partyTaxAuthInfo!=null" name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
<sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" link-style="buttontext"/>
</display-entity>
</field>
- <field use-when="partyTaxAuthInfo!=null" name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field>
+ <field use-when="partyTaxAuthInfo!=null" name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>

<field use-when="partyTaxAuthInfo==null" name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field use-when="partyTaxAuthInfo==null" name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>