svn commit: r1173274 [3/13] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1173274 [3/13] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/EmplPositionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/EmplPositionScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/EmplPositionScreens.xml Tue Sep 20 17:46:13 2011 @@ -301,4 +301,100 @@ </widgets> </section> </screen> + <screen name="EditEmplPositionFtl"> + <section> + <widgets> + <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/emplposition/editemplposition.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + <screen name="EditEmplPositionOnlyForm"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditEmplPosition"/> + <set field="tabButtonItem" value="EditEmplPosition"/> + <set field="emplPositionId" from-field="parameters.emplPositionId"/> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <entity-one entity-name="EmplPosition" value-field="emplPosition"/> + </actions> + <widgets> + <include-form name="EditEmplPositionFtl" location="component://humanres/widget/forms/EmplPositionForms.xml"/> + </widgets> + </section> + </screen> + <screen name="EditInternalOrgFtl"> + <section> + <actions> + </actions> + <widgets> + <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/internalorg/editinternalorg.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + <screen name="EditInternalOrgOnlyForm"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditInternalOrg"/> + <set field="tabButtonItem" value="EditInternalOrg"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <entity-one entity-name="PartyRole" value-field="partyRole"/> + </actions> + <widgets> + <include-form name="ListInternalOrg" location="component://humanres/widget/forms/EmplPositionForms.xml"/> + </widgets> + </section> + </screen> + <screen name="RemoveEmlPositionFtl"> + <section> + <widgets> + <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/emplposition/removeemplposition.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + <screen name="RemoveEmplPositionOnlyForm"> + <section> + <actions> + <set field="titleProperty" value="PageTitleRemoveEmplPosition"/> + <set field="tabButtonItem" value="RemoveEmplPosition"/> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <entity-one entity-name="EmplPosition" value-field="emplPosition"/> + </actions> + <widgets> + <include-form name="ListEmplPositionsFtl" location="component://humanres/widget/forms/EmplPositionForms.xml"/> + </widgets> + </section> + </screen> + <screen name="RemoveInternalOrgFtl"> + <section> + <widgets> + <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + <screen name="EditEmplPositionFulfillmentsFtl"> + <section> + <actions> + <set field="titleProperty" value="PageTitleListEmplPositionFulfillments"/> + <set field="tabButtonItem" value="EditEmplPositionFulfillments"/> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <set field="emplPositionId" from-field="parameters.emplPositionId"/> + </actions> + <widgets> + <screenlet id="AddEmplPositionFulfillmentPanel"> + <include-form name="AddEmplPositionFulfillmentFtl" location="component://humanres/widget/forms/EmplPositionForms.xml"/> + </screenlet> + </widgets> + </section> + </screen> + <screen name="EditPerson"> + <section> + <widgets> + <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/emplposition/editperson.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/GlobalHRSettingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/GlobalHRSettingScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/GlobalHRSettingScreens.xml Tue Sep 20 17:46:13 2011 @@ -270,4 +270,30 @@ </widgets> </section> </screen> + <screen name="PublicHoliday"> + <section> + <actions> + <set field="titleProperty" value="PageTitlePublicHoliday"/> + <set field="headerItem" value="GlobalHRSettings"/> + <set field="tabButtonItem" value="publicHoliday"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> + </actions> + <widgets> + <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <screenlet id="addPublicHoliday" title="${uiLabelMap.PageTitleAddPublicHoliday}" collapsible="true"> + <include-form name="AddPublicHoliday" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/> + </screenlet> + <screenlet id="listPublicHoliday" title="${uiLabelMap.PageTitlePublicHolidayList}" collapsible="true"> + <include-form name="ListPublicHoliday" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/> + </screenlet> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/HumanresMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/HumanresMenus.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/HumanresMenus.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/HumanresMenus.xml Tue Sep 20 17:46:13 2011 @@ -183,6 +183,9 @@ <menu-item name="EditTrainingTypes" title="${uiLabelMap.HumanResTrainingClassType}"> <link target="EditTrainingTypes"/> </menu-item> + <menu-item name="publicHoliday" title="${uiLabelMap.PageTitlePublicHoliday}"> + <link target="PublicHoliday"/> + </menu-item> </menu> <menu name="EmployeeProfileTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml Tue Sep 20 17:46:13 2011 @@ -98,6 +98,9 @@ under the License. <field name="submitButton" use-when="emplPosition==null" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="submitButton" use-when="emplPosition!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + <form name="EditEmplPositionFtl" type="single" extends="EditEmplPosition"> + <alt-target use-when="emplPosition==null" target="createEmplPositionFtl"/> + </form> <form name="ListEmplPositionFulfillments" type="list" target="updateEmplPositionFulfillment" title="" paginate-target="findEmplPositionFulfillments" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -329,4 +332,48 @@ under the License. <auto-fields-service service-name="updateEmplPositionReportingStruct" default-field-type="display"/> <field name="emplPositionIdReportingTo"><hidden/></field> </form> + <form name="ListInternalOrg" type="single" target="createInternalOrg" default-map-name="partyRole" + header-row-style="header-row" default-table-style="basic-table"> + <field name="headpartyId" parameter-name="headpartyId"><hidden /></field> + <field name="partyId"> + <drop-down allow-empty="false"> + <entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId"> + <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/> + <entity-order-by field-name="partyId"/> + </entity-options> + </drop-down> + </field> + <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1"><display/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> + </form> + <form name="ListEmplPositionsFtl" extends="ListEmplPositions"> + <field name="salaryFlag"><hidden/></field> + <field name="exemptFlag"><hidden/></field> + <field name="fulltimeFlag"><hidden/></field> + <field name="temporaryFlag"><hidden/></field> + <field name="actualFromDate"><hidden/></field> + <field name="actualThruDate"><hidden/></field> + <field name="removeButton" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <hyperlink description="${uiLabelMap.CommonRemove}" target="removeEmlpPosition"> + <parameter param-name="emplPositionId"/> + <parameter param-name="partyId"/> + </hyperlink> + </field> + </form> + <form name="AddEmplPositionFulfillmentFtl" type="single" target="createEmplPositionFulfillmentFtl" + header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-service service-name="createEmplPositionFulfillment"/> + <field name="partyId" tooltip="${uiLabelMap.CommonRequired}"> + <drop-down allow-empty="false" > + <entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId"> + <entity-constraint name="roleTypeId" value="EMPLOYEE"/> + <entity-order-by field-name="partyId"/> + </entity-options> + </drop-down> + </field> + <field name="emplPositionId"><hidden /></field> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonRequired}"/> + <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1"><display/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> + </form> </forms> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/GlobalHRSettingForms.xml Tue Sep 20 17:46:13 2011 @@ -306,4 +306,49 @@ under the License. <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> </form> + <form name="AddPublicHoliday" type="single" target="createPublicHoliday" default-map-name="workEffort"> + <alt-target use-when="workEffort!=null" target="updatePublicHoliday"/> + <field name="workEffortId" use-when="workEffort!=null"><hidden/></field> + <field name="partyId"><hidden value="${parameters.userLogin.partyId}"/></field> + <field name="roleTypeId" use-when="workEffort==null"><hidden value="CAL_OWNER"/></field> + <field name="statusId" use-when="workEffort==null"><hidden value="PRTYASGN_ASSIGNED"/></field> + <field name="workEffortTypeId"><hidden value="PUBLIC_HOLIDAY"/></field> + <field name="currentStatusId" use-when="workEffort==null"><hidden value="CAL_TENTATIVE"/></field> + <field name="scopeEnumId"><hidden value="WES_PUBLIC"/></field> + <field name="workEffortName" title="${uiLabelMap.HumanHolidayName}" tooltip="${uiLabelMap.CommonRequired}"><text size="50"/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field> + <field name="estimatedStartDate" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonRequired}"><date-time type="date"/></field> + <field name="addButton" title="${uiLabelMap.CommonSubmit}" use-when="workEffort==null"><submit/></field> + <field name="updateButton" title="${uiLabelMap.CommonUpdate}" use-when="workEffort!=null"><submit/></field> + </form> + <form name="ListPublicHoliday" type="list" target="PublicHoliday" list-name="listIt" separate-columns="true" + odd-row-style="alternate-row" default-table-style="hover-bar basic-table"> + <actions> + <entity-and entity-name="WorkEffort" list="listIt"> + <field-map field-name="workEffortTypeId" value="PUBLIC_HOLIDAY"/> + <order-by field-name="-estimatedStartDate"/> + </entity-and> + </actions> + <row-actions> + <entity-and entity-name="WorkEffortPartyAssignment" list="assignmentList"> + <field-map field-name="workEffortId" from-field="workEffortId"/> + </entity-and> + <set field="partyId" from-field="assignmentList[0].partyId"/> + </row-actions> + <field name="workEffortId"><hidden/></field> + <field name="workEffortTypeId"><hidden value="PUBLIC_HOLIDAY"/></field> + <field name="scopeEnumId"><hidden value="WES_PUBLIC"/></field> + <field name="workEffortName" title="${uiLabelMap.HumanHolidayName}"><display/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> + <field name="estimatedStartDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field> + <field name="partyId" title="${uiLabelMap.CommonBy}"> + <display-entity entity-name="PartyNameView" description="${lastName}, ${firstName} ${middleName}" key-field-name="partyId"/> + </field> + <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit/></field> + <field name="removeHoliday" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> + <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePublicHoliday"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> + </field> + </form> </forms> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/data/ManufacturingData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/data/ManufacturingData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/data/ManufacturingData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/data/ManufacturingData.xml Tue Sep 20 17:46:13 2011 @@ -47,6 +47,4 @@ under the License. <CustomMethodType customMethodTypeId="TASK_FORMULA" description="Formula for calculating time estimates for tasks"/> <CustomMethodType customMethodTypeId="BOM_FORMULA" description="Formula for calculating material estimates for boms"/> - <WebSite webSiteId="MANUFACTURING" siteName="Manufacturing Manager" visualThemeSetId="BACKOFFICE"/> - </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Tue Sep 20 17:46:13 2011 @@ -3063,7 +3063,7 @@ public class ProductionRunServices { "userLogin", userLogin); resultService = dispatcher.runSync("getManufacturingComponents", serviceContext); List<Map<String, Object>> components = UtilGenerics.checkList(resultService.get("componentsMap")); - if (components == null || components.isEmpty()) { + if (UtilValidate.isEmpty(components)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunCannotDecomposingInventoryItemNoComponentsFound", UtilMisc.toMap("productId", inventoryItem.getString("productId")), locale)); } Iterator<Map<String, Object>> componentsIt = components.iterator(); Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy Tue Sep 20 17:46:13 2011 @@ -25,7 +25,7 @@ taskInfos = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> records = delegator.findByAnd("InventoryItemDetail", [workEffortId : task.workEffortId]); - HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskActualComponents", request, response); + HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskActualComponents", request, response); taskForm.putInContext("records", records); taskInfos.add([task : task, taskForm : taskForm]); } Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy Tue Sep 20 17:46:13 2011 @@ -25,7 +25,7 @@ taskInfos = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> records = delegator.findByAnd("WorkEffortGoodStandard", [workEffortId : task.workEffortId]); - HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskComponents", request, response); + HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskComponents", request, response); taskForm.putInContext("records", records); taskInfos.add([task : task, taskForm : taskForm]); } Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy Tue Sep 20 17:46:13 2011 @@ -25,14 +25,14 @@ taskCosts = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> costs = EntityUtil.filterByDate(delegator.findByAnd("CostComponent", [workEffortId : task.workEffortId])); - HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); + HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); taskCostsForm.putInContext("taskCosts", costs); taskCosts.add([task : task ,costsForm : taskCostsForm]); } // get the costs directly associated to the production run (e.g. overhead costs) productionRun = delegator.findOne("WorkEffort", [workEffortId: productionRunId], true); costs = EntityUtil.filterByDate(delegator.findByAnd("CostComponent", [workEffortId : productionRunId])); -HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); +HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); taskCostsForm.putInContext("taskCosts", costs); taskCosts.add([task : productionRun ,costsForm : taskCostsForm]); Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Tue Sep 20 17:46:13 2011 @@ -98,7 +98,7 @@ if (productionRunId) { Map routingTaskData = routingTask.getAllFields(); routingTaskData.estimatedSetupMillis = routingTask.getDouble("estimatedSetupMillis"); routingTaskData.estimatedMilliSeconds = routingTask.getDouble("estimatedMilliSeconds"); - HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunDeclRoutingTask", request, response); + HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "EditProductionRunDeclRoutingTask", request, response); editPrRoutingTaskWrapper.putInContext("routingTaskData", routingTaskData); editPrRoutingTaskWrapper.putInContext("actionForm", "UpdateRoutingTask"); routingTaskData.partyId = userLogin.partyId; @@ -116,14 +116,14 @@ if (productionRunId) { if (templateTask) { delivProducts = EntityUtil.filterByDate(templateTask.getRelatedByAnd("WorkEffortGoodStandard", [workEffortGoodStdTypeId : "PRUNT_PROD_DELIV"])); } - HtmlFormWrapper createRoutingTaskDelivProductForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "CreateRoutingTaskDelivProduct", request, response); + HtmlFormWrapper createRoutingTaskDelivProductForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "CreateRoutingTaskDelivProduct", request, response); createRoutingTaskDelivProductForm.putInContext("formData", [productionRunId : productionRunId, workEffortId : routingTaskId]); context.createRoutingTaskDelivProductForm = createRoutingTaskDelivProductForm; context.delivProducts = delivProducts; // Get the list of delivered products, i.e. inventory items prunInventoryProduced = delegator.findByAnd("WorkEffortAndInventoryProduced", [workEffortId : routingTaskId]); context.prunInventoryProduced = prunInventoryProduced; - HtmlFormWrapper prunInventoryProducedForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskInventoryProducedList", request, response); + HtmlFormWrapper prunInventoryProducedForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskInventoryProducedList", request, response); prunInventoryProducedForm.putInContext("prunInventoryProduced", prunInventoryProduced); context.prunInventoryProducedForm = prunInventoryProducedForm; } Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy Tue Sep 20 17:46:13 2011 @@ -25,7 +25,7 @@ taskInfos = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> records = task.getRelated("WorkEffortFixedAssetAssign"); - HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskFixedAssets", request, response); + HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskFixedAssets", request, response); taskForm.putInContext("records", records); taskInfos.add([task : task, taskForm : taskForm]); } Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Tue Sep 20 17:46:13 2011 @@ -25,11 +25,6 @@ under the License. <description>Manufacturing Manager Module by TAU Informatica srl</description> <context-param> - <param-name>webSiteId</param-name> - <param-value>MANUFACTURING</param-value> - <description>A unique ID used to look up the WebSite entity</description> - </context-param> - <context-param> <param-name>entityDelegatorName</param-name> <param-value>default</param-value> <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunCosts.ftl Tue Sep 20 17:46:13 2011 @@ -18,13 +18,14 @@ under the License. --> <#list taskCosts as taskCost> -<div class="screenlet"> - <div class="screenlet-title-bar"> - <#assign task = taskCost.task> - <#assign costsForm = taskCost.costsForm> - <h3>${uiLabelMap.ManufacturingActualCosts} ${task.workEffortName?if_exists} [${task.workEffortId}]</h3> - ${costsForm.renderFormString(context)} + <div class="screenlet"> + <div class="screenlet-title-bar"> + <#assign task = taskCost.task> + <h3>${uiLabelMap.ManufacturingActualCosts} ${task.workEffortName?if_exists} [${task.workEffortId}]</h3> + </div> + <div class="screenlet-body"> + <#assign costsForm = taskCost.costsForm> + ${costsForm.renderFormString(context)} + </div> </div> - <div class="screenlet-body"> -</div> </#list> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Tue Sep 20 17:46:13 2011 @@ -66,7 +66,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingCreateProductionRun}"> - <include-form name="CreateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="CreateProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -108,7 +108,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}" navigation-menu-name="ProductionRunStatusAction"> <include-menu name="ProductionRunStatusTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/> - <include-form name="UpdateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="UpdateProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> @@ -116,7 +116,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> - <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="mandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> @@ -126,24 +126,24 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> - <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="dependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.ManufacturingOrderItems}"> - <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunOrderItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"> - <include-form name="ViewListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ViewListProductionRunRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingMaterials}"> - <include-form name="ListProductionRunComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"> - <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunNotes}"> - <include-form name="ListProductionRunNotes" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunNotes" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -187,7 +187,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}" navigation-menu-name="ProductionRunStatusAction"> <include-menu name="ProductionRunStatusTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/> - <include-form name="ShowProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ShowProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> @@ -195,7 +195,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingProductionRunProduce}"> - <include-form name="ProductionRunProduce" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ProductionRunProduce" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> @@ -205,13 +205,13 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingProductionRunDeclareAndProduce}"> - <include-form name="ProductionRunDeclareAndProduceTop" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <include-form name="ProductionRunDeclareAndProduceBottom" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ProductionRunDeclareAndProduceTop" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> + <include-form name="ProductionRunDeclareAndProduceBottom" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.ManufacturingInventoryItemsProduced}"> - <include-form name="ListProductionRunInventoryItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunInventoryItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> @@ -219,7 +219,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> - <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="mandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> @@ -229,15 +229,15 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> - <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="dependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.ManufacturingOrderItems}"> - <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunOrderItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"> - <include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingProductionRunDeclaration}"> <platform-specific> @@ -245,13 +245,13 @@ under the License. </platform-specific> </screenlet> <screenlet title="${uiLabelMap.ManufacturingMaterialsRequiredByRunningTask}"> - <include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingReturnMaterials}"> - <include-form name="ListReturnProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListReturnProductionRunDeclComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"> - <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -311,10 +311,10 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> - <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="mandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> - <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="dependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -344,9 +344,9 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet id="EditProductionRunRoutingTaskPanel" title="${uiLabelMap.ManufacturingProductionRunTasks}" collapsible="true"> - <include-form name="EditProductionRunRoutingTask" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="EditProductionRunRoutingTask" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> - <include-form name="ListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -371,7 +371,7 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingProductionRunComponents}"> - <include-form name="AddProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="AddProductionRunComponent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <widgets> @@ -404,7 +404,7 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingActualMaterials}"> - <include-form name="IssueProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="IssueProductionRunComponent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <platform-specific> <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html> @@ -433,7 +433,7 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingTaskFixedAssets}"> - <include-form name="AddProductionRunTaskFixedAsset" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="AddProductionRunTaskFixedAsset" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <widgets> @@ -493,10 +493,10 @@ under the License. <decorator-section name="body"> <section> <widgets> - <include-form name="ListProductionRunContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> <screenlet title="Import Content From Product ${delivProductId}"> - <include-form name="FindDelivProductContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <include-form name="ListDelivProductContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="FindDelivProductContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> + <include-form name="ListDelivProductContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> @@ -525,10 +525,10 @@ under the License. </container> </decorator-section> <decorator-section name="search-options"> - <include-form name="findProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="findProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listFindProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="listFindProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -559,7 +559,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingWorkWithShipmentPlans}"> - <include-form name="listShipmentPlans" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="listShipmentPlans" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> @@ -567,7 +567,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.FormFieldTitle_shipmentId} ${shipment.shipmentId}"> - <include-form name="listShipmentPlan" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="listShipmentPlan" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/ReportScreens.xml Tue Sep 20 17:46:13 2011 @@ -32,7 +32,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingReports}"> - <include-form name="SelectMrpName" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="SelectMrpName" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> <platform-specific> <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl"/></html> </platform-specific> Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml Tue Sep 20 17:46:13 2011 @@ -814,27 +814,6 @@ <value xml:lang="zh">æ°å»ºååºç»åç±»</value> <value xml:lang="zh_TW">æ°å»ºååçµåé¡</value> </property> - <property key="MarketingSegmentGroupClassificationCreatePermissionError"> - <value xml:lang="en">Error on creation Segment Group Classification</value> - <value xml:lang="it">Errore durante la creazione di una nuova classificazione gruppo segmento</value> - <value xml:lang="pt_BR">Erro ao criar grupo de classificação de segmento</value> - <value xml:lang="zh">å建ååºç»åç±»æ¶åºé</value> - <value xml:lang="zh_TW">åµå»ºååçµåé¡æåºé¯</value> - </property> - <property key="MarketingSegmentGroupClassificationDeletePermissionError"> - <value xml:lang="en">Error on delete Segment Group Classification</value> - <value xml:lang="it">Errore durante la cancellazione di una classificazione gruppo segmento</value> - <value xml:lang="pt_BR">Erro ao excluir o grupo de classificação de segmento</value> - <value xml:lang="zh">å é¤ååºç»åç±»æ¶åºé</value> - <value xml:lang="zh_TW">åªé¤ååçµåé¡æåºé¯</value> - </property> - <property key="MarketingSegmentGroupClassificationUpdatePermissionError"> - <value xml:lang="en">Error on update Segment Group Classification</value> - <value xml:lang="it">Errore durante l'aggiornamento di una classificazione gruppo segmento</value> - <value xml:lang="pt_BR">Erro ao atualizar o grupo de classificação de segmento</value> - <value xml:lang="zh">æ´æ°ååºç»åç±»æ¶åºé</value> - <value xml:lang="zh_TW">æ´æ°ååçµåé¡æåºé¯</value> - </property> <property key="MarketingSegmentGroupCreate"> <value xml:lang="en">Create New Segment Group</value> <value xml:lang="es">Nuevo segmento</value> @@ -886,27 +865,6 @@ <value xml:lang="zh">æ°å»ºååºç»å°ç</value> <value xml:lang="zh_TW">æ°å»ºååçµå°ç</value> </property> - <property key="MarketingSegmentGroupGeoCreatePermissionError"> - <value xml:lang="en">Error on creation Segment Group Geo</value> - <value xml:lang="it">Errore durante la creazione di una nuova geo gruppo segmento</value> - <value xml:lang="pt_BR">Erro ao griar localização de grupo de segmento</value> - <value xml:lang="zh">å建ååºç»å°çæ¶åºé</value> - <value xml:lang="zh_TW">åµå»ºååçµå°çæåºé¯</value> - </property> - <property key="MarketingSegmentGroupGeoDeletePermissionError"> - <value xml:lang="en">Error on delete Segment Group Geo</value> - <value xml:lang="it">Errore durante la cancellazione di un geo gruppo segmento</value> - <value xml:lang="pt_BR">Erro ao excluir localização de grupo de segmento</value> - <value xml:lang="zh">å é¤ååºç»å°çæ¶åºé</value> - <value xml:lang="zh_TW">åªé¤ååçµå°çæåºé¯</value> - </property> - <property key="MarketingSegmentGroupGeoUpdatePermissionError"> - <value xml:lang="en">Error on update Segment Group Geo</value> - <value xml:lang="it">Errore durante l'aggiornamento di un nuovo geo gruppo segmento</value> - <value xml:lang="pt_BR">Erro ao atualizar a localização de grupo de segmento</value> - <value xml:lang="zh">æ´æ°ååºç»å°çæ¶åºé</value> - <value xml:lang="zh_TW">æ´æ°ååçµå°çæåºé¯</value> - </property> <property key="MarketingSegmentGroupMgrViewPermissionError"> <value xml:lang="en">Segment Group View Permission Error</value> <value xml:lang="it">Errore permesso di visualizzare i gruppi segmento</value> @@ -934,10 +892,6 @@ <value xml:lang="zh">ååºç»ä¼åçåç±»ç»æ è¯</value> <value xml:lang="zh_TW">ååçµæå¡çåé¡çµID</value> </property> - <property key="MarketingSegmentGroupPermissionError"> - <value xml:lang="en">Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission</value> - <value xml:lang="it">Errore di sicurezza\: per eseguire ${methodShortDescription} devi avere il permesso MARKETING${securityAction} o MARKETING_ADMIN</value> - </property> <property key="MarketingSegmentGroupProductStoreId"> <value xml:lang="de">Produktgeschäfts-ID</value> <value xml:lang="en">Product Store Id</value> @@ -962,27 +916,6 @@ <value xml:lang="zh">æ°å»ºååºç»è§è²</value> <value xml:lang="zh_TW">æ°å»ºååçµè§è²</value> </property> - <property key="MarketingSegmentGroupRoleCreatePermissionError"> - <value xml:lang="en">Error on creation Segment Group Role</value> - <value xml:lang="it">Errore durante la creazione di un nuovo ruolo gruppo segmento</value> - <value xml:lang="pt_BR">Erro na criação do papel de Grupo de Segmento</value> - <value xml:lang="zh">å建ååºç»è§è²æ¶åºé</value> - <value xml:lang="zh_TW">åµå»ºååçµè§è²æåºé¯</value> - </property> - <property key="MarketingSegmentGroupRoleDeletePermissionError"> - <value xml:lang="en">Error on delete Segment Group Role</value> - <value xml:lang="it">Errore durante la cancellazione di un nuovo ruolo gruppo segmento</value> - <value xml:lang="pt_BR">Erro ao excluir o papel de grupo de segmento</value> - <value xml:lang="zh">å é¤ååºç»è§è²æ¶åºé</value> - <value xml:lang="zh_TW">åªé¤ååçµè§è²æåºé¯</value> - </property> - <property key="MarketingSegmentGroupRoleUpdatePermissionError"> - <value xml:lang="en">Error on update Segment Group Role</value> - <value xml:lang="it">Errore durante l'aggiornamento di un nuovo ruolo gruppo segmento</value> - <value xml:lang="pt_BR">Erro ao atualizar o papel de Grupo de Segmento</value> - <value xml:lang="zh">æ´æ°ååºç»è§è²æ¶åºé</value> - <value xml:lang="zh_TW">æ´æ°ååçµè§è²æåºé¯</value> - </property> <property key="MarketingSegmentGroupSegmentGroup"> <value xml:lang="en">Segment</value> <value xml:lang="es">Segmentos</value> @@ -1081,13 +1014,6 @@ <value xml:lang="zh">ååºç»ç±»åæ è¯</value> <value xml:lang="zh_TW">åå群çµé¡åID</value> </property> - <property key="MarketingSegmentGroupUpdatePermissionError"> - <value xml:lang="en">Error on update Segment Group</value> - <value xml:lang="it">Errore durante l'aggiornamento di un gruppo segmento</value> - <value xml:lang="pt_BR">Erro ao atualizar Grupo de Segmento</value> - <value xml:lang="zh">æ´æ°ååºç»æ¶åºé</value> - <value xml:lang="zh_TW">æ´æ°ååçµæåºé¯</value> - </property> <property key="MarketingServiceError"> <value xml:lang="en">There was a problem processing your request. Please try again. If the problem persists, please contact us.</value> <value xml:lang="fr">Il y a eu un problème durant le traitement de votre demande. SVP, essayez encore. Si le problème persiste, contactez-nous, merci.</value> @@ -1548,6 +1474,15 @@ <value xml:lang="zh">访é®</value> <value xml:lang="zh_TW">訪å</value> </property> + <property key="MarketingWebSiteContactList"> + <value xml:lang="en">WebSites</value> + </property> + <property key="MarketingWebSiteContactListCreate"> + <value xml:lang="en">Create WebSite</value> + </property> + <property key="MarketingWebSiteContactListView"> + <value xml:lang="en">WebSites View</value> + </property> <property key="PageTitleAccountSummary"> <value xml:lang="en">Account Summary</value> <value xml:lang="fr">Résumé de compte</value> Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/data/MarketingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/data/MarketingTypeData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/marketing/data/MarketingTypeData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/marketing/data/MarketingTypeData.xml Tue Sep 20 17:46:13 2011 @@ -98,9 +98,6 @@ under the License. <StatusValidChange condition="" statusId="LEAD_ASSIGNED" statusIdTo="LEAD_QUALIFIED" transitionName="Qualified"/> <StatusValidChange condition="" statusId="LEAD_ASSIGNED" statusIdTo="PARTY_DISABLED" transitionName="Disabled"/> - <WebSite webSiteId="MARKETING" siteName="Marketing Manager" visualThemeSetId="BACKOFFICE"/> - <WebSite webSiteId="SFA" siteName="SFA Manager" visualThemeSetId="BACKOFFICE"/> - <EnumerationType enumTypeId="SLSOPP_TYP_ENUM" description="Sales Opportunity Type"/> </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/entitydef/entitymodel.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/marketing/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/marketing/entitydef/entitymodel.xml Tue Sep 20 17:46:13 2011 @@ -184,6 +184,23 @@ under the License. <key-map field-name="ownerPartyId" rel-field-name="partyId"/> </relation> </entity> + <entity entity-name="WebSiteContactList" + package-name="org.ofbiz.marketing.contact" + title="Web Site Contact List Entity"> + <field name="webSiteId" type="id-ne"></field> + <field name="contactListId" type="id-ne"></field> + <field name="fromDate" type="date-time"></field> + <field name="thruDate" type="date-time"></field> + <prim-key field="webSiteId"/> + <prim-key field="contactListId"/> + <prim-key field="fromDate"/> + <relation type="one" fk-name="WEB_SITE_CNTCT_LST" rel-entity-name="WebSite"> + <key-map field-name="webSiteId"/> + </relation> + <relation type="one" fk-name="CNTCT_LST_WEB_SITE" rel-entity-name="ContactList"> + <key-map field-name="contactListId"/> + </relation> + </entity> <entity entity-name="ContactListCommStatus" package-name="org.ofbiz.marketing.contact" title="Contact List Entity"> Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Sep 20 17:46:13 2011 @@ -427,6 +427,41 @@ under the License. </else> </if> </simple-method> + <simple-method method-name="createWebSiteContactList" short-description="Add WebSite ContactList"> + <entity-and list="webSiteContactList" entity-name="WebSiteContactList"> + <field-map field-name="webSiteId" from-field="parameters.webSiteId"/> + <field-map field-name="contactListId" from-field="parameters.contactListId"/> + <field-map field-name="fromDate" from-field="parameters.fromDate"/> + </entity-and> + <if-empty field="webSiteContactList"> + <make-value value-field="webSiteContactList" entity-name="WebSiteContactList"/> + <set-pk-fields value-field="webSiteContactList" map="parameters"/> + <set-nonpk-fields value-field="webSiteContactList" map="parameters"/> + <create-value value-field="webSiteContactList"/> + <return/> + </if-empty> + <set field="message" value="This webSiteContactList (webSiteId[${parameters.webSiteId}], contactListId[${parameters.contactListId}]) already exists."/> + <field-to-result field="message" result-name="errorMessage"></field-to-result> + </simple-method> + <simple-method method-name="updateWebSiteContactList" short-description="Update WebSite ContactList"> + <entity-and list="webSiteContactList" entity-name="WebSiteContactList"> + <field-map field-name="webSiteId" from-field="parameters.webSiteId"/> + <field-map field-name="contactListId" from-field="parameters.contactListId"/> + <field-map field-name="fromDate" from-field="parameters.fromDate"/> + </entity-and> + <first-from-list entry="entryWebSiteContactList" list="webSiteContactList"/> + <set-pk-fields value-field="entryWebSiteContactList" map="parameters"/> + <set-nonpk-fields value-field="entryWebSiteContactList" map="parameters"/> + <store-value value-field="entryWebSiteContactList"/> + </simple-method> + <simple-method method-name="deleteWebSiteContactList" short-description="Delete WebSite ContactList"> + <entity-and list="webSiteContactList" entity-name="WebSiteContactList"> + <field-map field-name="webSiteId" from-field="parameters.webSiteId"/> + <field-map field-name="contactListId" from-field="parameters.contactListId"/> + <field-map field-name="fromDate" from-field="parameters.fromDate"/> + </entity-and> + <remove-list list="webSiteContactList"/> + </simple-method> <!-- service to use in contact list communications to handle opt-out links based on the communication event sent --> <simple-method method-name="optOutOfListFromCommEvent" short-description="Contact List Opt Out From Communication Event" login-required="false"> Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Tue Sep 20 17:46:13 2011 @@ -21,153 +21,7 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> - <!-- SegmentGroup services --> - <simple-method method-name="createSegmentGroup" short-description="createSegmentGroup"> - <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value value-field="newEntity" entity-name="SegmentGroup"/> - <sequenced-id sequence-name="SegmentGroup" field="newEntity.segmentGroupId"/> - <field-to-result field="newEntity.segmentGroupId" result-name="segmentGroupId"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateSegmentGroup" short-description="updateSegmentGroup"> - <check-permission permission="MARKETING" action="_UPDATE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <entity-one entity-name="SegmentGroup" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteSegmentGroup" short-description="deleteSegmentGroup"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupDeletePermissionError"/> - </check-permission> - <check-errors/> - - <entity-one entity-name="SegmentGroup" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - - <!-- SegmentGroupClassification methods --> - <simple-method method-name="createSegmentGroupClassification" short-description="create a SegmentGroupClassification"> - <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationCreatePermissionError"/> - </check-permission> - <check-errors/> - <make-value entity-name="SegmentGroupClassification" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateSegmentGroupClassification" short-description="update a SegmentGroupClassification"> - <check-permission permission="MARKETING" action="_UPDATE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationUpdatePermissionError"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SegmentGroupClassification" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteSegmentGroupClassification" short-description="delete a SegmentGroupClassification"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationDeletePermissionError"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SegmentGroupClassification" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- SegmentGroupGeo methods --> - <simple-method method-name="createSegmentGroupGeo" short-description="create a SegmentGroupGeo"> - <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoCreatePermissionError"/> - </check-permission> - <check-errors/> - <make-value entity-name="SegmentGroupGeo" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateSegmentGroupGeo" short-description="update a SegmentGroupGeo"> - <check-permission permission="MARKETING" action="_UPDATE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoUpdatePermissionError"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteSegmentGroupGeo" short-description="delete a SegmentGroupGeo"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoDeletePermissionError"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- SegmentGroupRole methods --> - <simple-method method-name="createSegmentGroupRole" short-description="create a SegmentGroupRole"> - <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleCreatePermissionError"/> - </check-permission> - <check-errors/> - <make-value entity-name="SegmentGroupRole" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateSegmentGroupRole" short-description="update a SegmentGroupRole"> - <check-permission permission="MARKETING" action="_UPDATE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleUpdatePermissionError"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SegmentGroupRole" value-field="lookedUpValue"/> - <set-pk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteSegmentGroupRole" short-description="delete a SegmentGroupRole"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleDeletePermissionError"/> - </check-permission> - <check-errors/> - <entity-one entity-name="SegmentGroupRole" value-field="lookedUpValue"/> -<!-- <field-to-result field="lookedUpValue.partyId" result-name="partyId"/> --> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <!-- SegmentGroup Related Find Service --> - <simple-method method-name="findPartiesInSegmentGroup" short-description="Find Parties In a SegmentGroup"> - <!-- - Determined by: - SegmentGroup -> SegmentGroupRole -> Party - OR - SegmentGroup -> SegmentGroupClassification -> PartyClassificationGroup -> PartyClassification -> Party - --> - <set field="securityAction" value="_VIEW"/> - <check-permission permission="MARKETING" action="${securityAction}"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingSegmentGroupPermissionError"/> - </check-permission> - <check-errors/> - - </simple-method> - <simple-method method-name="findSegmentGroupsOfParty" short-description="Find SegmentGroups Of a Party (that a Party is In)"> - <!-- Follows same path as findPartiesInSegmentGroup, but in reverse... --> - <set field="securityAction" value="_VIEW"/> - <check-permission permission="MARKETING" action="${securityAction}"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingSegmentGroupPermissionError"/> - </check-permission> - <check-errors/> - - </simple-method> <simple-method method-name="arePartiesRelatedThroughSegmentGroup" short-description="Determine: are Parties Related Through SegmentGroup?"> <!-- NOTE NOTE NOTE: this service is not current and needs to be updated for the new SegmentGroupViewRelatedParties view-entity def --> @@ -178,12 +32,6 @@ under the License. OR Party -> SegmentGroupRole -> SegmentGroup -> SegmentGroupClassification -> PartyClassificationGroup -> PartyClassification -> Party --> - <set field="securityAction" value="_VIEW"/> - <check-permission permission="MARKETING" action="${securityAction}"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingSegmentGroupPermissionError"/> - </check-permission> - <check-errors/> - <now-timestamp field="nowTimestamp"/> <entity-condition entity-name="SegmentGroupViewRelatedParties" list="segmentGroupViewRelatedPartiesList"> <condition-list combine="and"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |