svn commit: r484955 - in /incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt: ProductionRunDeclaration.ftl ProductionRunForms.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r484955 - in /incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt: ProductionRunDeclaration.ftl ProductionRunForms.xml

jacopoc
Author: jacopoc
Date: Sat Dec  9 01:06:44 2006
New Revision: 484955

URL: http://svn.apache.org/viewvc?view=rev&rev=484955
Log:
Disabled the ability to edit fixed asset assigned to a production run after the production run has been approved.
OFBIZ-343

Modified:
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
    incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl?view=diff&rev=484955&r1=484954&r2=484955
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl Sat Dec  9 01:06:44 2006
@@ -264,10 +264,6 @@
         <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
             <tr>
                 <td><div class="boxhead">${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}</div></td>
-                <td align="right"><div class="tabletext">
-                    <a href="<@ofbizUrl>ProductionRunDeclaration?productionRunId=${productionRunId}&amp;actionForm=AddFixedAsset</@ofbizUrl>" class="submenutextright">
-                                    ${uiLabelMap.ManufacturingAddProductionRunFixedAssetAssign}</a>
-                </td>
             </tr>
         </table>
         ${ListProductionRunFixedAssetsWrapper.renderFormString(context)}

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?view=diff&rev=484955&r1=484954&r2=484955
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Sat Dec  9 01:06:44 2006
@@ -439,12 +439,8 @@
             <hyperlink description="${uiLabelMap.CommonEdit}" also-hidden="false"
                 target="EditProductionRun?actionForm=UpdateFixedAsset&amp;workEffortId=${workEffortId}&amp;fixedAssetId=${fixedAssetId}&amp;fromDate=${fromDate}&amp;productionRunId=${productionRunId}" />
         </field>
-        <field name="editLink" title="" widget-style="smallSubmit"
-                use-when="&quot;${declarationScreen}&quot;.equals(&quot;Y&quot;)">
-            <hyperlink description="${uiLabelMap.CommonEdit}" also-hidden="false"
-                target="ProductionRunDeclaration?actionForm=UpdateFixedAsset&amp;workEffortId=${workEffortId}&amp;fixedAssetId=${fixedAssetId}&amp;fromDate=${fromDate}&amp;productionRunId=${productionRunId}" />
-        </field>
-        <field name="deleteLink" title="" widget-style="smallSubmit">
+        <field name="deleteLink" title="" widget-style="smallSubmit"
+                    use-when="!&quot;${declarationScreen}&quot;.equals(&quot;Y&quot;)">
             <hyperlink description="${uiLabelMap.CommonDelete}" also-hidden="false"
                 target="removeProductionRunFixedAsset?workEffortId=${workEffortId}&amp;fixedAssetId=${fixedAssetId}&amp;fromDate=${fromDate}&amp;productionRunId=${productionRunId}" />
         </field>