svn commit: r926987 [7/26] - in /ofbiz/branches/multitenant201
Locked
svn commit: r926987 [7/26] - in /ofbiz/branches/multitenant201
 
|
Modified: ofbiz/branches/multitenant20100310/applications/order/data/OrderTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/data/OrderTypeData.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/data/OrderTypeData.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/data/OrderTypeData.xml Wed Mar 24 09:23:07 2010 @@ -214,19 +214,30 @@ under the License. <!-- CustRequest statuses --> <StatusType description="Custom Request Status" hasTable="N" parentTypeId="" statusTypeId="CUSTREQ_STTS"/> + <StatusItem description="Draft" sequenceId="00" statusCode="DRAFT" statusId="CRQ_DRAFT" statusTypeId="CUSTREQ_STTS"/> <StatusItem description="Submitted" sequenceId="01" statusCode="SUBMITTED" statusId="CRQ_SUBMITTED" statusTypeId="CUSTREQ_STTS"/> <StatusItem description="Accepted" sequenceId="02" statusCode="ACCEPTED" statusId="CRQ_ACCEPTED" statusTypeId="CUSTREQ_STTS"/> <StatusItem description="Reviewed" sequenceId="03" statusCode="REVIEWED" statusId="CRQ_REVIEWED" statusTypeId="CUSTREQ_STTS"/> + <StatusItem description="Pending Cust." sequenceId="09" statusCode="PENDING" statusId="CRQ_PENDING" statusTypeId="CUSTREQ_STTS"/> <StatusItem description="Completed" sequenceId="04" statusCode="COMPLETED" statusId="CRQ_COMPLETED" statusTypeId="CUSTREQ_STTS"/> <StatusItem description="Rejected" sequenceId="98" statusCode="REJECTED" statusId="CRQ_REJECTED" statusTypeId="CUSTREQ_STTS"/> <StatusItem description="Cancelled" sequenceId="99" statusCode="CANCELLED" statusId="CRQ_CANCELLED" statusTypeId="CUSTREQ_STTS"/> + <StatusValidChange condition="" statusId="CRQ_DRAFT" statusIdTo="CRQ_ACCEPTED" transitionName="Accept Request"/> + <StatusValidChange condition="" statusId="CRQ_DRAFT" statusIdTo="CRQ_SUBMITTED" transitionName="Submit Request"/> + <StatusValidChange condition="" statusId="CRQ_DRAFT" statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/> <StatusValidChange condition="" statusId="CRQ_SUBMITTED" statusIdTo="CRQ_ACCEPTED" transitionName="Accept Request"/> + <StatusValidChange condition="" statusId="CRQ_SUBMITTED" statusIdTo="CRQ_COMPLETED" transitionName="Complete Request"/> <StatusValidChange condition="" statusId="CRQ_SUBMITTED" statusIdTo="CRQ_REJECTED" transitionName="Reject Request"/> <StatusValidChange condition="" statusId="CRQ_SUBMITTED" statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/> + <StatusValidChange condition="" statusId="CRQ_SUBMITTED" statusIdTo="CRQ_PENDING" transitionName="Pending customer"/> + <StatusValidChange condition="" statusId="CRQ_PENDING" statusIdTo="CRQ_SUBMITTED" transitionName="Submit Request"/> + <StatusValidChange condition="" statusId="CRQ_PENDING" statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/> <StatusValidChange condition="" statusId="CRQ_ACCEPTED" statusIdTo="CRQ_REVIEWED" transitionName="Review Request"/> <StatusValidChange condition="" statusId="CRQ_ACCEPTED" statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/> + <StatusValidChange condition="" statusId="CRQ_ACCEPTED" statusIdTo="CRQ_PENDING" transitionName="Pending Customer"/> <StatusValidChange condition="" statusId="CRQ_REVIEWED" statusIdTo="CRQ_COMPLETED" transitionName="Complete Request"/> <StatusValidChange condition="" statusId="CRQ_REVIEWED" statusIdTo="CRQ_CANCELLED" transitionName="Cancel Request"/> + <StatusValidChange condition="" statusId="CRQ_REVIEWED" statusIdTo="CRQ_PENDING" transitionName="Pending Customer"/> <!-- Requirement statuses --> <StatusType description="Requirement Status" hasTable="N" parentTypeId="" statusTypeId="REQUIREMENT_STATUS"/> Modified: ofbiz/branches/multitenant20100310/applications/order/data/SalesOrderDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/data/SalesOrderDemoData.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/data/SalesOrderDemoData.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/data/SalesOrderDemoData.xml Wed Mar 24 09:23:07 2010 @@ -1761,7 +1761,7 @@ under the License. <ProductPromo productPromoId="DEMO_PROMO004" promoName="Demo Promotion 4" promoText="With special code [9021] get products in the Featured Products category for their special promotion price." userEntered="Y" showToCustomer="Y" requireCode="Y" createdDate="2001-05-13 12:00:00.0"/> <ProductPromo productPromoId="DEMO_PROMO005" promoName="Demo Promotion 5" promoText="With special code [9021] get products in the Featured Products category for their special promotion price." userEntered="Y" showToCustomer="Y" requireCode="Y" createdDate="2001-05-13 12:00:00.0"/> - <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE001" productPromoId="DEMO_PROMO001" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/> + <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE001" productPromoId="DEMO_PROMO001" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/> <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE002" productPromoId="DEMO_PROMO002" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/> <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE003" productPromoId="DEMO_PROMO003" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/> <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE004" productPromoId="DEMO_PROMO003" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/> @@ -1771,16 +1771,16 @@ under the License. <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE008" productPromoId="DEMO_PROMO004" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/> <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE009" productPromoId="DEMO_PROMO004" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/> <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE010" productPromoId="DEMO_PROMO005" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/> - - <OrderProductPromoCode orderId="DEMO_B2C_AU01" productPromoCodeId="DEMO_PROMOCODE001"/> - <OrderProductPromoCode orderId="DEMO_B2C_CA01" productPromoCodeId="DEMO_PROMOCODE002"/> - <OrderProductPromoCode orderId="DEMO_B2C_IE01" productPromoCodeId="DEMO_PROMOCODE003"/> - <OrderProductPromoCode orderId="DEMO_B2C_SG01" productPromoCodeId="DEMO_PROMOCODE004"/> - <OrderProductPromoCode orderId="DEMO_B2C_UK01" productPromoCodeId="DEMO_PROMOCODE005"/> - <OrderProductPromoCode orderId="DEMO_B2C_US01" productPromoCodeId="DEMO_PROMOCODE006"/> - <OrderProductPromoCode orderId="DEMO_B2C_DE01" productPromoCodeId="DEMO_PROMOCODE007"/> - <OrderProductPromoCode orderId="DEMO_B2C_ES01" productPromoCodeId="DEMO_PROMOCODE008"/> - <OrderProductPromoCode orderId="DEMO_B2C_FR01" productPromoCodeId="DEMO_PROMOCODE009"/> - <OrderProductPromoCode orderId="DEMO_B2C_IT01" productPromoCodeId="DEMO_PROMOCODE010"/> - + + <OrderProductPromoCode orderId="DEMO_B2C_AU01" productPromoCodeId="DEMO_PROMOCODE001"/> + <OrderProductPromoCode orderId="DEMO_B2C_CA01" productPromoCodeId="DEMO_PROMOCODE002"/> + <OrderProductPromoCode orderId="DEMO_B2C_IE01" productPromoCodeId="DEMO_PROMOCODE003"/> + <OrderProductPromoCode orderId="DEMO_B2C_SG01" productPromoCodeId="DEMO_PROMOCODE004"/> + <OrderProductPromoCode orderId="DEMO_B2C_UK01" productPromoCodeId="DEMO_PROMOCODE005"/> + <OrderProductPromoCode orderId="DEMO_B2C_US01" productPromoCodeId="DEMO_PROMOCODE006"/> + <OrderProductPromoCode orderId="DEMO_B2C_DE01" productPromoCodeId="DEMO_PROMOCODE007"/> + <OrderProductPromoCode orderId="DEMO_B2C_ES01" productPromoCodeId="DEMO_PROMOCODE008"/> + <OrderProductPromoCode orderId="DEMO_B2C_FR01" productPromoCodeId="DEMO_PROMOCODE009"/> + <OrderProductPromoCode orderId="DEMO_B2C_IT01" productPromoCodeId="DEMO_PROMOCODE010"/> + </entity-engine-xml> Modified: ofbiz/branches/multitenant20100310/applications/order/data/helpdata/HELP_ORDER_Report.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/data/helpdata/HELP_ORDER_Report.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/data/helpdata/HELP_ORDER_Report.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/data/helpdata/HELP_ORDER_Report.xml Wed Mar 24 09:23:07 2010 @@ -19,81 +19,81 @@ xmlns="http://docbook.org/ns/docbook"> <title>Order Reports Help.</title> <para> - The Order Reports provide general information about orders in the system. + The Order Reports provide general information about orders in the system. </para> <section> - <title> - Initial steps. - </title> - <section> + <title> + Initial steps. + </title> + <section> <para> If your reports look empty it may be required to initialize the warehouse entities in the BI component. </para> - <orderedlist> - <listitem> - <para>Go to :<link xl:href="https://localhost:8443/bi/control/main">Business Intelligence</link></para> - </listitem> - <listitem> - <para>Click "Quick Init DataWarehouse". System will automatic initial Data in the warehouse for Reports</para> - </listitem> - <listitem> - <para>Go back to : <link xl:href="https://localhost:8443/ordermgr/control/OrderPurchaseReportOptions">Order Reports.</link></para> - </listitem> - </orderedlist> - </section> + <orderedlist> + <listitem> + <para>Go to :<link xl:href="https://localhost:8443/bi/control/main">Business Intelligence</link></para> + </listitem> + <listitem> + <para>Click "Quick Init DataWarehouse". System will automatic initial Data in the warehouse for Reports</para> + </listitem> + <listitem> + <para>Go back to : <link xl:href="https://localhost:8443/ordermgr/control/OrderPurchaseReportOptions">Order Reports.</link></para> + </listitem> + </orderedlist> + </section> </section> <section> <title>Reports List</title> <section> - <title>1. Sales Order By Referrer Report</title> - <para> - There are referrers, link, totals orders, quantity totals and amount totals. They are grouped by referrer. - </para> - </section> - <section> - <title>2. Sales Order By Channel Report</title> - <para> - There are total Orders, total Items, quantity totals and amount totals. They are grouped by Sales Channel. - </para> - </section> - <section> - <title>3. Sale Orders Discount Code Report</title> - <para> - There are order, product, promotion and discount. This report is list of All orders. - </para> - </section> - <section> - <title>4. Last Three Months Sales Report</title> - <para> - There are products, prices, stock, sale out quantity and sale out total amount. - This report is list of all products, it contains the sales and movements in last 3 months. - </para> - </section> - <section> - <title>5. Coupon Sales Report</title> - <para> - This report lists promotions, total orders, percent of total orders, total orders amount, percent of total orders amount and shipping amounts. - </para> - </section> - <section> - <title>6. Sales Report</title> - <para> - This Sales report contains paid and unpaid sales orders. - </para> - </section> - <section> - <title>7. Net Before Overhead Report</title> - <para> - Net Before Overhead Report is the profit calculation of paid-shipped orders and all the occurred fee excluding the overhead cost. - They are grouped by Product Store Id.(Demo data for Net Before Overhead Report have in Product Store Id "B2CStore") - </para> - </section> - <section> - <title>8. Product Demand Report</title> - <para> - Product Demand Report is the report to show us which product sells good and which product doesnât sell good or not selling at all in one account as well as for all accounts in last 4 weeks. - They are grouped by Product Store Id.(Demo data for Product Demand Report have in Product Store Id "B2CStore") - </para> - </section> + <title>1. Sales Order By Referrer Report</title> + <para> + There are referrers, link, totals orders, quantity totals and amount totals. They are grouped by referrer. + </para> + </section> + <section> + <title>2. Sales Order By Channel Report</title> + <para> + There are total Orders, total Items, quantity totals and amount totals. They are grouped by Sales Channel. + </para> + </section> + <section> + <title>3. Sale Orders Discount Code Report</title> + <para> + There are order, product, promotion and discount. This report is list of All orders. + </para> + </section> + <section> + <title>4. Last Three Months Sales Report</title> + <para> + There are products, prices, stock, sale out quantity and sale out total amount. + This report is list of all products, it contains the sales and movements in last 3 months. + </para> + </section> + <section> + <title>5. Coupon Sales Report</title> + <para> + This report lists promotions, total orders, percent of total orders, total orders amount, percent of total orders amount and shipping amounts. + </para> + </section> + <section> + <title>6. Sales Report</title> + <para> + This Sales report contains paid and unpaid sales orders. + </para> + </section> + <section> + <title>7. Net Before Overhead Report</title> + <para> + Net Before Overhead Report is the profit calculation of paid-shipped orders and all the occurred fee excluding the overhead cost. + They are grouped by Product Store Id.(Demo data for Net Before Overhead Report have in Product Store Id "B2CStore") + </para> + </section> + <section> + <title>8. Product Demand Report</title> + <para> + Product Demand Report is the report to show us which product sells good and which product doesnât sell good or not selling at all in one account as well as for all accounts in last 4 weeks. + They are grouped by Product Store Id.(Demo data for Product Demand Report have in Product Store Id "B2CStore") + </para> + </section> </section> </section> Modified: ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel.xml Wed Mar 24 09:23:07 2010 @@ -1827,6 +1827,9 @@ under the License. <field name="noteId" type="id-ne"></field> <prim-key field="custRequestId"/> <prim-key field="noteId"/> + <relation type="one" fk-name="CRQ_CR" rel-entity-name="CustRequest"> + <key-map field-name="custRequestId"/> + </relation> <relation type="one" fk-name="CRQ_NOTE" rel-entity-name="NoteData"> <key-map field-name="noteId"/> </relation> Modified: ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_olap.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_olap.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_olap.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_olap.xml Wed Mar 24 09:23:07 2010 @@ -39,7 +39,7 @@ under the License. <field name="origCurrencyDimId" type="id-ne"></field> <field name="billToCustomerDimId" type="id-ne"></field> <!-- TODO: implement the dimension --> - <field name="productStoreId" type="id-ne"></field> + <field name="productStoreId" type="id-ne"></field> <field name="salesChannelEnumId" type="id-ne"></field> <field name="saleChannel" type="description"></field> <field name="orderStatus" type="description"></field> @@ -215,8 +215,8 @@ under the License. <exclude field="salesChannelEnumId"/> <exclude field="saleChannel"/> <exclude field="orderStatus"/> - <exclude field="visitId"/> - <exclude field="initialReferrer"/> + <exclude field="visitId"/> + <exclude field="initialReferrer"/> <exclude field="productPromoCode"/> <exclude field="categoryName"/> </alias-all> Modified: ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_view.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_view.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_view.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/entitydef/entitymodel_view.xml Wed Mar 24 09:23:07 2010 @@ -1309,6 +1309,22 @@ under the License. <key-map field-name="workEffortId"/> </relation> </view-entity> + <view-entity entity-name="CustRequestAndNote" + package-name="org.ofbiz.order.request" + title="Customer Request And Note"> + <member-entity entity-alias="CRN" entity-name="CustRequestNote"/> + <member-entity entity-alias="ND" entity-name="NoteData"/> + <alias-all entity-alias="CRN"> + <exclude field="noteId"/> + </alias-all> + <alias-all entity-alias="ND"/> + <view-link entity-alias="CRN" rel-entity-alias="ND"> + <key-map field-name="noteId"/> + </view-link> + <relation type="one-nofk" rel-entity-name="CustRequest"> + <key-map field-name="custRequestId"/> + </relation> + </view-entity> <view-entity entity-name="CustRequestInfoAndWorkEffortAndPartyRel" package-name="org.ofbiz.order.request" title="Customer Request And WorkEffort"> Modified: ofbiz/branches/multitenant20100310/applications/order/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/ofbiz-component.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/ofbiz-component.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/ofbiz-component.xml Wed Mar 24 09:23:07 2010 @@ -52,6 +52,7 @@ under the License. <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> <test-suite loader="main" location="testdef/OrderTest.xml"/> + <test-suite loader="main" location="testdef/CustRequestTests.xml"/> <test-suite loader="main" location="testdef/quotetests.xml"/> <test-suite loader="main" location="testdef/ShoppingListTests.xml"/> Modified: ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/UpgradeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/UpgradeServices.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/UpgradeServices.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/UpgradeServices.xml Wed Mar 24 09:23:07 2010 @@ -49,7 +49,7 @@ under the License. </iterate> </simple-method> - <simple-method method-name="migrateOrderShipment" short-description="Migrate data from OldOrderItemAssociation to OrderItemAssoc"> + <simple-method method-name="migrateOrderShipment" short-description="Migrate data from ItemIssuances to OrderShipments when the records are not used to record item issuances but only an order to shipment association."> <entity-condition entity-name="ItemIssuance" list="itemIssuances"> <condition-list combine="and"> <condition-expr field-name="inventoryItemId" operator="equals" from-field="nullField"/> Modified: ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/olap/FactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/olap/FactServices.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/olap/FactServices.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/olap/FactServices.xml Wed Mar 24 09:23:07 2010 @@ -266,8 +266,8 @@ under the License. <field-map field-name="visitId" from-field="orderHeader.visitId"/> </entity-one> <if-not-empty field="visit"> - <set field="fact.visitId" from-field="visit.visitId"/> - <set field="fact.initialReferrer" from-field="visit.initialReferrer"/> + <set field="fact.visitId" from-field="visit.visitId"/> + <set field="fact.initialReferrer" from-field="visit.initialReferrer"/> </if-not-empty> </if-not-empty> Modified: ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml Wed Mar 24 09:23:07 2010 @@ -26,7 +26,7 @@ <set field="DateYear" value="2009"/> <set field="DateMonth" value="12"/> <entity-condition entity-name="SalesOrderItemStarSchema" list="countdates" distinct="true"> - <condition-list combine="and"> + <condition-list combine="and"> <condition-expr field-name="orderDateYearName" operator="equals" from-field="DateYear"/> <condition-expr field-name="orderDateMonthOfYear" operator="equals" from-field="DateMonth"/> <condition-expr field-name="productStoreId" operator="equals" from-field="productStoreId"/> @@ -45,7 +45,7 @@ <select-field field-name="NBO"/> </entity-condition> <entity-condition entity-name="SalesOrderItemStarSchema" list="saleschannels" distinct="true"> - <condition-list combine="and"> + <condition-list combine="and"> <condition-expr field-name="orderDateYearName" operator="equals" from-field="DateYear"/> <condition-expr field-name="orderDateMonthOfYear" operator="equals" from-field="DateMonth"/> <condition-expr field-name="productStoreId" operator="equals" from-field="productStoreId"/> Modified: ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Wed Mar 24 09:23:07 2010 @@ -62,9 +62,9 @@ under the License. <set field="newEntity.custRequestDate" from-field="nowTimestamp"/> </if-empty> - <!-- always start with submitted --> - <set value="CRQ_SUBMITTED" field="newEntity.statusId"/> - + <!-- always start with draft --> + <set value="CRQ_DRAFT" field="newEntity.statusId"/> + <if-not-empty field="parameters.custRequestId"> <set field="newEntity.custRequestId" from-field="parameters.custRequestId"/> <else> @@ -75,10 +75,12 @@ under the License. <create-value value-field="newEntity"/> <field-to-result field="newEntity.custRequestId" result-name="custRequestId"/> - <!-- set status fields and history --> - <set field="parameters.custRequestId" from-field="newEntity.custRequestId"/> - <set-service-fields service-name="setCustRequestStatus" map="parameters" to-map="setStat"/> - <call-service service-name="setCustRequestStatus" in-map-name="setStat"/> + <!-- set status fields and history if provided --> + <if-not-empty field="parameters.statusId"> + <set field="setStat.statusId" from-field="parameters.statusId"/> + <set field="setStat.custRequestId" from-field="newEntity.custRequestId"/> + <call-service service-name="setCustRequestStatus" in-map-name="setStat"/> + </if-not-empty> <!-- create also the item if key fields are provided --> <if> @@ -96,51 +98,77 @@ under the License. <call-service service-name="createCustRequestItem" in-map-name="createItem"/> </then> </if> + </simple-method> + <simple-method method-name="updateCustRequest" short-description="Update Customer Request"> <call-simple-method method-name="checkStatusCustRequest"/> - <field-to-result field="custRequest.statusId" result-name="oldStatusId"/> - <if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals"> - <if-compare field="parameters.statusId" value="CRQ_CANCELLED" operator="equals"> - <!-- check for related workefforts ...and when no time recorded cancel these too --> - <get-related value-field="custRequest" relation-name="CustRequestWorkEffort" list="workEfforts"/> - <if-not-empty field="workEfforts"> - <iterate entry="workEffort" list="workEfforts"> - <entity-one entity-name="WorkEffort" value-field="lowInfo"> - <field-map field-name="workEffortId" from-field="workEffort.workEffortId"/> - </entity-one> - <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> - <set field="actualHours" from-field="highInfo.actualHours"/> - <!-- no hours recorded yet so custrequest can be cancelled --> - <if-empty field="actualHours"> - <!-- changed status--> - <set field="custRequest.statusId" from-field="parameters.statusId"/> - <set field="updTask.workEffortId" from-field="workEffort.workEffortId"/> - <set field="updTask.currentStatusId" value="PTS_CANCELLED"/> - <call-service service-name="updateWorkEffort" in-map-name="updTask"/> - <else> - <set field="parameters.statusId" from-field="custRequest.statusId"/> - <property-to-field resource="OrderUiLabels" property="OrderCannotCancelRequestAlreadyWorkedOn" field="errorMessage"/> - <field-to-result field="errorMessage"/> - <set field="isShowEvent" value="N"/> - </else> - </if-empty> - </iterate> - </if-not-empty> - </if-compare> - <!-- update status and save the changed status in the history --> - <set-service-fields service-name="setCustRequestStatus" map="parameters" to-map="setStat"/> - <call-service service-name="setCustRequestStatus" in-map-name="setStat"/> - <if-not-empty field="isShowEvent"> - <clear-field field="successMessage"/> - </if-not-empty> - </if-compare-field> + <set field="oldStatusId" from-field="custRequest.statusId"/> + <field-to-result field="oldStatusId"/> <now-timestamp field="nowTimestamp"/> <set from-field="nowTimestamp" field="custRequest.lastModifiedDate"/> <set from-field="userLogin.userLoginId" field="custRequest.lastModifiedByUserLogin"/> <set-nonpk-fields map="parameters" value-field="custRequest"/> + <set field="custRequest.statusId" from-field="oldStatusId"/><!-- not update status yet --> <store-value value-field="custRequest"/> + <if-not-empty field="parameters.statusId"> + <if-compare-field field="custRequest.statusId" to-field="parameters.statusId" operator="not-equals"> + <if-compare field="parameters.statusId" value="CRQ_CANCELLED" operator="equals"> + <!-- check for related workefforts ...and when no time recorded cancel these too --> + <get-related value-field="custRequest" relation-name="CustRequestWorkEffort" list="workEfforts"/> + <if-not-empty field="workEfforts"> + <iterate entry="workEffort" list="workEfforts"> + <entity-one entity-name="WorkEffort" value-field="lowInfo"> + <field-map field-name="workEffortId" from-field="workEffort.workEffortId"/> + </entity-one> + <call-simple-method method-name="getHours" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> + <set field="actualHours" from-field="highInfo.actualHours"/> + <!-- no hours recorded yet so custrequest can be cancelled --> + <if-empty field="actualHours"> + <!-- changed status--> + <set field="custRequest.statusId" from-field="parameters.statusId"/> + <set field="updTask.workEffortId" from-field="workEffort.workEffortId"/> + <set field="updTask.currentStatusId" value="PTS_CANCELLED"/> + <call-service service-name="updateWorkEffort" in-map-name="updTask"/> + <else> + <set field="parameters.statusId" from-field="custRequest.statusId"/> + <property-to-field resource="OrderUiLabels" property="OrderCannotCancelRequestAlreadyWorkedOn" field="errorMessage"/> + <field-to-result field="errorMessage"/> + <set field="isShowEvent" value="N"/> + </else> + </if-empty> + </iterate> + </if-not-empty> + </if-compare> + <!-- update status and save the changed status in the history --> + <set-service-fields service-name="setCustRequestStatus" map="parameters" to-map="setStat"/> + <call-service service-name="setCustRequestStatus" in-map-name="setStat"/> + <if-not-empty field="isShowEvent"> + <clear-field field="successMessage"/> + </if-not-empty> + </if-compare-field> + </if-not-empty> + + <!-- if story is provided update the first item of the customer request --> + <if-not-empty field="parameters.story"> + <entity-and list="custRequestItems" entity-name="CustRequestItem"> + <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> + </entity-and> + <if-not-empty field="custRequestItems"> + <first-from-list entry="custRequestItem" list="custRequestItems"/> + <set-service-fields service-name="updateCustRequestItem" to-map="updateItem" map="custRequestItem"/> + <set field="updateItem.story" from-field="parameters.story"/> + <call-service service-name="updateCustRequestItem" in-map-name="updateItem"/> + <else> + <set-service-fields service-name="createCustRequestItem" to-map="createItem" map="custRequest"/> + <set field="createItem.story" from-field="parameters.story"/> + <call-service service-name="createCustRequestItem" in-map-name="createItem"/> + </else> + </if-not-empty> + </if-not-empty> + </simple-method> + <simple-method method-name="checkStatusCustRequest" short-description="Check StatusId CustRequest"> <entity-one entity-name="CustRequest" value-field="custRequest"></entity-one> <if-empty field="custRequest"> @@ -410,8 +438,23 @@ under the License. <log level="error" message="${msg}"/> </if-empty> </if-compare-field> - <check-errors/> </if-not-empty> + + <!-- if not draft status input check for from fromPartyId present and name is present --> + <if-compare operator="not-equals" value="CRQ_DRAFT" field="parameters.statusId"> + <if-empty field="custRequest.fromPartyId"> + <add-error> + <fail-property property="OrderCustRequestShouldHaveFromPartyIdIfNotDraft" resource="OrderUiLabels"/> + </add-error> + </if-empty> + <if-empty field="custRequest.custRequestName"> + <add-error> + <fail-property property="OrderCustRequestShouldHaveCustRequestNameIfNotDraft" resource="OrderUiLabels"/> + </add-error> + </if-empty> + </if-compare> + <check-errors/> + <set field="custRequest.statusId" from-field="parameters.statusId"/> <store-value value-field="custRequest"/> <call-simple-method method-name="createCustRequestStatus"/> Modified: ofbiz/branches/multitenant20100310/applications/order/servicedef/services_quote.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/servicedef/services_quote.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/servicedef/services_quote.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/servicedef/services_quote.xml Wed Mar 24 09:23:07 2010 @@ -224,6 +224,8 @@ under the License. <attribute name="sendCc" type="String" mode="IN" optional="true"/> <attribute name="note" type="String" mode="IN" optional="true"/> <attribute name="body" type="String" mode="OUT" optional="true"/> + <attribute name="subject" type="String" mode="OUT" optional="true"/> + <attribute name="messageWrapper" type="org.ofbiz.service.mail.MimeMessageWrapper" mode="OUT" optional="true"/> </service> <service name="storeQuote" engine="java" default-entity-name="Quote" validate="true" auth="true" location="org.ofbiz.order.quote.QuoteServices" invoke="storeQuote"> Modified: ofbiz/branches/multitenant20100310/applications/order/servicedef/services_request.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/servicedef/services_request.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/servicedef/services_request.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/servicedef/services_request.xml Wed Mar 24 09:23:07 2010 @@ -41,7 +41,6 @@ under the License. <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <auto-attributes include="all" mode="IN" entity-name="CustRequestItem" optional="true"/> - <attribute name="fromPartyId" type="String" mode="IN" optional="false"/> <override name="custRequestName" allow-html="safe"/> <override name="description" allow-html="safe"/> <override name="story" allow-html="safe"/> @@ -52,6 +51,9 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <attribute name="oldStatusId" type="String" mode="OUT"/> + <attribute name="story" mode="IN" type="String" optional="true" allow-html="safe"/> + <override name="custRequestName" allow-html="safe"/> + <override name="description" allow-html="safe"/> </service> <service name="createCustRequestAttribute" engine="simple" Modified: ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java (original) +++ ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java Wed Mar 24 09:23:07 2010 @@ -31,14 +31,12 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; -import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityConditionList; import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityOperator; -import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.util.EntityUtil; /** @@ -148,8 +146,7 @@ public class FinAccountHelper { // now we need to get the encrypted version of the fin account code the user passed in to look up against FinAccount // we do this by making a temporary generic entity with same finAccountCode and then doing a match - ModelEntity finAccountEntity = delegator.getModelEntity("FinAccount"); - GenericEntity encryptedFinAccount = GenericEntity.createGenericEntity(finAccountEntity, UtilMisc.toMap("finAccountCode", finAccountCode)); + GenericValue encryptedFinAccount = delegator.makeValue("FinAccount", UtilMisc.toMap("finAccountCode", finAccountCode)); delegator.encryptFields(encryptedFinAccount); String encryptedFinAccountCode = encryptedFinAccount.getString("finAccountCode"); Modified: ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/order/OrderServices.java Wed Mar 24 09:23:07 2010 @@ -2662,7 +2662,7 @@ public class OrderServices { //Locale locale = (Locale) context.get("locale"); try { - orderHeader = delegator.findByPrimaryKeyCache("OrderHeader", UtilMisc.toMap("orderId", orderId)); + orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId)); if (orderHeader != null) result.put("orderHeader", orderHeader); } catch (GenericEntityException e) { Modified: ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Wed Mar 24 09:23:07 2010 @@ -985,14 +985,14 @@ public class ProductPromoWorker { compareBase = Integer.valueOf(0); } else { // look for PartyRelationship with partyRelationshipTypeId=GROUP_ROLLUP, the partyIdTo is the group member, so the partyIdFrom is the groupPartyId - List partyRelationshipList = delegator.findByAndCache("PartyRelationship", UtilMisc.toMap("partyIdFrom", groupPartyId, "partyIdTo", partyId, "partyRelationshipTypeId", "GROUP_ROLLUP")); + List<GenericValue> partyRelationshipList = delegator.findByAndCache("PartyRelationship", UtilMisc.toMap("partyIdFrom", groupPartyId, "partyIdTo", partyId, "partyRelationshipTypeId", "GROUP_ROLLUP")); // and from/thru date within range partyRelationshipList = EntityUtil.filterByDate(partyRelationshipList, true); - // then 0 (equals), otherwise 1 (not equals) + if (UtilValidate.isNotEmpty(partyRelationshipList)) { compareBase = Integer.valueOf(0); } else { - compareBase = Integer.valueOf(1); + compareBase = Integer.valueOf(checkConditionPartyHierarchy(delegator, nowTimestamp, groupPartyId, partyId)); } } } @@ -1002,7 +1002,7 @@ public class ProductPromoWorker { } else { String partyClassificationGroupId = condValue; // find any PartyClassification - List partyClassificationList = delegator.findByAndCache("PartyClassification", UtilMisc.toMap("partyId", partyId, "partyClassificationGroupId", partyClassificationGroupId)); + List<GenericValue> partyClassificationList = delegator.findByAndCache("PartyClassification", UtilMisc.toMap("partyId", partyId, "partyClassificationGroupId", partyClassificationGroupId)); // and from/thru date within range partyClassificationList = EntityUtil.filterByDate(partyClassificationList, true); // then 0 (equals), otherwise 1 (not equals) @@ -1181,6 +1181,21 @@ public class ProductPromoWorker { return false; } + private static int checkConditionPartyHierarchy(Delegator delegator, Timestamp nowTimestamp, String groupPartyId, String partyId) throws GenericEntityException{ + List<GenericValue> partyRelationshipList = delegator.findByAndCache("PartyRelationship", UtilMisc.toMap("partyIdTo", partyId, "partyRelationshipTypeId", "GROUP_ROLLUP")); + partyRelationshipList = EntityUtil.filterByDate(partyRelationshipList, nowTimestamp, null, null, true); + for (GenericValue genericValue : partyRelationshipList) { + String partyIdFrom = (String)genericValue.get("partyIdFrom"); + if (partyIdFrom.equals(groupPartyId)) { + return 0; + } + if (0 == checkConditionPartyHierarchy(delegator, nowTimestamp, groupPartyId, partyIdFrom)) { + return 0; + } + } + return 1; + } + public static class ActionResultInfo { public boolean ranAction = false; public BigDecimal totalDiscountAmount = BigDecimal.ZERO; Modified: ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java (original) +++ ofbiz/branches/multitenant20100310/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java Wed Mar 24 09:23:07 2010 @@ -74,13 +74,14 @@ public class ShoppingListEvents { GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); String shoppingListId = request.getParameter("shoppingListId"); + String shoppingListTypeId = request.getParameter("shoppingListTypeId"); String selectedCartItems[] = request.getParameterValues("selectedItem"); if (UtilValidate.isEmpty(selectedCartItems)) { selectedCartItems = makeCartItemsArray(cart); } try { - shoppingListId = addBulkFromCart(delegator, dispatcher, cart, userLogin, shoppingListId, selectedCartItems, true, true); + shoppingListId = addBulkFromCart(delegator, dispatcher, cart, userLogin, shoppingListId, shoppingListTypeId, selectedCartItems, true, true); } catch (IllegalArgumentException e) { request.setAttribute("_ERROR_MESSAGE_", e.getMessage()); return "error"; @@ -90,19 +91,19 @@ public class ShoppingListEvents { return "success"; } - public static String addBulkFromCart(Delegator delegator, LocalDispatcher dispatcher, ShoppingCart cart, GenericValue userLogin, String shoppingListId, String[] items, boolean allowPromo, boolean append) throws IllegalArgumentException { + public static String addBulkFromCart(Delegator delegator, LocalDispatcher dispatcher, ShoppingCart cart, GenericValue userLogin, String shoppingListId, String shoppingListTypeId, String[] items, boolean allowPromo, boolean append) throws IllegalArgumentException { String errMsg = null; if (items == null || items.length == 0) { errMsg = UtilProperties.getMessage(resource_error, "shoppinglistevents.select_items_to_add_to_list", cart.getLocale()); throw new IllegalArgumentException(errMsg); } - + if (UtilValidate.isEmpty(shoppingListId)) { // create a new shopping list Map newListResult = null; try { - newListResult = dispatcher.runSync("createShoppingList", UtilMisc.<String, Object>toMap("userLogin", userLogin, "productStoreId", cart.getProductStoreId(), "partyId", cart.getOrderPartyId(), "currencyUom", cart.getCurrency())); + newListResult = dispatcher.runSync("createShoppingList", UtilMisc.<String, Object>toMap("userLogin", userLogin, "productStoreId", cart.getProductStoreId(), "partyId", cart.getOrderPartyId(), "shoppingListTypeId", shoppingListTypeId, "currencyUom", cart.getCurrency())); } catch (GenericServiceException e) { Debug.logError(e, "Problems creating new ShoppingList", module); errMsg = UtilProperties.getMessage(resource_error,"shoppinglistevents.cannot_create_new_shopping_list", cart.getLocale()); @@ -403,7 +404,7 @@ public class ShoppingListEvents { try { String[] itemsArray = makeCartItemsArray(cart); if (itemsArray != null && itemsArray.length != 0) { - addBulkFromCart(delegator, dispatcher, cart, userLogin, autoSaveListId, itemsArray, false, false); + addBulkFromCart(delegator, dispatcher, cart, userLogin, autoSaveListId, null, itemsArray, false, false); } } catch (IllegalArgumentException e) { throw new GeneralException(e.getMessage(), e); Modified: ofbiz/branches/multitenant20100310/applications/order/testdef/OrderTest.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/testdef/OrderTest.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/testdef/OrderTest.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/testdef/OrderTest.xml Wed Mar 24 09:23:07 2010 @@ -21,6 +21,9 @@ under the License. <test-suite suite-name="ordertests" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd"> + <test-case case-name="custRequest-test"> + <junit-test-suite class-name="org.ofbiz.order.test.CustRequestTest"/> + </test-case> <test-case case-name="purchaseOrder-test"> <junit-test-suite class-name="org.ofbiz.order.test.PurchaseOrderTest"/> </test-case> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy Wed Mar 24 09:23:07 2010 @@ -30,26 +30,26 @@ DateYear = DateStr.substring(0,4); if (DateMonth == "01"||DateMonth == "03"||DateMonth == "05"||DateMonth == "07"||DateMonth == "08"||DateMonth == "10"||DateMonth == "12") { - NunberDate = 31; + NunberDate = 31; } else if (DateMonth == "02") { - NunberDate = 29; + NunberDate = 29; } else { - NunberDate = 30; + NunberDate = 30; } birtParameters = [:]; try { - birtParameters.productStoreId = productStoreId; - birtParameters.DateDay = DateDay; - birtParameters.DateMonth = DateMonth; - birtParameters.DateYear = DateYear; - birtParameters.NunberDate = NunberDate; + birtParameters.productStoreId = productStoreId; + birtParameters.DateDay = DateDay; + birtParameters.DateMonth = DateMonth; + birtParameters.DateYear = DateYear; + birtParameters.NunberDate = NunberDate; } catch (e) { - Debug.logError(e, ""); + Debug.logError(e, ""); } request.setAttribute("birtParameters", birtParameters); Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy Wed Mar 24 09:23:07 2010 @@ -21,9 +21,9 @@ import org.ofbiz.base.util.*; birtParameters = [:]; if(request.getParameter("saleChannel")){ - birtParameters.saleChannel = request.getParameter("saleChannel"); + birtParameters.saleChannel = request.getParameter("saleChannel"); }else{ - birtParameters.saleChannel = "null"; + birtParameters.saleChannel = "null"; } request.setAttribute("birtParameters", birtParameters); Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy Wed Mar 24 09:23:07 2010 @@ -28,11 +28,11 @@ int Year = cal.get(Calendar.YEAR); birtParameters = [:]; try { - birtParameters.productStoreId = productStoreId; - birtParameters.Week = Week; - birtParameters.Year = Year; + birtParameters.productStoreId = productStoreId; + birtParameters.Week = Week; + birtParameters.Year = Year; } catch (e) { - Debug.logError(e, ""); + Debug.logError(e, ""); } request.setAttribute("birtParameters", birtParameters); Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy Wed Mar 24 09:23:07 2010 @@ -24,10 +24,10 @@ thruDateStr = parameters.thruDate; birtParameters = [:]; try { - birtParameters.fromDate = Date.valueOf(fromDateStr); - birtParameters.thruDate = Date.valueOf(thruDateStr); + birtParameters.fromDate = Date.valueOf(fromDateStr); + birtParameters.thruDate = Date.valueOf(thruDateStr); } catch (e) { - Debug.logError(e, ""); + Debug.logError(e, ""); } request.setAttribute("birtParameters", birtParameters); Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy Wed Mar 24 09:23:07 2010 @@ -94,7 +94,7 @@ context.returnItemTypeMap = typeMap; if (orderId) { returnRes = dispatcher.runSync("getReturnableItems", [orderId : orderId]); context.returnableItems = returnRes.returnableItems; - orderHeader = delegator.findByPrimaryKeyCache("OrderHeader", [orderId : orderId]); + orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); context.orderHeader = orderHeader; } Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy Wed Mar 24 09:23:07 2010 @@ -88,7 +88,7 @@ orderHeader = null; if (orderId) { orderRoles = delegator.findByAnd("OrderRole", [orderId : orderId, roleTypeId : "BILL_TO_CUSTOMER"]); orderRole = EntityUtil.getFirst(orderRoles); - orderHeader = delegator.findByPrimaryKeyCache("OrderHeader", [orderId : orderId]); + orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); } context.orderRole = orderRole; context.orderHeader = orderHeader; Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed Mar 24 09:23:07 2010 @@ -1103,7 +1103,7 @@ under the License. <response name="success" type="view" value="OrderByReferrerReport"/> </request-map> <request-map uri="OrdersByChannel.pdf"><security https="true" auth="true"/> - <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="OrderByChannel.groovy"/> + <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="OrderByChannel.groovy"/> <response name="success" type="view" value="OrdersByChannelReport"/> </request-map> <request-map uri="OrderDiscountCode.pdf"> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Wed Mar 24 09:23:07 2010 @@ -106,7 +106,7 @@ under the License. </tr> </table> -<br/> +<br /> <#else> <h3>${uiLabelMap.OrderViewPermissionError}</h3> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl Wed Mar 24 09:23:07 2010 @@ -30,7 +30,7 @@ under the License. <td valign="bottom"><div>${roleData[role].get("description", locale)}</div></td> </tr> <tr> - <td colspan="4"><hr/></td> + <td colspan="4"><hr /></td> </tr> <#list additionalPartyRoleMap[role] as party> <tr> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/addrsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/addrsettings.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/addrsettings.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/addrsettings.ftl Wed Mar 24 09:23:07 2010 @@ -35,7 +35,7 @@ under the License. </table> <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#-- postal addresses for chosen id --> @@ -53,18 +53,18 @@ under the License. <td nowrap> </td> <td width="100%"> <div> - <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br/></#if> - <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br/></#if> - <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if> + <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if> + <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#if shippingAddress.stateProvinceGeoId?has_content><br/>${shippingAddress.stateProvinceGeoId}</#if> - <#if shippingAddress.postalCode?has_content><br/>${shippingAddress.postalCode}</#if> - <#if shippingAddress.countryGeoId?has_content><br/>${shippingAddress.countryGeoId}</#if> + <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> + <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> + <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> </div> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </#if> </#list> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/billsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/billsettings.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/billsettings.ftl Wed Mar 24 09:23:07 2010 @@ -44,7 +44,7 @@ function makeExpDate() { <a href="<@ofbizUrl>setBilling?createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew}</a> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#if billingAccountList?has_content> <tr> <td width="1%"> @@ -75,7 +75,7 @@ function makeExpDate() { </td> <td> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </#if> <tr> <td width="1%"> @@ -85,7 +85,7 @@ function makeExpDate() { <label for="checkOutPaymentId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td width="1%"> <input type="radio" id="checkOutPaymentId_EXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if>/> @@ -94,7 +94,7 @@ function makeExpDate() { <label for="checkOutPaymentId_EXT_COD">${uiLabelMap.OrderCOD}</label> </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#if paymentMethodList?has_content> <#list paymentMethodList as paymentMethod> <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD"> @@ -128,7 +128,7 @@ function makeExpDate() { </td> <td align="right"><a href="/partymgr/control/editeftaccount?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> </#if> </#list> <#else> @@ -181,7 +181,7 @@ function makeExpDate() { </td> </tr> <tr> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> </#if> @@ -274,7 +274,7 @@ function makeExpDate() { </#if> <input type="hidden" name="expireDate" value="${creditCard.expireDate?if_exists}"/> <tr> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> <tr> @@ -429,7 +429,7 @@ function makeExpDate() { <#assign eftAccount = requestParameters> </#if> <tr> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingNameAccount}</div></td> @@ -511,18 +511,18 @@ function makeExpDate() { <td width='1%' nowrap><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/></td> <td width='50%'nowrap><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td width="1%" nowrap><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/></td> <td width="50%"nowrap><div>${uiLabelMap.OrderCOD}</div></td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> </#if> <tr> <td width='1%' nowrap><input type="radio" name="paymentMethodTypeAndId" value="CC" onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/> <td width='50%' nowrap><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td width='1%' nowrap><input type="radio" name="paymentMethodTypeAndId" value="EFT" onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/> <td width='50%' nowrap><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promoText.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promoText.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promoText.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promoText.ftl Wed Mar 24 09:23:07 2010 @@ -31,10 +31,10 @@ under the License. </td> </tr> <#if productPromo_has_next> - <tr><td><hr/></td></tr> + <tr><td><hr /></td></tr> </#if> </#list> - <tr><td><hr/></td></tr> + <tr><td><hr /></td></tr> <tr> <td> <div><a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewAllPromotions}</a></div> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promotionsApplied.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promotionsApplied.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promotionsApplied.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/promotionsApplied.ftl Wed Mar 24 09:23:07 2010 @@ -18,6 +18,6 @@ under the License. --> <#if (shoppingCartSize?default(0) > 0)> - <br/> + <br /> ${screens.render(promoUseDetailsInlineScreen)} </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Wed Mar 24 09:23:07 2010 @@ -158,7 +158,7 @@ under the License. </td> </tr> <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> - <tr><td><hr/></td></tr> + <tr><td><hr /></td></tr> <tr> <td> <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="bulkworkaddform" style="margin: 0;"> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Wed Mar 24 09:23:07 2010 @@ -80,7 +80,7 @@ under the License. <#if cartLine.getProductId()?exists> <#-- product item --> <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>" class="buttontext">${cartLine.getProductId()}</a> - - <input size="60" type="text" name="description_${cartLineIndex}" value="${cartLine.getName()?default("")}"/><br/> + <input size="60" type="text" name="description_${cartLineIndex}" value="${cartLine.getName()?default("")}"/><br /> <i>${cartLine.getDescription()?if_exists}</i> <#if shoppingCart.getOrderType() != "PURCHASE_ORDER"> <#-- only applies to sales orders, not purchase orders --> @@ -103,11 +103,11 @@ under the License. <#assign features = cartLine.getStandardFeatureList()> </#if> <#if features?has_content> - <br/><i>${uiLabelMap.ProductFeatures}: <#list features as feature>${feature.description?default("")} </#list></i> + <br /><i>${uiLabelMap.ProductFeatures}: <#list features as feature>${feature.description?default("")} </#list></i> </#if> <#-- show links to survey response for this item --> <#if cartLine.getAttribute("surveyResponses")?has_content> - <br/>Surveys: + <br />Surveys: <#list cartLine.getAttribute("surveyResponses") as surveyResponseId> <a href="/content/control/ViewSurveyResponses?surveyResponseId=${surveyResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${surveyResponseId}</a> </#list> @@ -276,7 +276,7 @@ under the License. <input size="6" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}"/> </#if> <#if (cartLine.getSelectedAmount() > 0) > - <br/><b>${uiLabelMap.OrderAmount}:</b><br/><input size="6" type="text" name="amount_${cartLineIndex}" value="${cartLine.getSelectedAmount()?string.number}"/> + <br /><b>${uiLabelMap.OrderAmount}:</b><br /><input size="6" type="text" name="amount_${cartLineIndex}" value="${cartLine.getSelectedAmount()?string.number}"/> </#if> </div> </td> @@ -301,7 +301,7 @@ under the License. </#list> <#if shoppingCart.getAdjustments()?has_content> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td colspan="4" nowrap align="right"><div>${uiLabelMap.OrderSubTotal}:</div></td> <td nowrap align="right"><div><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=currencyUomId/></div></td> @@ -327,7 +327,7 @@ under the License. <div><b>${uiLabelMap.OrderCartTotal}:</b></div> </td> <td align="right" valign="bottom"> - <hr/> + <hr /> <div><b><@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></b></div> </td> </tr> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Wed Mar 24 09:23:07 2010 @@ -19,7 +19,7 @@ under the License. <#assign searchOptionsHistoryList = Static["org.ofbiz.product.product.ProductSearchSession"].getSearchOptionsHistoryList(session)> <#assign currentCatalogId = Static["org.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)> <h1>${uiLabelMap.ProductAdvancedSearchInCategory}</h1> -<br/> +<br /> <form name="advtokeywordsearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;"> <input type="hidden" name="VIEW_SIZE" value="10"> <table border="0" wdith="100%"> @@ -135,7 +135,7 @@ under the License. </table> <#if searchOptionsHistoryList?has_content> - <hr/> + <hr /> <h2>${uiLabelMap.OrderLastSearches}...</h2> @@ -155,7 +155,7 @@ under the License. <div> - ${constraintString}</div> </#list> <#if searchOptions_has_next> - <hr/> + <hr /> </#if> </#list> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl Wed Mar 24 09:23:07 2010 @@ -66,4 +66,4 @@ under the License. </#if> </ul> </div> -<br/> +<br /> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Wed Mar 24 09:23:07 2010 @@ -127,6 +127,6 @@ under the License. </div> <@paginationControls/> <#else> - <hr/> + <hr /> <div>${uiLabelMap.ProductNoProductsInThisCategory}</div> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl Wed Mar 24 09:23:07 2010 @@ -30,8 +30,8 @@ under the License. <#assign smallImageUrl = "/images/defaultImage.jpg"/> </#if> <td> - <img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br/> - ${productContentWrapper.get("PRODUCT_NAME")}<br/> + <img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> + ${productContentWrapper.get("PRODUCT_NAME")}<br /> <#if totalPrice?exists> <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> <#else> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Wed Mar 24 09:23:07 2010 @@ -366,7 +366,7 @@ function getConfigDetails(event) { </form> <div> <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous"> - <hr/> + <hr /> <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> <input type="hidden" name="productId" value="${product.productId}"> <input type="hidden" name="product_id" value="${product.productId}"> @@ -384,7 +384,7 @@ function getConfigDetails(event) { <input type="text" size="5" name="quantity" value="1"> <a href="javascript:document.addToShoppingList.submit();" class="buttontext">[${uiLabelMap.OrderAddToShoppingList}]</a> </form> - <#else> <br/> + <#else> <br /> ${uiLabelMap.OrderYouMust} <a href="<@ofbizUrl>checkLogin/showcart</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBeLogged}</a> ${uiLabelMap.OrderToAddSelectedItemsToShoppingList}. </#if> @@ -415,7 +415,7 @@ function getConfigDetails(event) { </#if> <td align="center" valign="bottom"> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60"></a> - <br/> + <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="buttontext">${key}</a> </td> </#if> @@ -459,7 +459,7 @@ function getConfigDetails(event) { </div> </td> </tr> - <tr><td><hr/></td></tr> + <tr><td><hr /></td></tr> <#assign counter = 0> <#assign questions = configwrapper.questions> <#list questions as question> @@ -614,7 +614,7 @@ function getConfigDetails(event) { </td> </tr> <#if question_has_next> - <tr><td><hr/></td></tr> + <tr><td><hr /></td></tr> </#if> <#assign counter = counter + 1> </#list> @@ -633,7 +633,7 @@ function getConfigDetails(event) { <#if assocProducts?has_content> <tr><td> </td></tr> <tr><td colspan="2"><h2>${beforeName?if_exists}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</#if>${afterName?if_exists}</h2></td></tr> - <tr><td><hr/></td></tr> + <tr><td><hr /></td></tr> <#list assocProducts as productAssoc> <tr><td> <div> @@ -655,7 +655,7 @@ function getConfigDetails(event) { </td> </tr> <#local listIndex = listIndex + 1> - <tr><td><hr/></td></tr> + <tr><td><hr /></td></tr> </#list> ${setRequestAttribute("optProductId", "")} ${setRequestAttribute("formNamePrefix", "")} @@ -680,7 +680,7 @@ ${setRequestAttribute("productValue", pr <#-- special cross/up-sell area using commonFeatureResultIds (from common feature product search) --> <#if commonFeatureResultIds?has_content> <h2>Similar Products That Might Interest You...</h2> - <hr/> + <hr /> <#list commonFeatureResultIds as commonFeatureResultId> <div> @@ -691,7 +691,7 @@ ${setRequestAttribute("productValue", pr ${screens.render(productsummaryScreen)} </div> <#if commonFeatureResultId_has_next> - <hr/> + <hr /> </#if> </#list> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Wed Mar 24 09:23:07 2010 @@ -374,7 +374,7 @@ ${virtualJavaScript?if_exists} </#if> <td align="center" valign="bottom"> <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60"></a> - <br/> + <br /> <a href="javascript:getListInline('${inlineCounter}', 'FT${inlineCounter}${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a> </td> </#if> Modified: ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl (original) +++ ofbiz/branches/multitenant20100310/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl Wed Mar 24 09:23:07 2010 @@ -18,15 +18,15 @@ under the License. --> <h1>${uiLabelMap.ProductProductSearch}, <span class="h2">${uiLabelMap.ProductYouSearchedFor}:</span></h1> -<br/> +<br /> <ul> <#list searchConstraintStrings as searchConstraintString> <li><a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</li> </#list> </ul> -<br/> +<br /> <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> -<br/> +<br /> <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> <#if !productIds?has_content> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |