svn commit: r1022411 - in /ofbiz/branches/jquery: ./ applications/accounting/widget
Locked
svn commit: r1022411 - in /ofbiz/branches/jquery: ./ applications/accounting/widget
 
|
Author: jleroux
Date: Thu Oct 14 08:19:22 2010 New Revision: 1022411 URL: http://svn.apache.org/viewvc?rev=1022411&view=rev Log: Merges the trunk at r1022407 Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/applications/accounting/widget/AgreementScreens.xml ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml ofbiz/branches/jquery/applications/content/servicedef/services.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java ofbiz/branches/jquery/specialpurpose/build.xml ofbiz/branches/jquery/specialpurpose/component-load.xml ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogForms.xml ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogTemplates.xml ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 08:19:22 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-1006054 +/ofbiz/trunk:951708-1022407 Modified: ofbiz/branches/jquery/applications/accounting/widget/AgreementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/AgreementScreens.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/AgreementScreens.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/AgreementScreens.xml Thu Oct 14 08:19:22 2010 @@ -365,6 +365,7 @@ under the License. <entity-and entity-name="AgreementProductAppl" list="agreementProducts"> <field-map from-field="agreement.agreementId" field-name="agreementId"/> <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <order-by field-name="productId"/> </entity-and> </actions> <widgets> @@ -401,6 +402,7 @@ under the License. <entity-and entity-name="AgreementProductAppl" list="agreementProducts"> <field-map from-field="agreement.agreementId" field-name="agreementId"/> <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <order-by field-name="productId"/> </entity-and> </actions> <widgets> @@ -464,6 +466,7 @@ under the License. <entity-and entity-name="SupplierProduct" list="agreementProducts"> <field-map from-field="agreement.agreementId" field-name="agreementId"/> <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <order-by field-name="productId"/> </entity-and> </actions> <widgets> @@ -500,6 +503,7 @@ under the License. <entity-and entity-name="SupplierProduct" list="agreementProducts"> <field-map from-field="agreement.agreementId" field-name="agreementId"/> <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/> + <order-by field-name="productId"/> </entity-and> </actions> <widgets> Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml Thu Oct 14 08:19:22 2010 @@ -123,6 +123,12 @@ under the License. </entity-options> </drop-down> </field> + <field name="partyIdTo" position="2"><lookup target-form-name="LookupPartyName"/></field> + <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1"> + <drop-down allow-empty="false"> + <list-options list-name="paymentTypes" key-name="paymentTypeId" description="${description}"/> + </drop-down> + </field> <field name="paymentMethodId" id-name="paymentMethodId" position="2"> <drop-down allow-empty="false"> <entity-options entity-name="PaymentMethod" description="${description}"> @@ -131,12 +137,6 @@ under the License. </entity-options> </drop-down> </field> - <field name="partyIdTo" position="1"><lookup target-form-name="LookupPartyName"/></field> - <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="2"> - <drop-down allow-empty="false"> - <list-options list-name="paymentTypes" key-name="paymentTypeId" description="${description}"/> - </drop-down> - </field> <field name="paymentRefNum" position="1"><text/></field> <field name="overrideGlAccountId" position="2"><lookup target-form-name="LookupGlAccount"/></field> <field name="amount" position="1"><text/></field> @@ -203,12 +203,14 @@ under the License. <entity-one entity-name="StatusItem" value-field="currentStatus"> <field-map field-name="statusId" from-field="payment.statusId"/> </entity-one> + <set field="isDisbursement" value="${groovy:org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment);}" type="Boolean"/> </actions> <auto-fields-entity entity-name="Payment"/> <field name="paymentId"><hidden/></field> <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1"> <drop-down allow-empty="false"> <entity-options description="${description}" entity-name="PaymentType"> + <entity-constraint name="parentTypeId" value="${groovy:isDisbursement==true?"DISBURSEMENT":"RECEIPT"}"/> <entity-order-by field-name="description"/> </entity-options> </drop-down> Modified: ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original) +++ ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Thu Oct 14 08:19:22 2010 @@ -31,27 +31,30 @@ </if-empty> <!-- determine of we need to create complex template structure or simple content structure --> - <if-not-empty field="parameters._uploadedFile_fileName"> - <if-not-empty field="parameters.articleData"> - <!-- complex template structure (image & text) --> - <set field="createMain.dataResourceId" from-field="parameters.templateDataResourceId"/> - <set field="createMain.contentAssocTypeId" from-field="contentAssocTypeId"/> - <set field="createMain.contentName" from-field="parameters.contentName"/> - <set field="createMain.description" from-field="parameters.description"/> - <set field="createMain.statusId" from-field="parameters.statusId"/> - <set field="createMain.contentIdFrom" from-field="contentIdFrom"/> - <set field="createMain.partyId" from-field="userLogin.partyId"/> - <set field="createMain.ownerContentId" from-field="ownerContentId"/> - <set field="createMain.dataTemplateTypeId" value="SCREEN_COMBINED"/> - <set field="createMain.mapKey" value="MAIN"/> - <call-service service-name="createContent" in-map-name="createMain"> - <result-to-field result-name="contentId" field="contentId"/> - </call-service> - <!-- reset contentIdFrom to new contentId --> - <set field="contentAssocTypeId" value="SUB_CONTENT"/> - <set field="contentIdFrom" from-field="contentId"/> - </if-not-empty> - </if-not-empty> + <if-empty field="parameters.contentName"> + <add-error> + <fail-message message="Article Name is missing."/> + </add-error> + </if-empty> + <check-errors/> + <!-- complex template structure (image & text) --> + <set field="createMain.dataResourceId" from-field="parameters.templateDataResourceId"/> + <set field="createMain.contentAssocTypeId" from-field="contentAssocTypeId"/> + <set field="createMain.contentName" from-field="parameters.contentName"/> + <set field="createMain.description" from-field="parameters.description"/> + <set field="createMain.statusId" from-field="parameters.statusId"/> + <set field="createMain.contentIdFrom" from-field="contentIdFrom"/> + <set field="createMain.partyId" from-field="userLogin.partyId"/> + <set field="createMain.ownerContentId" from-field="ownerContentId"/> + <set field="createMain.dataTemplateTypeId" value="SCREEN_COMBINED"/> + <set field="createMain.mapKey" value="MAIN"/> + <call-service service-name="createContent" in-map-name="createMain"> + <result-to-field result-name="contentId" field="contentId"/> + </call-service> + <!-- reset contentIdFrom to new contentId --> + <set field="contentAssocTypeId" value="SUB_CONTENT"/> + <set field="contentIdFrom" from-field="contentId"/> + <if-not-empty field="parameters._uploadedFile_fileName"> <!-- upload a picture --> @@ -72,11 +75,6 @@ <call-service service-name="createContentFromUploadedFile" in-map-name="createImage"> <result-to-field result-name="contentId" field="imageContentId"/> </call-service> - <if-empty field="contentId"> - <set field="contentIdFrom" from-field="imageContentId"/> - <set field="contentId" from-field="imageContentId"/> - <set field="contentAssocTypeId" value="SUB_CONTENT"/> - </if-empty> </if-not-empty> <if-not-empty field="parameters.articleData"> @@ -93,15 +91,11 @@ <set field="createText.textData" from-field="parameters.articleData"/> <set field="createText.contentIdFrom" from-field="contentIdFrom"/> <set field="createText.partyId" from-field="userLogin.partyId"/> + <set field="createText.mapKey" value="ARTICLE"/> <log level="always" message="calling createTextContent with map: ${createText}"/> <call-service service-name="createTextContent" in-map-name="createText"> <result-to-field result-name="contentId" field="textContentId"/> </call-service> - <if-empty field="contentId"> - <set field="contentIdFrom" from-field="textContentId"/> - <set field="contentId" from-field="textContentId"/> - <set field="contentAssocTypeId" value="SUB_CONTENT"/> - </if-empty> </if-not-empty> <if-not-empty field="contentId"> @@ -123,7 +117,7 @@ </if-not-empty> </if-not-empty> - <field-to-result field="contentId"/> + <field-to-result field="contentIdFrom" result-name="contentId"/> <field-to-result field="parameters.blogContentId" result-name="blogContentId"/> </simple-method> @@ -263,7 +257,7 @@ <get-related value-field="content" relation-name="FromContentAssoc" list="rawAssocs"/> <filter-list-by-date list="rawAssocs" to-list="assocs"/> <iterate entry="assoc" list="assocs"> - <if-compare field="assoc.mapKey" value="MAIN" operator="equals"> + <if-compare field="assoc.mapKey" value="ARTICLE" operator="equals"> <get-related-one value-field="assoc" relation-name="ToContent" to-value-field="mainContent"/> <get-related-one value-field="mainContent" relation-name="DataResource" to-value-field="dataResource"/> <get-related-one value-field="dataResource" relation-name="ElectronicText" to-value-field="articleText"/> Modified: ofbiz/branches/jquery/applications/content/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/servicedef/services.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/servicedef/services.xml (original) +++ ofbiz/branches/jquery/applications/content/servicedef/services.xml Thu Oct 14 08:19:22 2010 @@ -1070,8 +1070,8 @@ <attribute name="statusId" type="String" mode="IN" optional="true"/> <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="templateDataResourceId" type="String" mode="IN" optional="true"/> - <attribute name="articleData" type="String" mode="IN" optional="true"/> - <attribute name="summaryData" type="String" mode="IN" optional="true"/> + <attribute name="articleData" type="String" mode="IN" optional="true" allow-html="safe"/> + <attribute name="summaryData" type="String" mode="IN" optional="true" allow-html="safe"/> </service> <service name="updateBlogEntry" engine="simple" auth="true" location="component://content/script/org/ofbiz/content/blog/BlogServices.xml" invoke="updateBlogEntry"> @@ -1083,8 +1083,8 @@ <attribute name="statusId" type="String" mode="IN" optional="true"/> <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="templateDataResourceId" type="String" mode="IN" optional="true"/> - <attribute name="articleData" type="String" mode="IN" optional="true"/> - <attribute name="summaryData" type="String" mode="IN" optional="true"/> + <attribute name="articleData" type="String" mode="IN" optional="true" allow-html="safe"/> + <attribute name="summaryData" type="String" mode="IN" optional="true" allow-html="safe"/> </service> <service name="getBlogEntry" engine="simple" auth="true" location="component://content/script/org/ofbiz/content/blog/BlogServices.xml" invoke="getBlogEntry"> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 08:19:22 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1006054 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1022407 Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 08:19:22 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1006054 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1022407 Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 08:19:22 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1006054 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1022407 Modified: ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl Thu Oct 14 08:19:22 2010 @@ -18,7 +18,7 @@ under the License. --> <form name="addscarr" method="post" action="<@ofbizUrl>prepareCreateShipMeth</@ofbizUrl>"> <input type="hidden" name="newShipMethod" value="Y"/> - <input type="hidden" name="productStoreId" value="${productStoreId}"/> + <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> <table cellspacing="0" class="basic-table"> <tr> <td align="right" class="label">${uiLabelMap.ProductCarrierShipmentMethod}</td> @@ -38,4 +38,4 @@ under the License. </td> </tr> </table> -</form> \ No newline at end of file +</form> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Thu Oct 14 08:19:22 2010 @@ -36,7 +36,12 @@ under the License. <tr> <td class="label">${uiLabelMap.ProductLocationSeqId}</td> <td> - <@htmlTemplate.lookupField formName="findFacilityLocation" name="locationSeqId" id="locationSeqId" fieldFormName="LookupFacilityLocation<#if (facilityId?exists)>?facilityId=${facilityId}</#if>"/> + <#if parameters.facilityId?exists> + <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}"> + <#else> + <#assign LookupFacilityLocationView="LookupFacilityLocation"> + </#if> + <@htmlTemplate.lookupField formName="findFacilityLocation" name="locationSeqId" id="locationSeqId" fieldFormName="${LookupFacilityLocationView}"/> </td> </tr> <tr> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl Thu Oct 14 08:19:22 2010 @@ -202,7 +202,12 @@ under the License. <option value="">${uiLabelMap.ProductNoLocation}</option> </select> <#else> - <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId" id="locationSeqId" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/> + <#if parameters.facilityId?exists> + <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}"> + <#else> + <#assign LookupFacilityLocationView="LookupFacilityLocation"> + </#if> + <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="${LookupFacilityLocationView}"/> </#if> </td> </tr> @@ -404,7 +409,12 @@ under the License. <option value="">${uiLabelMap.ProductNoLocation}</option> </select> <#else> - <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/> + <#if parameters.facilityId?exists> + <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}"> + <#else> + <#assign LookupFacilityLocationView="LookupFacilityLocation"> + </#if> + <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="${LookupFacilityLocationView}"/> </#if> </td> <td align="right">${uiLabelMap.ProductQtyReceived} :</td> Modified: ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/returns/receiveReturn.ftl Thu Oct 14 08:19:22 2010 @@ -150,7 +150,12 @@ under the License. </select> <#else> <span> - <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/> + <#if parameters.facilityId?exists> + <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}"> + <#else> + <#assign LookupFacilityLocationView="LookupFacilityLocation"> + </#if> + <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="${LookupFacilityLocationView}"/> </span> </#if> </td> Modified: ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Thu Oct 14 08:19:22 2010 @@ -152,6 +152,16 @@ under the License. <set field="invoiceItemMap.taxableFlag" value="N"/> <set field="invoiceItemMap.invoiceItemTypeId" value="INV_TE_ITEM"/> <set field="invoiceItemMap.uomId" value="TF_hr"/> + <set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/> + <get-related value-field="workEffort" relation-name="CustRequestWorkEffort" list="custRequestWorkEfforts"/> + <if-not-empty field="custRequestWorkEfforts"> + <first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/> + <get-related-one value-field="custRequestWorkEffort" relation-name="CustRequest" to-value-field="custRequest"/> + <if-not-empty field="custRequest"> + <set field="invoiceItemDescription" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}] ${custRequest.description}"/> + <set field="invoiceItemMap.description" value="${groovy:invoiceItemDescription.size()>255?invoiceItemDescription.substring(0,251)+" ...":invoiceItemDescription}"/> + </if-not-empty> + </if-not-empty> <iterate entry="timeEntry" list="timeEntryList"> <if> <condition> @@ -203,27 +213,26 @@ under the License. <call-service service-name="getTimeEntryRate" in-map-name="getTimeEntryRate"> <result-to-field result-name="rateAmount"/> </call-service> - <!-- check if the RateTypeId changed or the first time entry record --> + <!-- check if the RateTypeId changed or the first time entry record and invoice item is not exist with the same amount and description--> + <entity-and list="existAmountAndDescriptionInvoiceItems" entity-name="InvoiceItem"> + <field-map field-name="invoiceId" from-field="invoiceItemMap.invoiceId"/> + <field-map field-name="amount" from-field="rateAmount"/> + <field-map field-name="description" from-field="invoiceItemMap.description"/> + </entity-and> + <set field="invoiceItemMap.invoiceItemSeqId" from-field="existAmountAndDescriptionInvoiceItems[0].invoiceItemSeqId"/> <if> <condition> - <or> - <if-empty field="oldRateAmount"/> - <if-compare-field field="rateAmount" operator="not-equals" to-field="oldRateAmount"/> - </or> + <and> + <or> + <if-empty field="oldRateAmount"/> + <if-compare-field field="rateAmount" operator="not-equals" to-field="oldRateAmount"/> + </or> + <if-empty field="existAmountAndDescriptionInvoiceItems"/> + </and> </condition> <then> <set field="invoiceItemMap.amount" from-field="rateAmount" default-value="0.0" type="BigDecimal"/> <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" > - <set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/> - <get-related value-field="workEffort" relation-name="CustRequestWorkEffort" list="custRequestWorkEfforts"/> - <if-not-empty field="custRequestWorkEfforts"> - <first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/> - <get-related-one value-field="custRequestWorkEffort" relation-name="CustRequest" to-value-field="custRequest"/> - <if-not-empty field="custRequest"> - <set field="invoiceItemDescription" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}] ${custRequest.description}"/> - <set field="invoiceItemMap.description" value="${groovy:invoiceItemDescription.size()>255?invoiceItemDescription.substring(0,251)+" ...":invoiceItemDescription}"/> - </if-not-empty> - </if-not-empty> <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="BigDecimal"/> <clear-field field="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created --> <call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap"> @@ -233,7 +242,8 @@ under the License. </then> <else> <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" > - <!-- or combine them when it is the same rate --> + <!-- or combine them when it is the same rate, amount and description--> + <set field="invoiceItemMap.quantity" from-field="existAmountAndDescriptionInvoiceItems[0].quantity"/> <calculate field="invoiceItemMap.quantity"> <calcop operator="get" field="invoiceItemMap.quantity"/> <calcop operator="add" field="timeEntry.hours"/> Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 08:19:22 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1006054 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1022407 Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original) +++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java Thu Oct 14 08:19:22 2010 @@ -111,9 +111,9 @@ public class ServerHitBin { } protected static void countHit(String baseId, int type, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin, boolean isOriginal) { - String delegatorName = (String) request.getSession().getAttribute("delegatorName"); - Delegator delegator = null; - if (UtilValidate.isNotEmpty(delegatorName)) { + Delegator delegator = (Delegator)request.getAttribute("delegator"); + if (delegator == null){ + String delegatorName = (String)request.getSession().getAttribute("delegatorName"); delegator = DelegatorFactory.getDelegator(delegatorName); } if (delegator == null) { Modified: ofbiz/branches/jquery/specialpurpose/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/build.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/build.xml (original) +++ ofbiz/branches/jquery/specialpurpose/build.xml Thu Oct 14 08:19:22 2010 @@ -31,10 +31,10 @@ ebay/build.xml, ebaystore/build.xml, projectmgr/build.xml, - ldap/build.xml, crowd/build.xml, googlecheckout/build.xml, webpos/build.xml"/> + <!-- Not sure why yet, but ldap has been deactivated in component-load. To re-add add "ldap/build.xml," to the list above --> <!-- For the old OFBiz Workflow Engine add "workflow/build.xml" to the list above --> <!-- For Shark add "shark/build.xml" to the list above, in the specialpurpose-builds list (after workflow) --> Modified: ofbiz/branches/jquery/specialpurpose/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/component-load.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/component-load.xml (original) +++ ofbiz/branches/jquery/specialpurpose/component-load.xml Thu Oct 14 08:19:22 2010 @@ -35,7 +35,7 @@ under the License. <load-component component-location="myportal"/> <load-component component-location="webpos"/> <load-component component-location="crowd"/> - <!-- load-component component-location="ldap"/>--> + <load-component component-location="ldap"/> <!-- <load-component component-location="workflow"/> --> <!-- <load-component component-location="shark"/> --> </component-loader> Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 08:19:22 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1006054 +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1022407 Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Thu Oct 14 08:19:22 2010 @@ -262,6 +262,10 @@ <value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸à¸à¸§à¸²à¸¡</value> <value xml:lang="zh">æç« ä¿¡æ¯</value> </property> + <property key="EcommerceArticleInformation"> + <value xml:lang="en">Article Name</value> + <value xml:lang="th">à¸à¸·à¹à¸à¸à¸à¸à¸§à¸²à¸¡</value> + </property> <property key="EcommerceAssignItems"> <value xml:lang="da">Tildel emne</value> <value xml:lang="en">Assign Items</value> Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogForms.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogForms.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogForms.xml Thu Oct 14 08:19:22 2010 @@ -201,10 +201,10 @@ <alt-target use-when="contentId!=void&&contentId!=null" target="updateBlogArticle"/> <field name="blogContentId"><hidden value="${parameters.blogContentId}"/></field> <field name="contentId" title="${uiLabelMap.EcommerceBlogEntryId}" use-when="contentId!=void&&contentId!=null"><display/></field> - <field name="contentName"><text size="40"/></field> - <field name="description"><textarea cols="40" rows="2"/></field> + <field name="contentName" title="${uiLabelMap.EcommerceArticleName}"><text size="40"/></field> + <field name="description"><textarea cols="60" rows="2"/></field> <field name="summaryData" title="${uiLabelMap.EcommerceSummary}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="4"/></field> - <field name="articleData" title="${uiLabelMap.EcommerceBlogArticle}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="12"/></field> + <field name="articleData" title="${uiLabelMap.EcommerceBlogArticle}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="100" rows="20" visual-editor-enable="true"/></field> <field name="uploadedFile" title="${uiLabelMap.ContentImage}"><file size="25"/></field> <field name="templateDataResourceId" title="${uiLabelMap.ContentTemplate}"> <drop-down> Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogTemplates.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogTemplates.xml?rev=1022411&r1=1022410&r2=1022411&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogTemplates.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogTemplates.xml Thu Oct 14 08:19:22 2010 @@ -34,6 +34,7 @@ <sub-content content-id="${contentId}" map-key="IMAGE" enable-edit-name="enableEdit" edit-request="EditBlogImage?contentContentId=${parameters.contentContentId}&contentContentIdTo=${parameters.contentContentIdTo}&contentDataResourceId=${parameters.contentDataResourceId}&contentContentAssocTypeId=${parameters.contentContentAssocTypeId}&contentFromDate=${parameters.contentFromDate}"/> </container> <sub-content content-id="${contentId}" map-key="MAIN" enable-edit-name="enableEdit" edit-request="EditBlogText?contentContentId=${parameters.contentContentId}&contentContentIdTo=${parameters.contentContentIdTo}&contentDataResourceId=${parameters.contentDataResourceId}&contentContentAssocTypeId=${parameters.contentContentAssocTypeId}&contentFromDate=${parameters.contentFromDate}"/> + <sub-content content-id="${contentId}" map-key="ARTICLE" enable-edit-name="enableEdit" edit-request="EditBlogText?contentContentId=${parameters.contentContentId}&contentContentIdTo=${parameters.contentContentIdTo}&contentDataResourceId=${parameters.contentDataResourceId}&contentContentAssocTypeId=${parameters.contentContentAssocTypeId}&contentFromDate=${parameters.contentFromDate}"/> </widgets> </section> </screen> @@ -47,6 +48,7 @@ <label text="<p/>"/> <label text="<br/>"/> <sub-content content-id="${contentId}" map-key="MAIN" enable-edit-name="enableEdit" edit-request="EditBlogText?contentContentId=${parameters.contentContentId}&contentContentIdTo=${parameters.contentContentIdTo}&contentDataResourceId=${parameters.contentDataResourceId}&contentContentAssocTypeId=${parameters.contentContentAssocTypeId}&contentFromDate=${parameters.contentFromDate}"/> + <sub-content content-id="${contentId}" map-key="ARTICLE" enable-edit-name="enableEdit" edit-request="EditBlogText?contentContentId=${parameters.contentContentId}&contentContentIdTo=${parameters.contentContentIdTo}&contentDataResourceId=${parameters.contentDataResourceId}&contentContentAssocTypeId=${parameters.contentContentAssocTypeId}&contentFromDate=${parameters.contentFromDate}"/> </widgets> </section> </screen> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 08:19:22 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1006054 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1022407 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 08:19:22 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1006054 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1022407 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 14 08:19:22 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1006054 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1022407 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |