Re: svn commit: r1863965 - /ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl

[adityasharma]

Hi Jacques,

It seems ticket ID (OFBIZ-11116) is missing in commit message :-)

Thanks and Regards,
Aditya Sharma

On Mon, Jul 29, 2019 at 11:38 PM <[hidden email]> wrote:

> Author: jleroux
> Date: Mon Jul 29 18:08:45 2019
> New Revision: 1863965
>
> URL: http://svn.apache.org/viewvc?rev=1863965&view=rev
> Log:
> Improved: Improper alignment of Status, OrderDate and PartyId column
> header on
> Find Orders page
> (OFBIZ-)
>
> Steps to regenerate:
>
> 1. Go to the order component (ordermgr/control/main)
> 2. Click on Find Orders submenu (ordermgr/control/findorders)
> 3. Click on Find button.
> 4. Last 3 column headers of the table are not aligned properly.
>
> Thanks: Humera Khan for report and Ashish Kumar Pandey for the fix
>
> Modified:
>
> ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
>
> Modified:
> ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl?rev=1863965&r1=1863964&r2=1863965&view=diff
>
> ==============================================================================
> ---
> ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
> (original)
> +++
> ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
> Mon Jul 29 18:08:45 2019
> @@ -544,22 +544,22 @@ document.lookuporder.orderId.focus();
>            <td >${uiLabelMap.OrderOrderId}</td>
>            <td >${uiLabelMap.OrderOrderName}</td>
>            <td >${uiLabelMap.PartyName}</td>
> -          <td >${uiLabelMap.OrderSurvey}</td>
> -          <td >${uiLabelMap.OrderItemsOrdered}</td>
> -          <td >${uiLabelMap.OrderItemsBackOrdered}</td>
> -          <td >${uiLabelMap.OrderItemsReturned}</td>
> -          <td >${uiLabelMap.OrderRemainingSubTotal}</td>
> -          <td >${uiLabelMap.OrderOrderTotal}</td>
> +          <td align="right">${uiLabelMap.OrderSurvey}</td>
> +          <td align="right">${uiLabelMap.OrderItemsOrdered}</td>
> +          <td align="right">${uiLabelMap.OrderItemsBackOrdered}</td>
> +          <td align="right">${uiLabelMap.OrderItemsReturned}</td>
> +          <td align="right">${uiLabelMap.OrderRemainingSubTotal}</td>
> +          <td align="right" >${uiLabelMap.OrderOrderTotal}
> +
>              <#if ("Y" ==
> requestParameters.filterInventoryProblems?default("N")) || ("Y" ==
> requestParameters.filterPOsOpenPastTheirETA?default("N")) || ("Y" ==
> requestParameters.filterPOsWithRejectedItems?default("N")) || ("Y" ==
> requestParameters.filterPartiallyReceivedPOs?default("N"))>
>                <td>${uiLabelMap.CommonStatus}</td>
>                <td>${uiLabelMap.CommonFilter}</td>
>              <#else>
> +              <td></td>
>                <td>${uiLabelMap.CommonStatus}</td>
>              </#if>
>            <td>${uiLabelMap.OrderDate}</td>
>            <td>${uiLabelMap.PartyPartyId}</td>
> -          <td></td>
> -          <td></td>
>          </tr>
>          <#if orderList?has_content>
>            <#assign alt_row = false>
>
>
>

[Jacques Le Roux]

Oops, right, thanks Aditya, fixed :)

Jacques

Le 02/08/2019 à 07:29, Aditya Sharma a écrit :

> Hi Jacques,
>
> It seems ticket ID (OFBIZ-11116) is missing in commit message :-)
>
> Thanks and Regards,
> Aditya Sharma
>
> On Mon, Jul 29, 2019 at 11:38 PM <[hidden email]> wrote:
>
>> Author: jleroux
>> Date: Mon Jul 29 18:08:45 2019
>> New Revision: 1863965
>>
>> URL: http://svn.apache.org/viewvc?rev=1863965&view=rev
>> Log:
>> Improved: Improper alignment of Status, OrderDate and PartyId column
>> header on
>> Find Orders page
>> (OFBIZ-)
>>
>> Steps to regenerate:
>>
>> 1. Go to the order component (ordermgr/control/main)
>> 2. Click on Find Orders submenu (ordermgr/control/findorders)
>> 3. Click on Find button.
>> 4. Last 3 column headers of the table are not aligned properly.
>>
>> Thanks: Humera Khan for report and Ashish Kumar Pandey for the fix
>>
>> Modified:
>>
>> ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
>>
>> Modified:
>> ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl?rev=1863965&r1=1863964&r2=1863965&view=diff
>>
>> ==============================================================================
>> ---
>> ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
>> (original)
>> +++
>> ofbiz/ofbiz-framework/trunk/applications/order/template/order/FindOrders.ftl
>> Mon Jul 29 18:08:45 2019
>> @@ -544,22 +544,22 @@ document.lookuporder.orderId.focus();
>>             <td >${uiLabelMap.OrderOrderId}</td>
>>             <td >${uiLabelMap.OrderOrderName}</td>
>>             <td >${uiLabelMap.PartyName}</td>
>> -          <td >${uiLabelMap.OrderSurvey}</td>
>> -          <td >${uiLabelMap.OrderItemsOrdered}</td>
>> -          <td >${uiLabelMap.OrderItemsBackOrdered}</td>
>> -          <td >${uiLabelMap.OrderItemsReturned}</td>
>> -          <td >${uiLabelMap.OrderRemainingSubTotal}</td>
>> -          <td >${uiLabelMap.OrderOrderTotal}</td>
>> +          <td align="right">${uiLabelMap.OrderSurvey}</td>
>> +          <td align="right">${uiLabelMap.OrderItemsOrdered}</td>
>> +          <td align="right">${uiLabelMap.OrderItemsBackOrdered}</td>
>> +          <td align="right">${uiLabelMap.OrderItemsReturned}</td>
>> +          <td align="right">${uiLabelMap.OrderRemainingSubTotal}</td>
>> +          <td align="right" >${uiLabelMap.OrderOrderTotal}
>> +
>>               <#if ("Y" ==
>> requestParameters.filterInventoryProblems?default("N")) || ("Y" ==
>> requestParameters.filterPOsOpenPastTheirETA?default("N")) || ("Y" ==
>> requestParameters.filterPOsWithRejectedItems?default("N")) || ("Y" ==
>> requestParameters.filterPartiallyReceivedPOs?default("N"))>
>>                 <td>${uiLabelMap.CommonStatus}</td>
>>                 <td>${uiLabelMap.CommonFilter}</td>
>>               <#else>
>> +              <td></td>
>>                 <td>${uiLabelMap.CommonStatus}</td>
>>               </#if>
>>             <td>${uiLabelMap.OrderDate}</td>
>>             <td>${uiLabelMap.PartyPartyId}</td>
>> -          <td></td>
>> -          <td></td>
>>           </tr>
>>           <#if orderList?has_content>
>>             <#assign alt_row = false>
>>
>>
>>