svn commit: r810248 [4/13] - in /ofbiz/branches/executionconte
Locked
svn commit: r810248 [4/13] - in /ofbiz/branches/executionconte
 
|
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/RecruitmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/RecruitmentForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/RecruitmentForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/RecruitmentForms.xml Tue Sep 1 21:33:41 2009 @@ -66,6 +66,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="jobRequisitionId" widget-style="buttontext" use-when="hasAdminPermission"> @@ -168,6 +170,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="EmploymentApp" default-field-type="display"/> @@ -250,6 +254,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="JobInterview" default-field-type="display"/> @@ -339,6 +345,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="EmploymentApp" default-field-type="display"/> @@ -409,6 +417,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmplPositionFulfillmentAndReportingStruct"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="partyId" title="Employee Name"> Modified: ofbiz/branches/executioncontext20090812/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Tue Sep 1 21:33:41 2009 @@ -953,12 +953,14 @@ double actualTotalMilliSeconds = 0.0; Double actualSetupMillis = workEffort.getDouble("actualSetupMillis"); Double actualMilliSeconds = workEffort.getDouble("actualMilliSeconds"); - if (actualSetupMillis != null) { - actualTotalMilliSeconds += actualSetupMillis.doubleValue(); + if (actualSetupMillis == null) { + actualSetupMillis = new Double(0.0); } - if (actualMilliSeconds != null) { - actualTotalMilliSeconds += actualMilliSeconds.doubleValue(); + if (actualMilliSeconds == null) { + actualMilliSeconds = new Double(0.0); } + actualTotalMilliSeconds += actualSetupMillis.doubleValue(); + actualTotalMilliSeconds += actualMilliSeconds.doubleValue(); // Get the template (aka routing task) of the work effort GenericValue routingTaskAssoc = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", UtilMisc.toMap("workEffortIdTo", productionRunTaskId, @@ -1027,7 +1029,15 @@ GenericValue usageCost = EntityUtil.getFirst(EntityUtil.filterByDate(usageCosts)); if (UtilValidate.isNotEmpty(setupCost) || UtilValidate.isNotEmpty(usageCost)) { String currencyUomId = (setupCost != null? setupCost.getString("amountUomId"): usageCost.getString("amountUomId")); - BigDecimal fixedAssetCost = (setupCost.getBigDecimal("amount").multiply(BigDecimal.valueOf(actualSetupMillis.doubleValue()))).add(usageCost.getBigDecimal("amount").multiply(BigDecimal.valueOf(actualMilliSeconds.doubleValue()))).setScale(decimals, rounding); + BigDecimal setupCostAmount = ZERO; + if (setupCost != null) { + setupCostAmount = setupCost.getBigDecimal("amount").multiply(BigDecimal.valueOf(actualSetupMillis.doubleValue())); + } + BigDecimal usageCostAmount = ZERO; + if (usageCost != null) { + usageCostAmount = usageCost.getBigDecimal("amount").multiply(BigDecimal.valueOf(actualMilliSeconds.doubleValue())); + } + BigDecimal fixedAssetCost = setupCostAmount.add(usageCostAmount).setScale(decimals, rounding); fixedAssetCost = fixedAssetCost.divide(BigDecimal.valueOf(3600000), decimals, rounding); // store the cost Map inMap = UtilMisc.toMap("userLogin", userLogin, "workEffortId", productionRunTaskId); Modified: ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Tue Sep 1 21:33:41 2009 @@ -69,6 +69,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" value="WorkEffortAndGoods"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> Modified: ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml Tue Sep 1 21:33:41 2009 @@ -36,6 +36,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> @@ -69,6 +71,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> Modified: ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Tue Sep 1 21:33:41 2009 @@ -41,6 +41,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" widget-style="buttontext" title="${uiLabelMap.ManufacturingRoutingId}"> @@ -94,6 +96,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskId}" widget-style="buttontext"> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/contact/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/contact/ContactListForms.xml Tue Sep 1 21:33:41 2009 @@ -117,6 +117,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="contactListId"/> <field-map field-name="entityName" value="ContactList"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="contactListId" widget-style="buttontext" title="${uiLabelMap.MarketingContactListContactListId}"> @@ -199,7 +201,9 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="filterByDate" from-field="parameters.hideExpired"/> <field-map field-name="orderBy" value="partyId"/> - <field-map field-name="entityName" value="ContactListParty"/> + <field-map field-name="entityName" value="ContactListParty"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <row-actions> @@ -363,6 +367,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="CommunicationEvent"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"> @@ -422,6 +428,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map value="ContactList" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" widget-style="buttontext"> @@ -467,6 +475,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="buttontext"> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml Tue Sep 1 21:33:41 2009 @@ -87,6 +87,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="dataSourceTypeId"/> <field-map field-name="entityName" value="DataSourceType"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> @@ -123,6 +125,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" widget-style="buttontext"> @@ -144,6 +148,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" widget-style="buttontext"> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/lookup/LookupForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/lookup/LookupForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/lookup/LookupForms.xml Tue Sep 1 21:33:41 2009 @@ -36,6 +36,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SegmentGroup"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"> @@ -89,6 +91,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalesForecast"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="SalesForecast" default-field-type="display"/> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/segment/SegmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/segment/SegmentForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/segment/SegmentForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/segment/SegmentForms.xml Tue Sep 1 21:33:41 2009 @@ -28,6 +28,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SegmentGroup"/> <field-map field-name="noConditionFind" value="Y"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"> @@ -152,6 +154,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SegmentGroupRole"/> <field-map field-name="noConditionFind" value="Y"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="segmentGroupId"><hidden/></field> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml Tue Sep 1 21:33:41 2009 @@ -138,6 +138,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="-orderId"/> <field-map field-name="entityName" value="TrackingCodeOrder"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> @@ -185,6 +187,8 @@ <field-map from-field="requestParameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> <field-map field-name="orderBy" value="-fromDate"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"> @@ -232,6 +236,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" widget-style="buttontext"> @@ -257,6 +263,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}" widget-style="buttontext"> @@ -322,6 +330,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" widget-style="buttontext"> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/widget/sfa/forms/ForecastForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/widget/sfa/forms/ForecastForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/widget/sfa/forms/ForecastForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/widget/sfa/forms/ForecastForms.xml Tue Sep 1 21:33:41 2009 @@ -32,6 +32,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalesForecast"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="SalesForecast" default-field-type="display"/> Modified: ofbiz/branches/executioncontext20090812/applications/marketing/widget/sfa/forms/OpportunityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/marketing/widget/sfa/forms/OpportunityForms.xml Tue Sep 1 21:33:41 2009 @@ -50,6 +50,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalesOpportunity"/> <field-map field-name="orderBy" value="salesOpportunityId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="salesOpportunityId"><hidden/></field> Modified: ofbiz/branches/executioncontext20090812/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/config/OrderUiLabels.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/config/OrderUiLabels.xml Tue Sep 1 21:33:41 2009 @@ -1229,7 +1229,7 @@ </property> <property key="OrderNewShippingAddress"> <value xml:lang="en">New Shipping Address</value> - </property> + </property> <property key="OrderAddToCart"> <value xml:lang="cs">pÅidat do koÅ¡Ãku</value> <value xml:lang="de">In den Warenkorb legen</value> @@ -9719,13 +9719,13 @@ <value xml:lang="en">View Order History</value> </property> <property key="OrderViewPermissionError"> - <value xml:lang="de">Sie haben keine Leseberechtigung für diese Seite ("ORDERMGR_VIEW" oder "ORDERMGR_ADMIN" benötigt).</value> - <value xml:lang="en">You do not have permission to view this page (it needs "ORDERMGR_VIEW" or "ORDERMGR_ADMIN").</value> - <value xml:lang="es">Usted no tiene permiso para ver esta página. (Privilegios como "ORDERMGR_VIEW" u "ORDERMGR_ADMIN" son necesarios)</value> - <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page. ("ORDERMGR_VIEW" ou "ORDERMGR_ADMIN" est nécessaire)</value> - <value xml:lang="it">Non sei autorizzato a vedere questa pagina. ("ORDERMGR_VIEW", "ORDERMGR_ADMIN" o ruolo associato all'agente Fornitore sono necessari)</value> + <value xml:lang="de">Sie haben keine Leseberechtigung für diese Seite ("ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW" oder "ORDERMGR_ADMIN" benötigt).</value> + <value xml:lang="en">You do not have permission to view this page (it needs "ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW" or "ORDERMGR_ADMIN").</value> + <value xml:lang="es">Usted no tiene permiso para ver esta página. (Privilegios como "ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW" u "ORDERMGR_ADMIN" son necesarios)</value> + <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page. ("ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW" ou "ORDERMGR_ADMIN" est nécessaire)</value> + <value xml:lang="it">Non sei autorizzato a vedere questa pagina. ("ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW", "ORDERMGR_ADMIN" o ruolo associato all'agente Fornitore sono necessari)</value> <value xml:lang="nl">You do not have permission to view this page.</value> - <value xml:lang="ro">Nu esti autorizat sa vezi aceasta pagina. ("ORDERMGR_VIEW", "ORDERMGR_ADMIN" un rol asociat la agent Furnizor sunt necesari)</value> + <value xml:lang="ro">Nu esti autorizat sa vezi aceasta pagina. ("ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW", "ORDERMGR_ADMIN" un rol asociat la agent Furnizor sunt necesari)</value> <value xml:lang="ru">У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав Ð´Ð»Ñ Ð¿ÑоÑмоÑÑа ÑÑой ÑÑÑаниÑÑ.</value> <value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¹à¸à¹à¸£à¸±à¸à¸à¸²à¸£à¸à¸¸à¸à¸²à¸à¹à¸«à¹à¸à¸¹à¸«à¸à¹à¸²à¸à¸µà¹</value> <value xml:lang="zh">ä½ æ ææµè§è¿ä¸ªé¡µé¢ã</value> Modified: ofbiz/branches/executioncontext20090812/applications/order/data/OrderSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/data/OrderSecurityData.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/data/OrderSecurityData.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/data/OrderSecurityData.xml Tue Sep 1 21:33:41 2009 @@ -99,6 +99,7 @@ <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_RETURN"/> <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_NOTE"/> <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_VIEW"/> + <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_PURCHASE_VIEW"/> <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_QUOTE_PRICE"/> <SecurityGroupPermission groupId="FULLADMIN" permissionId="ORDERMGR_CRQ_ADMIN"/> <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_CRQ_CREATE"/> Modified: ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderListState.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderListState.java (original) +++ ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderListState.java Tue Sep 1 21:33:41 2009 @@ -248,12 +248,12 @@ EntityCondition queryConditionsList = EntityCondition.makeCondition(allConditions, EntityOperator.AND); EntityFindOptions options = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); + options.setMaxRows(viewSize * (viewIndex + 1)); EntityListIterator iterator = delegator.find("OrderHeader", queryConditionsList, null, null, UtilMisc.toList("orderDate DESC"), options); // get subset corresponding to pagination state List orders = iterator.getPartialList(viewSize * viewIndex, viewSize); - iterator.last(); - orderListSize = iterator.currentIndex(); + orderListSize = iterator.getResultsSizeAfterPartialList(); iterator.close(); //Debug.logInfo("### size of list: " + orderListSize, module); return orders; Modified: ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java Tue Sep 1 21:33:41 2009 @@ -563,6 +563,7 @@ // get the index for the partial list int lowIndex = (((viewIndex.intValue() - 1) * viewSize.intValue()) + 1); int highIndex = viewIndex.intValue() * viewSize.intValue(); + findOpts.setMaxRows(highIndex); if (cond != null) { EntityListIterator eli = null; @@ -570,9 +571,7 @@ // do the lookup eli = delegator.findListIteratorByCondition(dve, cond, null, fieldsToSelect, orderBy, findOpts); - // attempt to get the full size - eli.last(); - orderCount = eli.currentIndex(); + orderCount = eli.getResultsSizeAfterPartialList(); // get the partial list for this page eli.beforeFirst(); Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.groovy?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.groovy (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.groovy Tue Sep 1 21:33:41 2009 @@ -30,16 +30,17 @@ orConditionList = []; mainConditionList = []; -//make sure the look up is case insensitive -conditionList.add(EntityCondition.makeCondition(EntityFunction.UPPER(EntityFieldValue.makeFieldValue("productId")), - EntityOperator.LIKE, productId.toUpperCase() + "%")); +if (productId) { + //make sure the look up is case insensitive + conditionList.add(EntityCondition.makeCondition(EntityFunction.UPPER(EntityFieldValue.makeFieldValue("productId")), + EntityOperator.LIKE, productId.toUpperCase() + "%")); +} // do not include configurable products conditionList.add(EntityCondition.makeCondition("productTypeId", EntityOperator.NOT_EQUAL, "AGGREGATED")); -// no virtual products: note that isVirtual could be null, which in some databases is different than isVirtual != "Y". +// no virtual products: note that isVirtual could be null, // we consider those products to be non-virtual and hence addable to the order in bulk -orConditionList.add(EntityCondition.makeCondition("isVirtual", EntityOperator.NOT_EQUAL, "Y")); orConditionList.add(EntityCondition.makeCondition("isVirtual", EntityOperator.EQUALS, "N")); orConditionList.add(EntityCondition.makeCondition("isVirtual", EntityOperator.EQUALS, null)); Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy Tue Sep 1 21:33:41 2009 @@ -19,17 +19,34 @@ import org.ofbiz.entity.condition.*; import org.ofbiz.entity.util.EntityUtil; -import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilDateTime; +import org.ofbiz.base.util.*; import org.ofbiz.order.shoppingcart.ShoppingCart; import org.ofbiz.order.shoppingcart.ShoppingCartEvents; import org.ofbiz.order.order.OrderReadHelper; -productId = request.getParameter("productId") ?: ""; +// This script can take quite a while to run with a decent amount of data +// so we'll take a best effort approach to limit the size of the results +maxRows = null; +// TODO: Find a way to get the pagination parameters for a given form +if (!parameters.containsKey("VIEW_INDEX_1")) { + // There's only one set of pagination parameters so it must be for us + if (parameters.VIEW_SIZE_0) { + if (parameters.VIEW_INDEX_0) { + viewSize = Integer.valueOf(parameters.VIEW_SIZE_0); + viewIndex = Integer.valueOf(parameters.VIEW_INDEX_0); + maxRows = viewSize * (viewIndex + 1); + } + } +} +if (!maxRows) { + maxRows = 50; +} + +productId = parameters.productId; supplier = null; supplierPartyId = null; -orderId = request.getParameter("orderId"); +orderId = parameters.orderId; if (orderId) { orderItemShipGroup = EntityUtil.getFirst(delegator.findList("OrderItemShipGroup", null, null, ["orderId" , "orderId"], null, false)); orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); @@ -44,9 +61,11 @@ conditionList = []; -// make sure the look up is case insensitive -conditionList.add(EntityCondition.makeCondition(EntityFunction.UPPER(EntityFieldValue.makeFieldValue("productId")), - EntityOperator.LIKE, productId.toUpperCase() + "%")); +if (productId) { + // make sure the look up is case insensitive + conditionList.add(EntityCondition.makeCondition(EntityFunction.UPPER(EntityFieldValue.makeFieldValue("productId")), + EntityOperator.LIKE, productId.toUpperCase() + "%")); +} if (!supplier) { supplierPartyId = shoppingCart.getOrderPartyId(); } else { @@ -55,62 +74,67 @@ conditionList.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, supplierPartyId)); conditionList.add(EntityCondition.makeCondition("currencyUomId", EntityOperator.EQUALS, shoppingCart.getCurrency())); +conditionList.add(EntityCondition.makeConditionDate("availableFromDate", "availableThruDate")); conditions = EntityCondition.makeCondition(conditionList, EntityOperator.AND); selectedFields = ["productId", "supplierProductId", "supplierProductName", "lastPrice", "minimumOrderQuantity", "orderQtyIncrements"] as Set; -selectedFields.add("availableFromDate"); -selectedFields.add("availableThruDate"); supplierProducts = delegator.findList("SupplierProduct", conditions, selectedFields, ["productId"], null, false); -supplierProducts = EntityUtil.filterByDate(supplierProducts, nowTimestamp, "availableFromDate", "availableThruDate", true); newProductList = []; - -supplierProducts.each { supplierProduct -> - quantityOnOrder = 0.0; +skippedResults = 0; +for (supplierProduct in supplierProducts) { productId = supplierProduct.productId; - // find approved purchase orders - condition = EntityCondition.makeCondition(EntityCondition.makeCondition("orderTypeId", "PURCHASE_ORDER"), EntityOperator.AND, - EntityCondition.makeCondition("statusId", "ORDER_APPROVED")); - - orderHeaders = delegator.findList("OrderHeader", condition, null, ["orderId DESC"], null, false); - orderHeaders.each { orderHeader -> - orderReadHelper = new OrderReadHelper(orderHeader); - orderItems = orderReadHelper.getOrderItems(); - orderItems.each { orderItem -> - if (productId.equals(orderItem.productId) && "ITEM_APPROVED".equals(orderItem.statusId)) { - if (!orderItem.cancelQuantity) { - cancelQuantity = 0.0; - } - shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem); - quantityOnOrder += orderItem.quantity - cancelQuantity - shippedQuantity; - } - } - } - String facilityId = request.getParameter("facilityId"); + + String facilityId = parameters.facilityId; if (facilityId) { - productFacilityList = delegator.findByAnd("ProductFacility", ["productId": productId, "facilityId" : facilityId]); + productFacilityList = delegator.findByAndCache("ProductFacility", ["productId": productId, "facilityId" : facilityId]); } else { - productFacilityList = delegator.findByAnd("ProductFacility", ["productId": productId]); + productFacilityList = delegator.findByAndCache("ProductFacility", ["productId": productId]); } - productFacilityList.each { productFacility -> - result = dispatcher.runSync("getInventoryAvailableByFacility", ["productId" : productId, "facilityId" : productFacility.facilityId]); - qohAtp = result.quantityOnHandTotal.toString() + "/" + result.availableToPromiseTotal.toString(); - productInfoMap = [:]; - - product = delegator.findOne("Product", ["productId" : productId], false); - productInfoMap.internalName = product.internalName; - - productInfoMap.productId = productId; - productInfoMap.qohAtp = qohAtp; - productInfoMap.quantityOnOrder = quantityOnOrder; - - productInfoMap.supplierProductId = supplierProduct.supplierProductId; - productInfoMap.lastPrice = supplierProduct.lastPrice; - productInfoMap.orderQtyIncrements = supplierProduct.orderQtyIncrements; - - productInfoMap.minimumStock = productFacility.minimumStock; - - newProductList.add(productInfoMap); + if (newProductList.size() >= maxRows) { + // We've got enough results to display, keep going to get the result size but skip the heavy stuff + skippedResults += productFacilityList.size(); + } else { + quantityOnOrder = 0.0; + // find approved purchase orders + condition = EntityCondition.makeCondition(EntityCondition.makeCondition("orderTypeId", "PURCHASE_ORDER"), EntityOperator.AND, + EntityCondition.makeCondition("statusId", "ORDER_APPROVED")); + + orderHeaders = delegator.findList("OrderHeader", condition, null, ["orderId DESC"], null, false); + orderHeaders.each { orderHeader -> + orderReadHelper = new OrderReadHelper(orderHeader); + orderItems = orderReadHelper.getOrderItems(); + orderItems.each { orderItem -> + if (productId.equals(orderItem.productId) && "ITEM_APPROVED".equals(orderItem.statusId)) { + if (!orderItem.cancelQuantity) { + cancelQuantity = 0.0; + } + shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem); + quantityOnOrder += orderItem.quantity - cancelQuantity - shippedQuantity; + } + } + } + product = delegator.findOne("Product", ["productId" : productId], true); + productFacilityList.each { productFacility -> + result = dispatcher.runSync("getInventoryAvailableByFacility", ["productId" : productId, "facilityId" : productFacility.facilityId]); + qohAtp = result.quantityOnHandTotal.toPlainString() + "/" + result.availableToPromiseTotal.toPlainString(); + productInfoMap = [:]; + + productInfoMap.internalName = product.internalName; + + productInfoMap.productId = productId; + productInfoMap.qohAtp = qohAtp; + productInfoMap.quantityOnOrder = quantityOnOrder; + + productInfoMap.supplierProductId = supplierProduct.supplierProductId; + productInfoMap.lastPrice = supplierProduct.lastPrice; + productInfoMap.orderQtyIncrements = supplierProduct.orderQtyIncrements; + + productInfoMap.minimumStock = productFacility.minimumStock; + + newProductList.add(productInfoMap); + } } } +context.productListSize = newProductList.size() + skippedResults; context.productList = newProductList; \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy Tue Sep 1 21:33:41 2009 @@ -36,7 +36,7 @@ if (state.hasType("view_SALES_ORDER") || (!(state.hasType("view_SALES_ORDER")) && !(state.hasType("view_PURCHASE_ORDER")))) { hasPermission = true; salesOrdersCondition = EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, "SALES_ORDER"); - } + } } if (security.hasEntityPermission("ORDERMGR", "_PURCHASE_VIEW", session)) { if (state.hasType("view_PURCHASE_ORDER") || (!(state.hasType("view_SALES_ORDER")) && !(state.hasType("view_PURCHASE_ORDER")))) { Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Tue Sep 1 21:33:41 2009 @@ -145,10 +145,10 @@ <#if product.productTypeId == "MARKETING_PKG_AUTO" || product.productTypeId == "MARKETING_PKG_PICK"> ${uiLabelMap.ProductMarketingPackageATP} = ${mktgPkgATPMap.get(productId)}, ${uiLabelMap.ProductMarketingPackageQOH} = ${mktgPkgQOHMap.get(productId)} </#if> - <#if availableToPromiseMap.get(cartLine.getProductId()) <= 0 > + <#if (availableToPromiseMap.get(cartLine.getProductId()) <= 0) && (shoppingCart.getOrderType() == "SALES_ORDER")> <span style="color: red;">[${cartLine.getQuantity()} ${uiLabelMap.OrderBackOrdered}]</span> <#else> - <#if availableToPromiseMap.get(cartLine.getProductId()) < cartLine.getQuantity()> + <#if (availableToPromiseMap.get(cartLine.getProductId()) < cartLine.getQuantity()) && (shoppingCart.getOrderType() == "SALES_ORDER")> <#assign backOrdered = cartLine.getQuantity() - availableToPromiseMap.get(cartLine.getProductId())> <span style="color: red;">[${backOrdered?if_exists} ${uiLabelMap.OrderBackOrdered}]</span> </#if> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml Tue Sep 1 21:33:41 2009 @@ -66,6 +66,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="OrderHeader"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="OrderHeader" default-field-type="display"/> @@ -121,6 +123,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="OrderHeaderAndShipGroups"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="OrderHeaderAndShipGroups" default-field-type="hidden"/> @@ -228,6 +232,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="CustRequest"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="CustRequest" default-field-type="hidden"/> @@ -271,6 +277,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="CustRequestItem"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="CustRequestItem" default-field-type="hidden"/> @@ -330,6 +338,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Quote"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Quote" default-field-type="display"/> @@ -395,6 +405,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="QuoteItem"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="QuoteItem" default-field-type="display"/> @@ -468,6 +480,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Requirement"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Requirement" default-field-type="hidden"/> @@ -504,6 +518,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="ShoppingList"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="ShoppingList" default-field-type="hidden"/> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/orderlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/orderlist.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/orderlist.ftl Tue Sep 1 21:33:41 2009 @@ -225,5 +225,5 @@ </div> </div> <#else> -<h3>${uiLabelMap.OrderViewPermissionError}</h3> -</#if> \ No newline at end of file + <h3>${uiLabelMap.OrderViewPermissionError}</h3> +</#if> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/quote/QuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/quote/QuoteForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/quote/QuoteForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/quote/QuoteForms.xml Tue Sep 1 21:33:41 2009 @@ -79,6 +79,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Quote"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Quote" default-field-type="display"/> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/requirement/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Tue Sep 1 21:33:41 2009 @@ -60,6 +60,8 @@ <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" value="Requirement"/> <field-map field-name="orderBy" value="statusId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <row-actions> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/return/ReturnForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/return/ReturnForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/return/ReturnForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/return/ReturnForms.xml Tue Sep 1 21:33:41 2009 @@ -156,6 +156,8 @@ <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" value="ReturnHeader"/> <field-map field-name="orderBy" value="entryDate DESC"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="returnId" widget-style="buttontext" title="${uiLabelMap.OrderReturnId}"> Modified: ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/CustRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/CustRequestForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/CustRequestForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/CustRequestForms.xml Tue Sep 1 21:33:41 2009 @@ -77,6 +77,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="orderBy" value="-lastModifiedDate"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> </form> @@ -526,6 +528,8 @@ <field-map field-name="partyId" from-field="lookupPartyId"/> <field-map field-name="compareDate" from-field="custRequest.custRequestDate"/> <field-map field-name="lastNameFirst" value="Y"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="custRequestId"><hidden/></field> Modified: ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryCartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryCartScreens.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryCartScreens.xml Tue Sep 1 21:33:41 2009 @@ -187,8 +187,6 @@ <actions> <set field="titleProperty" value="PageTitleLookupBulkAddSupplierProduct"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy"/> - <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/> </actions> <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> Modified: ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryForms.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryForms.xml Tue Sep 1 21:33:41 2009 @@ -39,6 +39,8 @@ <!--<field-map field-name="orderByList" from-field="resultConditions.orderByList"/>--> <field-map field-name="requirementConditions" from-field="resultConditions.entityConditionList"/> <field-map field-name="partyId" from-field="parameters.partyId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="requirementId"><display/></field> @@ -82,6 +84,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Quote" default-field-type="display"/> @@ -170,7 +174,8 @@ </field> </form> <form name="LookupBulkAddSupplierProducts" type="multi" use-row-submit="true" list-name="productList" title="" target="BulkAddProducts" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupBulkAddSupplierProducts"> + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupBulkAddSupplierProducts" + override-list-size="${productListSize}"> <field name="productId" widget-style="buttontext"> <hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems" target-type="inter-app"> <parameter param-name="productId"/> Modified: ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=810248&r1=810247&r2=810248&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Tue Sep 1 21:33:41 2009 @@ -71,6 +71,7 @@ <screen name="CustSettings"> <section> <actions> + <set field="stepLabelId" value="PartyParties"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy"/> </actions> <widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |