OFBiz › OFBiz - Commits

svn commit: r1862279 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/manufacturing/config/ applications/manufacturing/webapp/manufacturing/WEB-INF/ applications/manufacturing/widget/manufacturing/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1862279 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/manufacturing/config/ applications/manufacturing/webapp/manufacturing/WEB-INF/ applications/manufacturing/widget/manufacturing/

jleroux@apache.org
Author: jleroux
Date: Fri Jun 28 11:55:09 2019
New Revision: 1862279

URL: http://svn.apache.org/viewvc?rev=1862279&view=rev
Log:
"Applied fix from trunk for revision: 1862278"
------------------------------------------------------------------------
r1862278 | jleroux | 2019-06-28 13:53:55 +0200 (ven. 28 juin 2019) | 17 lignes

Fixed: User should be notified with success message on MRP run in manufacturing component
(OFBIZ-9533)

Steps to regenerate:
1. Go to Manufacturing component (manufacturing/control/main)
2. Click on Mrp sub menu (manufacturing/control/FindInventoryEventPlan)
3. Click on Run Mrp button.(manufacturing/control/RunMrp)
4. Select Facility/Facility Group and Click Submit button.
On success, the user should be notified with success message like
"Mrp run is scheduled".

jleroux: despite being a sub-task of an improvement I decided to backport.
It works well and nothing could go wrong, only UI changes.

Thanks: Aditya Sharma for report, Humera Khan for the fix, Prachi Shastri for
testing and Pierre Smits for noticing this could be backported (despite being
a sub-task of an improvement)
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/widget/manufacturing/MrpScreens.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 28 11:55:09 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1862279&r1=1862278&r2=1862279&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/config/ManufacturingUiLabels.xml Fri Jun 28 11:55:09 2019
@@ -3112,6 +3112,10 @@
         <value xml:lang="zh">生产资源计划名称</value>
         <value xml:lang="zh-TW">生產資源計劃名稱</value>
     </property>
+    <property key="ManufacturingMrpRunScheduledSuccessfully">
+        <value xml:lang="en">Mrp run scheduled successfully</value>
+        <value xml:lang="fr">Exécution de Mrp programmée avec succès</value>
+    </property>
     <property key="ManufacturingNewCalendar">
         <value xml:lang="de">Neuer Kalender</value>
         <value xml:lang="en">New calendar</value>

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1862279&r1=1862278&r2=1862279&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Fri Jun 28 11:55:09 2019
@@ -465,7 +465,7 @@ under the License.
     <request-map uri="runMrpGo">
         <security https="true" auth="true"/>
         <event type="service" invoke="executeMrp" path="async"/>
-        <response name="success" type="view" value="MrpExecution"/>
+        <response name="success" type="view" value="RunMrpGo"/>
         <response name="error" type="view" value="MrpExecution"/>
     </request-map>
 
@@ -871,6 +871,7 @@ under the License.
     <!-- MRP view mappings -->
     <view-map name="FindMrpPlannedEvents" type="screen" page="component://manufacturing/widget/manufacturing/MrpScreens.xml#FindMrpPlannedEvents"/>
     <view-map name="MrpExecution" type="screen" page="component://manufacturing/widget/manufacturing/MrpScreens.xml#MrpExecution"/>
+    <view-map name="RunMrpGo" page="component://manufacturing/widget/manufacturing/MrpScreens.xml#RunMrpGo" type="screen"/>
     <view-map name="ManufacturingReports" type="screen" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#ManufacturingReports"/>
 
     <!-- JobShop Management view mappings -->

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/widget/manufacturing/MrpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=1862279&r1=1862278&r2=1862279&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/manufacturing/widget/manufacturing/MrpScreens.xml Fri Jun 28 11:55:09 2019
@@ -54,6 +54,25 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <screen name="RunMrpGo">
+        <section>
+            <actions>
+                <set field="titleProperty" value="ManufacturingRunMrp"/>
+                <set field="tabButtonItem" value="RunMrp"/>
+                <set field="headerItem" value="mrp"/>
+                <set field="eventMessage" value="${groovy: org.apache.ofbiz.base.util.UtilProperties.getMessage('ManufacturingUiLabels', 'ManufacturingMrpRunScheduledSuccessfully', locale)}"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonMrpDecorator">
+                    <decorator-section name="body">
+                        <screenlet title="${uiLabelMap.ManufacturingRunMrp}">
+                            <include-form name="RunMrp" location="component://manufacturing/widget/manufacturing/MrpForms.xml"/>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     <screen name="FindMrpPlannedEvents">
         <section>
             <actions>


Free forum by Nabble Edit this page