You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2022/02/01 07:59:54 UTC

[ofbiz-framework] branch trunk updated: Fixed: Manufacturing Jobshop find screen by default does not show all production runs (OFBIZ-12550)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 418d6e0  Fixed: Manufacturing Jobshop find screen by default does not show all production runs (OFBIZ-12550)
418d6e0 is described below

commit 418d6e03d45c3647f96dbc1f7630b348a60d11f1
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Tue Feb 1 08:57:29 2022 +0100

    Fixed: Manufacturing Jobshop find screen by default does not show all production runs (OFBIZ-12550)
    
    The manufacturing jobshop find screen has the seach date initialized to nowdate.
    if one wants to see all production runs, one has to clear the date which should
    be empty initially
    
    The same problem exists on the MRP log find where the date is filled by default.
    
    Thanks: Hans for report and patches
---
 applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl     | 2 +-
 applications/manufacturing/widget/manufacturing/ProductionRunForms.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl b/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
index 825afc1..d2ed694 100644
--- a/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
+++ b/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
@@ -70,7 +70,7 @@ function lookupInventory() {
                     <td width='20%' align='right' class="label">${uiLabelMap.CommonFromDate}</td>
                     <td width='5%'>&nbsp;</td>
                     <td>
-                      <@htmlTemplate.renderDateTimeField name="eventDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.eventDate!nowTimestamp}" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=" [...]
+                      <@htmlTemplate.renderDateTimeField name="eventDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
                     </td>
                   </tr>
                   <tr>
diff --git a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
index c5674b8..73b42b6 100644
--- a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
+++ b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
@@ -80,7 +80,7 @@ under the License.
         </field>
         <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
         <field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><text-find/></field>
-        <field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><date-find default-value="${nowTimestamp}"/></field>
+        <field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><date-find/></field>
         <field name="facilityId" title="${uiLabelMap.ProductFacilityId}">
             <drop-down allow-empty="true">
                 <entity-options entity-name="Facility" key-field-name="facilityId" description="${facilityName} [${facilityId}]">

Re: [ofbiz-framework] branch trunk updated: Fixed: Manufacturing Jobshop find screen by default does not show all production runs (OFBIZ-12550)

Posted by Pierre Smits <pi...@apache.org>.
Due to this merge the PR regarding OFBIZ-12524 (
https://github.com/apache/ofbiz-framework/pull/475 of January 23rd) is now
useless due to merge conflicts, causing work to be redone.


Pierre Smits
*Proud* *contributor** of* Apache OFBiz <https://ofbiz.apache.org/> since
2008 (without privileges)
Proud contributor to the ASF since 2006
*Apache Directory <https://directory.apache.org>, PMC Member*

Anyone could have been you, whereas I've always been anyone.


On Tue, Feb 1, 2022 at 8:59 AM <jl...@apache.org> wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> jleroux pushed a commit to branch trunk
> in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
>
>
> The following commit(s) were added to refs/heads/trunk by this push:
>      new 418d6e0  Fixed: Manufacturing Jobshop find screen by default does
> not show all production runs (OFBIZ-12550)
> 418d6e0 is described below
>
> commit 418d6e03d45c3647f96dbc1f7630b348a60d11f1
> Author: Jacques Le Roux <ja...@les7arts.com>
> AuthorDate: Tue Feb 1 08:57:29 2022 +0100
>
>     Fixed: Manufacturing Jobshop find screen by default does not show all
> production runs (OFBIZ-12550)
>
>     The manufacturing jobshop find screen has the seach date initialized
> to nowdate.
>     if one wants to see all production runs, one has to clear the date
> which should
>     be empty initially
>
>     The same problem exists on the MRP log find where the date is filled
> by default.
>
>     Thanks: Hans for report and patches
> ---
>  applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl     |
> 2 +-
>  applications/manufacturing/widget/manufacturing/ProductionRunForms.xml |
> 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git
> a/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
> b/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
> index 825afc1..d2ed694 100644
> --- a/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
> +++ b/applications/manufacturing/template/mrp/FindInventoryEventPlan.ftl
> @@ -70,7 +70,7 @@ function lookupInventory() {
>                      <td width='20%' align='right'
> class="label">${uiLabelMap.CommonFromDate}</td>
>                      <td width='5%'>&nbsp;</td>
>                      <td>
> -                      <@htmlTemplate.renderDateTimeField name="eventDate"
> event="" action="" className="" alert="" title="Format: yyyy-MM-dd
> HH:mm:ss.SSS" value="${requestParameters.eventDate!nowTimestamp}" size="25"
> maxlength="30" id="fromDate_2" dateType="date" shortDateInput=false
> timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
> timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
> timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=" [...]
> +                      <@htmlTemplate.renderDateTimeField name="eventDate"
> event="" action="" className="" alert="" title="Format: yyyy-MM-dd
> HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate_2"
> dateType="date" shortDateInput=false timeDropdownParamName=""
> defaultDateTimeString="" localizedIconTitle="" timeDropdown=""
> timeHourName="" classString="" hour1="" hour2="" timeMinutesName=""
> minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected=""
> compositeType="" formName=""/>
>                      </td>
>                    </tr>
>                    <tr>
> diff --git
> a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
> b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
> index c5674b8..73b42b6 100644
> ---
> a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
> +++
> b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
> @@ -80,7 +80,7 @@ under the License.
>          </field>
>          <field name="productId"
> title="${uiLabelMap.ProductProductId}"><lookup
> target-form-name="LookupProduct"/></field>
>          <field name="workEffortName"
> title="${uiLabelMap.ManufacturingProductionRunName}"><text-find/></field>
> -        <field name="estimatedStartDate"
> title="${uiLabelMap.ManufacturingStartDate}"><date-find
> default-value="${nowTimestamp}"/></field>
> +        <field name="estimatedStartDate"
> title="${uiLabelMap.ManufacturingStartDate}"><date-find/></field>
>          <field name="facilityId" title="${uiLabelMap.ProductFacilityId}">
>              <drop-down allow-empty="true">
>                  <entity-options entity-name="Facility"
> key-field-name="facilityId" description="${facilityName} [${facilityId}]">
>