svn commit: r1610377 - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1610377 - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Jul 14 10:21:59 2014 New Revision: 1610377 URL: http://svn.apache.org/r1610377 Log: Keeps in sync with OFBiz trunk HEAD Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar - copied unchanged from r1610376, ofbiz/trunk/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar - copied unchanged from r1610376, ofbiz/trunk/framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch - copied unchanged from r1610376, ofbiz/trunk/tools/demo-backup/branch13.7-demo.patch Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/svn-external.properties Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentSecurityGroupDemoData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/content/DataResourceScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/servicedef/services.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/servicedef/services.xml Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1608346-1610376 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Mon Jul 14 10:21:59 2014 @@ -108,8 +108,9 @@ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-jasper.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar"/> <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-3.1.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Mon Jul 14 10:21:59 2014 @@ -81,8 +81,9 @@ framework/catalina/lib/tomcat-7.0.54-cat framework/catalina/lib/tomcat-7.0.54-jasper.jar framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar -framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar +framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar +framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar framework/entity/lib/commons-dbcp-1.4.jar framework/entity/lib/jdbc/derby-10.10.1.1.jar framework/entity/lib/jdbc/derbytools-10.8.2.2.jar Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Mon Jul 14 10:21:59 2014 @@ -868,7 +868,12 @@ under the License. <if-not-empty field="itemAdjustment"> <iterate list="itemAdjustment" entry="orderAdjustment"> <set field="createInvoiceItemContext.invoiceId" from-field="invoice.invoiceId"/> - <set field="createInvoiceItemContext.invoiceItemTypeId" value="ITM_SALES_TAX"/> + <if-compare field="invoice.invoiceTypeId" value="PURCHASE_INVOICE" operator="equals"> + <set field="createInvoiceItemContext.invoiceItemTypeId" value="PITM_SALES_TAX"/> + <else> + <set field="createInvoiceItemContext.invoiceItemTypeId" value="ITM_SALES_TAX"/> + </else> + </if-compare> <set field="createInvoiceItemContext.overrideGlAccountId" from-field="orderAdjustment.overrideGlAccountId"/> <set field="createInvoiceItemContext.productId" from-field="itemMap.productList[countItemId]"/> <set field="createInvoiceItemContext.taxAuthPartyId" from-field="orderAdjustment.taxAuthPartyId"/> @@ -886,7 +891,12 @@ under the License. <iterate list="orderAdjustments" entry="Adjustment"> <if-not-empty field="Adjustment"> <set field="InvoiceItemContext.invoiceId" from-field="invoice.invoiceId"/> - <set field="InvoiceItemContext.invoiceItemTypeId" value="ITM_SALES_TAX"/> + <if-compare field="invoice.invoiceTypeId" value="PURCHASE_INVOICE" operator="equals"> + <set field="InvoiceItemContext.invoiceItemTypeId" value="PITM_SALES_TAX"/> + <else> + <set field="InvoiceItemContext.invoiceItemTypeId" value="ITM_SALES_TAX"/> + </else> + </if-compare> <set field="InvoiceItemContext.overrideGlAccountId" from-field="Adjustment.overrideGlAccountId"/> <set field="InvoiceItemContext.taxAuthPartyId" from-field="Adjustment.taxAuthPartyId"/> <set field="InvoiceItemContext.taxAuthGeoId" from-field="Adjustment.taxAuthGeoId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl Mon Jul 14 10:21:59 2014 @@ -78,7 +78,7 @@ function getInvoiceRunningTotal() { function setServiceName(selection) { if ( selection.value == 'massInvoicesToApprove' || selection.value == 'massInvoicesToReceive' || selection.value == 'massInvoicesToReady' || selection.value == 'massInvoicesToPaid' || selection.value == 'massInvoicesToWriteoff' || selection.value == 'massInvoicesToCancel') { - document.listPurchaseInvoices.action = jQuery('#invoiceStatusChange').value; + document.listPurchaseInvoices.action = 'massChangeInvoiceStatus'; } else { document.listPurchaseInvoices.action = selection.value; } @@ -175,7 +175,6 @@ function runAction() { <#-- Header Begins --> <tr class="header-row-2"> <td>${uiLabelMap.FormFieldTitle_invoiceId}</td> - <td>${uiLabelMap.FormFieldTitle_invoiceTypeId}</td> <td>${uiLabelMap.AccountingInvoiceDate}</td> <td>${uiLabelMap.AccountingDueDate}</td> <td>${uiLabelMap.CommonStatus}</td> @@ -196,7 +195,6 @@ function runAction() { <#assign statusItem = invoice.getRelatedOne("StatusItem", true)> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><a class="buttontext" href="<@ofbizUrl>invoiceOverview?invoiceId=${invoice.invoiceId}</@ofbizUrl>">${invoice.get("invoiceId")}</a></td> - <td>${invoice.invoiceTypeDesc?default(invoice.invoiceTypeId)}</td> <td><#if invoice.get("invoiceDate")?has_content>${invoice.get("invoiceDate")?date}</td></#if> <td><#if invoice.get("dueDate")?has_content>${invoice.get("dueDate")?date}</td></#if> <td>${statusItem.description?default(invoice.statusId)}</td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlForms.xml Mon Jul 14 10:21:59 2014 @@ -272,16 +272,16 @@ under the License. <condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/> <condition-expr field-name="transactionDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/> </condition-list> - <order-by field-name="glAccountId"/> + <order-by field-name="accountCode"/> <order-by field-name="-transactionDate"/> </entity-condition> </actions> <row-actions> <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("glAccountId");return new Boolean(!(prev!=null&&prev.equals(glAccountId)));}" type="Boolean"/> </row-actions> - <field name="glAccountId" position="1" use-when="showPosition1"><display/></field> + <field name="accountCode" position="1" use-when="showPosition1"><display/></field> <field name="glAccountDescription" title="${uiLabelMap.CommonDescription}" position="1" use-when="showPosition1"> - <display description="${accountCode} ${accountName}"/> + <display description="${accountName}"/> </field> <field name="glAccountClassId" position="1" use-when="showPosition1"> <display-entity entity-name="GlAccountClass"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentSecurityGroupDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentSecurityGroupDemoData.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentSecurityGroupDemoData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/ContentSecurityGroupDemoData.xml Mon Jul 14 10:21:59 2014 @@ -33,6 +33,8 @@ under the License. <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_ROLE_CREATE"/> <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_ROLE_UPDATE"/> <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_ROLE_DELETE"/> + <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_VIEW"/> + <SecurityGroupPermission groupId="CONTENT_USER" permissionId="OFBTOOLS_VIEW"/> <!-- Control Applet security --> <SecurityGroupPermission groupId="FULLADMIN" permissionId="SEND_CONTROL_APPLET"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml Mon Jul 14 10:21:59 2014 @@ -56,7 +56,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="cms" location="component://content/widget/cms/CMSMenus.xml"/> @@ -66,7 +66,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <decorator-section-include name="body"/> @@ -91,7 +91,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="content" location="component://content/widget/content/ContentMenus.xml"/> @@ -101,7 +101,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <container> @@ -142,7 +142,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="contentTopMenu" location="component://content/widget/content/ContentMenus.xml"/> @@ -152,7 +152,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <container style="no-clear"> @@ -181,7 +181,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="dataresourceTopMenu" location="component://content/widget/content/DataResourceMenus.xml"/> @@ -191,7 +191,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <section> @@ -246,7 +246,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="contentsetup" location="component://content/widget/contentsetup/ContentSetupMenus.xml"/> @@ -256,7 +256,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <decorator-section-include name="body"/> @@ -281,7 +281,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="dataresourcesetup" location="component://content/widget/datasetup/DataResourceSetupMenus.xml"/> @@ -291,7 +291,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <decorator-section-include name="body"/> @@ -361,7 +361,7 @@ under the License. <decorator-section name="pre-body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <include-menu name="layout" location="component://content/widget/layout/LayoutMenus.xml"/> @@ -371,7 +371,7 @@ under the License. <decorator-section name="body"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <widgets> <decorator-section-include name="body"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocScreens.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocScreens.xml Mon Jul 14 10:21:59 2014 @@ -21,7 +21,7 @@ under the License. <screen name="ListContentApproval"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="rootContentId" from-field="parameters.rootContentId" default-value="${parameters.contentId}"/> @@ -85,7 +85,7 @@ under the License. <screen name="ListWaitingContentApproval"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId"/> @@ -119,7 +119,7 @@ under the License. <screen name="EditContentApproval"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="menuName" value="tree"/> @@ -150,7 +150,7 @@ under the License. <screen name="ListContentRevisions"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -186,7 +186,7 @@ under the License. <screen name="EditContentRevision"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId"/> @@ -215,7 +215,7 @@ under the License. <screen name="ListContentRevisionItem"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -247,7 +247,7 @@ under the License. <screen name="EditContentRevisionItem"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -319,7 +319,7 @@ under the License. <screen name="ListCompDoc"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="menuName" value="empty"/> @@ -360,7 +360,7 @@ under the License. <screen name="ViewInstances"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -471,7 +471,7 @@ under the License. <screen name="EditChildCompDoc"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set field="menuName" value="subtree"/> @@ -848,7 +848,7 @@ under the License. <screen name="AddRootCompDocInstance"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -881,7 +881,7 @@ under the License. <screen name="AddRootCompDocTemplate"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set field="menuName" value="tree"/> @@ -901,7 +901,7 @@ under the License. <screen name="AddChildCompDocInstance"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set field="menuName" value="tree"/> @@ -937,7 +937,7 @@ under the License. <screen name="AddChildCompDocTemplate"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set field="menuName" value="tree"/> @@ -964,7 +964,7 @@ under the License. <screen name="ViewCompDocTemplateTree"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> <set from-field="parameters.rootContentId" field="rootContentId"/> @@ -1002,7 +1002,7 @@ under the License. <screen name="ViewCompDocInstanceTree"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="CREATE"/> + <if-has-permission permission="CONTENTMGR" action="_CREATE"/> </condition> <actions> @@ -1212,7 +1212,7 @@ under the License. <screen name="ListContentRevisionItemApproval"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="menuName" value="empty"/> @@ -1243,7 +1243,7 @@ under the License. <screen name="EditCompDocContentRole"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <set field="menuName" value="tree"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/content/DataResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/content/DataResourceScreens.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/content/DataResourceScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/content/DataResourceScreens.xml Mon Jul 14 10:21:59 2014 @@ -51,7 +51,7 @@ under the License. <screen name="findDataResourceSearchResults"> <section> <condition> - <if-has-permission permission="CONTENTMGR" action="UPDATE"/> + <if-has-permission permission="CONTENTMGR" action="_UPDATE"/> </condition> <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/servicedef/services.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/servicedef/services.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/servicedef/services.xml Mon Jul 14 10:21:59 2014 @@ -642,6 +642,7 @@ under the License. <permission-service service-name="humanResManagerPermission" main-action="DELETE"/> <auto-attributes mode="IN" include="pk" optional="false"/> <attribute name="rateAmountFromDate" type="Timestamp" mode="IN" optional="true"/><!-- to be able to expire rateamount specific to a party records....--> + <attribute name="periodTypeId" type="String" mode="IN" optional="true"/> </service> <service name="createAgreementEmploymentAppl" engine="simple" default-entity-name="AgreementEmploymentAppl" Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/webapp/humanres/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/webapp/humanres/WEB-INF/controller.xml Mon Jul 14 10:21:59 2014 @@ -717,7 +717,7 @@ under the License. <request-map uri="deleteEmplPositionType"> <security https="true" auth="true"/> <event type="service" invoke="deleteEmplPositionType"/> - <response name="success" type="view" value="FindEmplPositionTypes"/> + <response name="success" type="request-redirect-noparam" value="FindEmplPositionTypes"/> </request-map> <request-map uri="EditEmplPositionTypeRates"> <security https="true" auth="true"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml Mon Jul 14 10:21:59 2014 @@ -1617,13 +1617,14 @@ <value xml:lang="zh">交ä»æ¥æ</value> <value xml:lang="zh_TW">交ä»æ¥æ</value> </property> - <property key="ManufacturingDependentWorkEfforts"> + <property key="ManufacturingSucceedingProductionRun"> <value xml:lang="de">Abhängige Produktionsaufträge</value> - <value xml:lang="en">Dependent Production Runs</value> + <value xml:lang="en">Succeeding Production Run(s)</value> <value xml:lang="es">Esfuerzos de trabajo dependientes</value> <value xml:lang="fr">Exécution de production dépendantes</value> - <value xml:lang="it">Ordini di produzione dipendenti</value> + <value xml:lang="it">Ordini di produzione successivi</value> <value xml:lang="ja">ä¾åããçç£å®è¡</value> + <value xml:lang="nl">Opvolgende productierun(s)</value> <value xml:lang="pt_BR">Execuções de produção dependentes</value> <value xml:lang="ro">Comenzi lansate in Productie?</value> <value xml:lang="th">à¸à¸¶à¹à¸à¸à¸¢à¸¹à¹à¸à¸±à¸à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -2660,13 +2661,14 @@ <value xml:lang="zh">ç产管çåºç¨</value> <value xml:lang="zh_TW">çç¢ç®¡çæç¨</value> </property> - <property key="ManufacturingMandatoryWorkEfforts"> + <property key="ManufacturingPrecedingProductionRun"> <value xml:lang="de">Erforderliche Produktionsaufträge</value> - <value xml:lang="en">Mandatory Production Runs</value> + <value xml:lang="en">Preceding Production Run(s)</value> <value xml:lang="es">Ãrdenes de producción obligatorias</value> <value xml:lang="fr">Cadences de production obligatoires</value> - <value xml:lang="it">Cicli Produzione Obbligatori</value> + <value xml:lang="it">Cicli Produzione Precedenti</value> <value xml:lang="ja">çç£å¼·å¶å®è¡</value> + <value xml:lang="nl">Voorafgaande productierun(s)</value> <value xml:lang="pt_BR">Execuções de produção obrigatórias</value> <value xml:lang="ro">Cicluri de Productie Obligatorii</value> <value xml:lang="th">à¸à¸³à¸ªà¸±à¹à¸à¹à¸à¸à¸²à¸£à¸à¸¥à¸´à¸</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Mon Jul 14 10:21:59 2014 @@ -116,7 +116,7 @@ under the License. <not><if-empty field="mandatoryWorkEfforts"/></not> </condition> <widgets> - <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> + <screenlet title="${uiLabelMap.ManufacturingPrecedingProductionRun}"> <include-form name="mandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> @@ -126,7 +126,7 @@ under the License. <not><if-empty field="dependentWorkEfforts"/></not> </condition> <widgets> - <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> + <screenlet title="${uiLabelMap.ManufacturingSucceedingProductionRun}"> <include-form name="dependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Mon Jul 14 10:21:59 2014 @@ -252,20 +252,18 @@ under the License. --> <select name="shipmentMethod"> <#if shipGroup.shipmentMethodTypeId?has_content> - <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option> - <#else> - <option value=""/> + <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option> </#if> <#list productStoreShipmentMethList as productStoreShipmentMethod> - <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId> - <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content> - <option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option> - </#if> + <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId> + <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content> + <option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option> + </#if> </#list> </select> <#else> <#if (shipGroup.carrierPartyId)?default("_NA_") != "_NA_"> - ${shipGroup.carrierPartyId?if_exists} + ${shipGroup.carrierPartyId?if_exists} </#if> <#if shipmentMethodType?has_content> ${shipmentMethodType.get("description",locale)?default("")} @@ -368,7 +366,6 @@ under the License. </script> <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if shipGroup.supplierPartyId?has_content> - <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId), false)?if_exists /> <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> @@ -376,7 +373,7 @@ under the License. </td> <td width="5"> </td> <td valign="top" width="80%"> - <#if supplier?has_content> - ${supplier.description?default(shipGroup.supplierPartyId)}</#if> + ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, shipGroup.supplierPartyId, false)!shipGroup.supplierPartyId} </td> </tr> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/CustRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/CustRequestForms.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/CustRequestForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/CustRequestForms.xml Mon Jul 14 10:21:59 2014 @@ -277,7 +277,7 @@ under the License. <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> </field> - <field name="description" parameter-name="story" use-when="custRequest==null" encode-output="false"><textarea cols="60" rows="12" default-value="${communicationEvent.content}"/></field> + <field name="story" use-when="custRequest==null" encode-output="false"><textarea cols="60" rows="12" default-value="${communicationEvent.content}"/></field> <field name="maximumAmountUomId"> <drop-down allow-empty="true" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}"> <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Mon Jul 14 10:21:59 2014 @@ -225,6 +225,7 @@ under the License. <iterate entry="productFacilityLocationQuantityTest" list="productFacilityLocationQuantityTestList"> <!-- TODO: this comparison could be done by the database and be more efficient, but since we don't have field to field comparisons in the entity engine or EntityCondition operations in simple-methods, some work needs to be done before that can happen --> + <set field="minimumStock" from-field="productFacilityLocationQuantityTest.minimumStock" default-value="0" type="BigDecimal"/> <if> <condition> <and> @@ -233,12 +234,11 @@ under the License. <or> <and> <if-empty field="productFacilityLocationQuantityTest.availableToPromiseTotal"/> - <not><if-empty field="productFacilityLocationQuantityTest.minimumStock"/></not> - <if-compare field="productFacilityLocationQuantityTest.minimumStock" operator="greater" value="0" type="BigDecimal"></if-compare> + <if-compare field="minimumStock" operator="greater" value="0" type="BigDecimal"></if-compare> </and> <and> <not><if-empty field="productFacilityLocationQuantityTest.availableToPromiseTotal"/></not> - <if-compare-field field="productFacilityLocationQuantityTest.availableToPromiseTotal" to-field="productFacilityLocationQuantityTest.minimumStock" operator="less" type="BigDecimal"/> + <if-compare-field field="productFacilityLocationQuantityTest.availableToPromiseTotal" to-field="minimumStock" operator="less" type="BigDecimal"/> </and> </or> </and> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Mon Jul 14 10:21:59 2014 @@ -1322,6 +1322,7 @@ under the License. <!-- should never be empty - referential integrity enforced --> <set field="eventDate" from-field="parameters.eventDate"/> + <set field="setPackedOnly" from-field="parameters.setPackedOnly"/> <call-simple-method method-name="createShipmentForFacilityAndShipGroup"/> </iterate> @@ -1549,12 +1550,12 @@ under the License. <set from-field="eventDate" field="packedContext.eventDate"/> <set value="SHIPMENT_PACKED" field="packedContext.statusId"/> <call-service service-name="updateShipment" in-map-name="packedContext"/> - <!-- update the shipment status to shipped --> - <if-not-empty field="setPackedOnly"> + <!-- update the shipment status to shipped (if setPackedOnly has NOT been set) --> + <if-empty field="setPackedOnly"> <set from-field="shipment.shipmentId" field="packedContext.shipmentId"/> <set value="SHIPMENT_SHIPPED" field="packedContext.statusId"/> <call-service service-name="updateShipment" in-map-name="packedContext"/> - </if-not-empty> + </if-empty> </then> <else> <!-- PURCHASE_ORDER --> <!-- update the shipment status to shipped --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Mon Jul 14 10:21:59 2014 @@ -934,7 +934,7 @@ public class PackingSession implements j Debug.logError(e, module); } - if (! UtilValidate.isEmpty(serviceResult.get("shippingEstimateAmount"))) { + if (!UtilValidate.isEmpty(serviceResult)) { shipmentCostEstimate = (BigDecimal) serviceResult.get("shippingEstimateAmount"); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy Mon Jul 14 10:21:59 2014 @@ -140,27 +140,29 @@ if (orderId) { if ("ORDER_APPROVED".equals(orderHeader.statusId)) { if (shipGroupSeqId) { - if (!shipment) { - - // Generate the shipment cost estimate for the ship group - productStoreId = orh.getProductStoreId(); - shippableItemInfo = orh.getOrderItemAndShipGroupAssoc(shipGroupSeqId); - shippableItems = delegator.findList("OrderItemAndShipGrpInvResAndItemSum", EntityCondition.makeCondition([orderId : orderId, shipGroupSeqId : shipGroupSeqId]), null, null, null, false); - shippableTotal = new Double(orh.getShippableTotal(shipGroupSeqId).doubleValue()); - shippableWeight = new Double(orh.getShippableWeight(shipGroupSeqId).doubleValue()); - shippableQuantity = new Double(orh.getShippableQuantity(shipGroupSeqId).doubleValue()); - shipmentCostEstimate = packSession.getShipmentCostEstimate(orderItemShipGroup, productStoreId, shippableItemInfo, shippableTotal, shippableWeight, shippableQuantity); - context.shipmentCostEstimateForShipGroup = shipmentCostEstimate; - context.productStoreId = productStoreId; - - if (!picklistBinId) { - packSession.addItemInfo(shippableItems); - //context.put("itemInfos", shippableItemInfo); + if (!shipment) { + + // Generate the shipment cost estimate for the ship group + productStoreId = orh.getProductStoreId(); + shippableItemInfo = orh.getOrderItemAndShipGroupAssoc(shipGroupSeqId); + shippableItems = delegator.findList("OrderItemAndShipGrpInvResAndItemSum", EntityCondition.makeCondition([orderId : orderId, shipGroupSeqId : shipGroupSeqId]), null, null, null, false); + shippableTotal = new Double(orh.getShippableTotal(shipGroupSeqId).doubleValue()); + shippableWeight = new Double(orh.getShippableWeight(shipGroupSeqId).doubleValue()); + shippableQuantity = new Double(orh.getShippableQuantity(shipGroupSeqId).doubleValue()); + if (orderItemShipGroup.contactMechId && orderItemShipGroup.shipmentMethodTypeId && orderItemShipGroup.carrierPartyId && orderItemShipGroup.carrierRoleTypeId) { + shipmentCostEstimate = packSession.getShipmentCostEstimate(orderItemShipGroup, productStoreId, shippableItemInfo, shippableTotal, shippableWeight, shippableQuantity); + context.shipmentCostEstimateForShipGroup = shipmentCostEstimate; + } + context.productStoreId = productStoreId; + + if (!picklistBinId) { + packSession.addItemInfo(shippableItems); + //context.put("itemInfos", shippableItemInfo); + } + } else { + request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("OrderErrorUiLabels", "OrderErrorOrderHasBeenAlreadyVerified", [orderId : orderId], locale)); } } else { - request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage("OrderErrorUiLabels", "OrderErrorOrderHasBeenAlreadyVerified", [orderId : orderId], locale)); - } - } else { request.setAttribute("errorMessageList", ['No ship group sequence ID. Cannot process.']); } } else { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl Mon Jul 14 10:21:59 2014 @@ -150,29 +150,33 @@ under the License. </div> <div class="screenlet-body"> <#if orderItemShipGroup?has_content> - <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress", false)> + <#if (orderItemShipGroup.contacMechId)?has_content> + <#assign postalAddress = orderItemShipGroup.getRelatedOne("PostalAddress", false)> + </#if> <#assign carrier = orderItemShipGroup.carrierPartyId?default("N/A")> <table cellpadding="4" cellspacing="4" class="basic-table"> <tr> <td valign="top"> - <span class="label">${uiLabelMap.ProductShipToAddress}</span> - <br /> - ${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")} - <br /> - <#if postalAddress.attnName?has_content> - ${uiLabelMap.CommonAttn}: ${postalAddress.attnName} - <br /> - </#if> - ${postalAddress.address1} - <br /> - <#if postalAddress.address2?has_content> - ${postalAddress.address2} - <br /> + <#if postalAddress?exists > + <span class="label">${uiLabelMap.ProductShipToAddress}</span> + <br /> + ${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")} + <br /> + <#if postalAddress.attnName?has_content> + ${uiLabelMap.CommonAttn}: ${postalAddress.attnName} + <br /> + </#if> + ${postalAddress.address1} + <br /> + <#if postalAddress.address2?has_content> + ${postalAddress.address2} + <br /> + </#if> + ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} + <br /> + ${postalAddress.countryGeoId!} + <br /> </#if> - ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} - <br /> - ${postalAddress.countryGeoId} - <br /> </td> <td> </td> <td valign="top"> @@ -189,7 +193,8 @@ under the License. <font color="${color}">${carrier}</font> </#if> - ${orderItemShipGroup.shipmentMethodTypeId?default("??")} + <#assign description = (delegator.findOne("ShipmentMethodType", {"shipmentMethodTypeId":orderItemShipGroup.shipmentMethodTypeId}, false)).description> + ${description!"??"} <br /> <span class="label">${uiLabelMap.ProductEstimatedShipCostForShipGroup}</span> <br /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java Mon Jul 14 10:21:59 2014 @@ -921,7 +921,6 @@ public class LoginServices { passwordChangeHistoryLimit = 0; } Debug.logInfo(" password.change.history.limit is set to " + passwordChangeHistoryLimit, module); - Debug.logInfo(" userLogin is set to " + userLogin, module); if (passwordChangeHistoryLimit > 0 && userLogin != null) { Debug.logInfo(" checkNewPassword Checking if user is tyring to use old password " + passwordChangeHistoryLimit, module); Delegator delegator = userLogin.getDelegator(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/messages.ftl Mon Jul 14 10:21:59 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - +<#escape x as x?html> <#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if> <#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if> <#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if> @@ -63,3 +63,4 @@ under the License. </#if> </div> </#if> +</#escape> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java Mon Jul 14 10:21:59 2014 @@ -89,6 +89,9 @@ public class GenericDispatcherFactory im // clone the model service for updates ModelService cloned = new ModelService(service); cloned.requireNewTransaction = requireNewTransaction; + if (requireNewTransaction) { + cloned.useTransaction = true; + } if (transactionTimeout != -1) { cloned.transactionTimeout = transactionTimeout; } @@ -112,6 +115,9 @@ public class GenericDispatcherFactory im // clone the model service for updates ModelService cloned = new ModelService(service); cloned.requireNewTransaction = requireNewTransaction; + if (requireNewTransaction) { + cloned.useTransaction = true; + } if (transactionTimeout != -1) { cloned.transactionTimeout = transactionTimeout; } @@ -129,6 +135,9 @@ public class GenericDispatcherFactory im // clone the model service for updates ModelService cloned = new ModelService(service); cloned.requireNewTransaction = requireNewTransaction; + if (requireNewTransaction) { + cloned.useTransaction = true; + } if (transactionTimeout != -1) { cloned.transactionTimeout = transactionTimeout; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java Mon Jul 14 10:21:59 2014 @@ -225,8 +225,12 @@ public class ModelService extends Abstra this.auth = model.auth; this.export = model.export; this.validate = model.validate; - this.useTransaction = model.useTransaction || true; + this.useTransaction = model.useTransaction; this.requireNewTransaction = model.requireNewTransaction; + if (this.requireNewTransaction && !this.useTransaction) { + // requireNewTransaction implies that a transaction is used + this.useTransaction = true; + } this.transactionTimeout = model.transactionTimeout; this.maxRetry = model.maxRetry; this.permissionServiceName = model.permissionServiceName; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelServiceReader.java Mon Jul 14 10:21:59 2014 @@ -213,6 +213,11 @@ public class ModelServiceReader implemen service.validate = !"false".equalsIgnoreCase(serviceElement.getAttribute("validate")); service.useTransaction = !"false".equalsIgnoreCase(serviceElement.getAttribute("use-transaction")); service.requireNewTransaction = !"false".equalsIgnoreCase(serviceElement.getAttribute("require-new-transaction")); + if (service.requireNewTransaction && !service.useTransaction) { + // requireNewTransaction implies that a transaction is used + service.useTransaction = true; + Debug.logWarning("In service definition [" + service.name + "] the value use-transaction has been changed from false to true as required when require-new-transaction is set to true", module); + } service.hideResultInLog = !"false".equalsIgnoreCase(serviceElement.getAttribute("hideResultInLog")); // set the semaphore sleep/wait times Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/servicedef/services.xml?rev=1610377&r1=1610376&r2=1610377&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/servicedef/services.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/servicedef/services.xml Mon Jul 14 10:21:59 2014 @@ -26,7 +26,7 @@ under the License. <!-- Entity Import Services Transacitons are turned off for these services because they set transactions and timeouts inside the services with txTimeout parameter --> - <service name="parseEntityXmlFile" engine="java" require-new-transaction="true" + <service name="parseEntityXmlFile" engine="java" location="org.ofbiz.webtools.WebToolsServices" invoke="parseEntityXmlFile" auth="true" use-transaction="false"> <description>Parses an entity xml file or an entity xml text</description> <permission-service service-name="entityMaintPermCheck" main-action="VIEW"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |