From commitswilliam16@example.org Mon Sep 01 09:53:12 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 46527 invoked from network); 1 Sep 2008 09:53:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 09:53:12 -0000 Received: (qmail 8991 invoked by uid 500); 1 Sep 2008 09:53:10 -0000 Delivered-To: william16@example.org Received: (qmail 8841 invoked by uid 500); 1 Sep 2008 09:53:09 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 8832 invoked by uid 99); 1 Sep 2008 09:53:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 02:53:09 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 09:52:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D38BA2388878; Mon, 1 Sep 2008 02:52:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690930 - in /ofbiz/trunk/applications/product: entitydef/entitymodel.xml webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Date: Mon, 01 Sep 2008 09:52:50 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bibryam Date: Mon Sep 1 02:52:49 2008 New Revision: 690930 URL: http://svn.apache.org/viewvc?rev=690930&view=rev Log: Product feature i18n fix from Rashko Rejmer. Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=690930&r1=690929&r2=690930&view=diff ============================================================================== --- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Sep 1 02:52:49 2008 @@ -1401,6 +1401,7 @@ </entity> <entity entity-name="ProductFeatureCategory" package-name="org.ofbiz.product.feature" + default-resource-name="ProductEntityLabels" title="Product Feature Category Entity"> <field name="productFeatureCategoryId" type="id-ne"></field> <field name="parentCategoryId" type="id"></field> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl?rev=690930&r1=690929&r2=690930&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Mon Sep 1 02:52:49 2008 @@ -106,7 +106,7 @@ <option value='${productFeature.productFeatureCategoryId}'>---</option> </#if> <#list productFeatureCategories as productFeatureCategory> - <option value='${productFeatureCategory.productFeatureCategoryId}'>${productFeatureCategory.description} [${productFeatureCategory.productFeatureCategoryId}]</option> + <option value='${productFeatureCategory.productFeatureCategoryId}'>${productFeatureCategory.get("description",locale)?if_exists} [${productFeatureCategory.productFeatureCategoryId}]</option> </#list> </select></td> <td><input type="text" size='10' name="uomId_o_${rowCount}" value="${productFeature.uomId?if_exists}"></td> From commitswilliam16@example.org Mon Sep 01 11:44:33 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 92285 invoked from network); 1 Sep 2008 11:44:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 11:44:33 -0000 Received: (qmail 6049 invoked by uid 500); 1 Sep 2008 11:44:31 -0000 Delivered-To: william16@example.org Received: (qmail 6022 invoked by uid 500); 1 Sep 2008 11:44:31 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 6009 invoked by uid 99); 1 Sep 2008 11:44:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 04:44:31 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 11:43:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0225B2388986; Mon, 1 Sep 2008 04:44:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690942 - in /ofbiz/trunk/applications/ecommerce: script/org/ofbiz/ecommerce/customer/CustomerEvents.xml webapp/ecommerce/WEB-INF/controller.xml Date: Mon, 01 Sep 2008 11:44:11 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mor Date: Mon Sep 1 04:44:10 2008 New Revision: 690942 URL: http://svn.apache.org/viewvc?rev=690942&view=rev Log: Added a new event that set userloginId from an email address. If user edit email address then set it as a new userLoginId and disabled date to far in the future for existing userLoginId. This is a new feature to new profile page. Thanks to Rishi Solanki for this work and Sumit Pandit and Mridul Pathak for review. Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=690942&r1=690941&r2=690942&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Mon Sep 1 04:44:10 2008 @@ -1493,4 +1493,47 @@ <call-simple-method method-name="createUpdateEmailAddress"/> </simple-method> + <simple-method method-name="setUserLoginFromEmail" short-description="Set userloginId from email. If user edit email address then set it as a new userLoginId and disabled date to far in the future for existing userLoginId"> + <if-compare field="parameters.userLoginId" operator="not-equals" value="userLogin.userLoginId"> + <set-service-fields service-name="updateUserLoginId" map-name="parameters" to-map-name="serviceContext"/> + <set field="serviceContext.userLogin" from-field="userLogin"/> + <call-service service-name="updateUserLoginId" in-map-name="serviceContext"> + <result-to-field result-name="newUserLogin"/> + </call-service> + <set-current-user-login value-name="newUserLogin"/> + <call-bsh> + <![CDATA[ + org.ofbiz.webapp.control.LoginWorker.doBasicLogin(newUserLogin, request); + org.ofbiz.webapp.control.LoginWorker.autoLoginSet(request, response); + ]]> + </call-bsh> + <!-- disabledDateTime/disableForYears set time until a user login remains disabled --> + <if-not-empty field="parameters.disabledDateTime"> + <set field="disabledDateTime" from-field="parameters.disabledDateTime" type="Date"/> + <else> + <now-date-to-env env-name="nowTimeStamp"/> + <if-not-empty field="parameters.disableForYear"> + <set-calendar field="disabledDateTime" from-field="nowTimeStamp" years="${parameters.disableForYear}"/> + <else> + <set-calendar field="disabledDateTime" from-field="nowTimeStamp" years="20"/> + </else> + </if-not-empty> + </else> + </if-not-empty> + <set field="loggedInUser.disabledDateTime" from-field="disabledDateTime"/> + <set field="loggedInUser.enabled" value="N"/> + <store-value value-name="loggedInUser"/> + </if-compare> + </simple-method> + + <simple-method method-name="updateProfileAndUserLoginFromEmail" short-description="Update a customer profile and userloginId from email"> + <set field="partyId" from-field="userLogin.partyId"/> + <set field="parameters.userLoginId" from-field="parameters.emailAddress"/> + <set field="loggedInUser" from-field="userLogin"/> + <call-simple-method method-name="createUpdatePerson"/> + <call-simple-method method-name="setUserLoginFromEmail"/> + <call-simple-method method-name="createUpdateUserLogin"/> + <call-simple-method method-name="createUpdateEmailAddress"/> + </simple-method> + </simple-methods> \ No newline at end of file Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=690942&r1=690941&r2=690942&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Sep 1 04:44:10 2008 @@ -1719,6 +1719,8 @@ <request-map uri="updateCustomerProfile"> <security https="true" auth="true"/> <event type="simple" path="org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="updateCustomerProfile"/> + <!-- Use following event only if email address will be used as userLoginId. Updating email address will set it as new userLoginId and disable existing userLoginId --> + <!--event type="simple" path="org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="updateProfileAndUserLoginFromEmail"/--> <response name="success" type="view" value="viewprofile"/> <response name="error" type="view" value="EditProfile"/> </request-map> From commitswilliam16@example.org Mon Sep 01 15:00:20 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 99000 invoked from network); 1 Sep 2008 15:00:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 15:00:20 -0000 Received: (qmail 73289 invoked by uid 500); 1 Sep 2008 15:00:18 -0000 Delivered-To: william16@example.org Received: (qmail 73133 invoked by uid 500); 1 Sep 2008 15:00:18 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 73124 invoked by uid 99); 1 Sep 2008 15:00:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 08:00:18 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 14:59:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 67746238889D; Mon, 1 Sep 2008 07:59:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690988 - /ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Date: Mon, 01 Sep 2008 14:59:59 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hansbak Date: Mon Sep 1 07:59:58 2008 New Revision: 690988 URL: http://svn.apache.org/viewvc?rev=690988&view=rev Log: accept an empty statusId to service updateInvoice when one does not want to change the invoicestatus Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=690988&r1=690987&r2=690988&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Mon Sep 1 07:59:58 2008 @@ -222,13 +222,15 @@ </else> </if-compare> - <!-- check if there is a status change if yes call invoice status update service --> - <if-compare-field field="parameters.statusId" to-field="savedValue.statusId" operator="not-equals"> - <set from-field="parameters.invoiceId" field="inputMap.invoiceId"/> - <set from-field="parameters.statusId" field="inputMap.statusId"/> - <now-timestamp-to-env env-name="inputMap.statusDate"/> - <call-service service-name="setInvoiceStatus" in-map-name="inputMap"/> - </if-compare-field> + <!-- check if there is a requested status change if yes call invoice status update service --> + <if-not-empty field="parameters.statusId"> + <if-compare-field field="parameters.statusId" to-field="savedValue.statusId" operator="not-equals"> + <set from-field="parameters.invoiceId" field="inputMap.invoiceId"/> + <set from-field="parameters.statusId" field="inputMap.statusId"/> + <now-timestamp-to-env env-name="inputMap.statusDate"/> + <call-service service-name="setInvoiceStatus" in-map-name="inputMap"/> + </if-compare-field> + </if-not-empty> </simple-method> <simple-method method-name="sendInvoicePerEmail" short-description="Send an invoice per Email"> From commitswilliam16@example.org Mon Sep 01 15:08:30 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 15572 invoked from network); 1 Sep 2008 15:08:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 15:08:30 -0000 Received: (qmail 80623 invoked by uid 500); 1 Sep 2008 15:08:28 -0000 Delivered-To: william16@example.org Received: (qmail 80594 invoked by uid 500); 1 Sep 2008 15:08:28 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 80585 invoked by uid 99); 1 Sep 2008 15:08:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 08:08:28 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 15:07:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 307E9238889D; Mon, 1 Sep 2008 08:07:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690990 - /ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Date: Mon, 01 Sep 2008 15:07:39 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mor Date: Mon Sep 1 08:07:38 2008 New Revision: 690990 URL: http://svn.apache.org/viewvc?rev=690990&view=rev Log: Tweaking the links on one page checkout. If there is an error during processing information on a panel, replace please wait.... label back to Continue to step # (# = 2,3,4) Patch from Brajesh Patel. Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=690990&r1=690989&r2=690990&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Mon Sep 1 08:07:38 2008 @@ -259,6 +259,8 @@ Effect.Appear('shippingFormServerError'); $('shippingFormServerError').update(serverError); isShipStepValidate = false; + Effect.Appear('editShippingOptions'); + Effect.Fade('processingShippingOptions'); } else { Effect.Fade('shippingFormServerError'); isShipStepValidate = true; @@ -331,6 +333,8 @@ Effect.Appear('shippingOptionFormServerError'); $('shippingOptionFormServerError').update(serverError); isShipOptionStepValidate = false; + Effect.Appear('editBilling'); + Effect.Fade('processingBilling'); } else { Effect.Fade('shippingOptionFormServerError'); isShipOptionStepValidate = true; @@ -380,6 +384,8 @@ Effect.Appear('billingFormServerError'); $('billingFormServerError').update(serverError); isBillStepValidate = false; + Effect.Appear('openOrderSubmitPanel'); + Effect.Fade('processingOrderSubmitPanel'); } else { Effect.Fade('billingFormServerError'); isBillStepValidate = true; From commitswilliam16@example.org Mon Sep 01 15:43:29 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 32723 invoked from network); 1 Sep 2008 15:43:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 15:43:29 -0000 Received: (qmail 17456 invoked by uid 500); 1 Sep 2008 15:43:27 -0000 Delivered-To: william16@example.org Received: (qmail 17421 invoked by uid 500); 1 Sep 2008 15:43:27 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 17412 invoked by uid 99); 1 Sep 2008 15:43:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 08:43:26 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 15:42:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E62A1238889D; Mon, 1 Sep 2008 08:42:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691000 - /ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Date: Mon, 01 Sep 2008 15:42:37 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hansbak Date: Mon Sep 1 08:42:37 2008 New Revision: 691000 URL: http://svn.apache.org/viewvc?rev=691000&view=rev Log: im[prove the timeentries on an invoice overview Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=691000&r1=690999&r2=691000&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Mon Sep 1 08:42:37 2008 @@ -493,9 +493,35 @@ </form> <form name="ListTimeEntries" type="list" list-name="timeEntries" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="invoiceItemSeqId"><display/></field> - <auto-fields-service service-name="updateTimeEntry" default-field-type="display"/> + <row-actions> + <entity-one entity-name="Timesheet" value-name="timesheet"> + <field-map field-name="timesheetId" env-name="timesheetId"/> + </entity-one> + </row-actions> <field name="invoiceId"><hidden/></field> + <field name="invoiceItemSeqId"><display/></field> + <field name="timeEntryId"><display/></field> + <field name="timesheetId" entry-name="timesheet.timesheetId"><hyperlink target="/workeffort/control/EditTimesheet?timesheetId=${timesheetId}" target-type="inter-app" description="${timesheetId}"/></field> + <field name="partyId" entry-name="partyId"> + <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${middleName} ${lastName}"> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description=" [${partyId}]"/> + </display-entity> + </field> + <field name="timesheetPartyId" entry-name="timesheet.partyId"> + <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${middleName} ${lastName}"> + <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${timesheet.partyId}" target-type="inter-app" description=" [${timesheet.partyId}]"/> + </display-entity> + </field> + <field name="hours"><display/></field> + <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field> + <field name="workEffortId"> + <display-entity entity-name="WorkEffort" description="${workEffortName} [${workEffortId}]"> + <sub-hyperlink description=" [${workEffortId}]" target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app"/> + </display-entity> + </field> + <field name="fromDate"><display type="date"/></field> + <field name="thruDate"><display type="date"/></field> + <field name="comments"><display/></field> </form> <form name="lookupInvoicesStatus" type="single" target="BillingAccountInvoices" title="" header-row-style="header-row" default-table-style="basic-table"> From commitswilliam16@example.org Mon Sep 01 15:47:34 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 35136 invoked from network); 1 Sep 2008 15:47:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 15:47:34 -0000 Received: (qmail 23904 invoked by uid 500); 1 Sep 2008 15:47:32 -0000 Delivered-To: william16@example.org Received: (qmail 23757 invoked by uid 500); 1 Sep 2008 15:47:32 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 23748 invoked by uid 99); 1 Sep 2008 15:47:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 08:47:32 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 15:46:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 11390238889D; Mon, 1 Sep 2008 08:47:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691001 - in /ofbiz/trunk: applications/workeffort/script/org/ofbiz/workeffort/timesheet/ specialpurpose/projectmgr/script/org/ofbiz/project/ specialpurpose/projectmgr/servicedef/ specialpurpose/projectmgr/widget/forms/ Date: Mon, 01 Sep 2008 15:47:12 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hansbak Date: Mon Sep 1 08:47:11 2008 New Revision: 691001 URL: http://svn.apache.org/viewvc?rev=691001&view=rev Log: re-generate an invoice from project, to be able to correct errors Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=691001&r1=691000&r2=691001&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original) +++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Mon Sep 1 08:47:11 2008 @@ -121,20 +121,24 @@ <result-to-field result-name="invoiceId" field-name="parameters.invoiceId"/> </call-service> <field-to-result field-name="parameters.invoiceId" result-name="invoiceId"/> - <!-- find the currency of the receiving party --> - <entity-one entity-name="Party" value-name="party"> - <field-map field-name="partyId" value="${invoice.partyId}"/> - </entity-one> - <set field="invoice.currencyUomId" from-field="party.preferredCurrencyUomId"/> - <if-empty field="invoice.currencyUomId"> - <property-to-field field-name="invoice.currencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> - </if-empty> </if-empty> <entity-one entity-name="Invoice" value-name="invoice"/> <if-empty field="invoice"> <add-error><fail-message message="Could not find invoice with ID [${parameters.invoiceId}], not adding Timesheet Entries to it."/></add-error> <check-errors/> </if-empty> + <!-- update currency, can be changed with regenerate --> + <!-- find the currency of the receiving party --> + <entity-one entity-name="Party" value-name="party"> + <field-map field-name="partyId" value="${invoice.partyId}"/> + </entity-one> + <set field="updateInvoiceMap.invoiceId" from-field="parameters.invoiceId"/> + <set field="updateInvoiceMap.currencyUomId" from-field="party.preferredCurrencyUomId"/> + <if-empty field="updateInvoiceMap.currencyUomId"> + <property-to-field field-name="invoice.currencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> + </if-empty> + <call-service service-name="updateInvoice" in-map-name="updateInvoiceMap"/> + <call-simple-method method-name="createTimeEntryInvoiceItemsInline"/> </simple-method> <simple-method method-name="createTimeEntryInvoiceItemsInline" short-description="createTimeEntryInvoiceItemsInline"> @@ -202,6 +206,7 @@ <set field="invoiceItemMap.description" from-field="workEffort.workEffortName"/> </if-empty> <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/> + <clear-field field-name="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created --> <call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap"> <result-to-field result-name="invoiceItemSeqId" field-name="invoiceItemMap.invoiceItemSeqId"/> </call-service> @@ -297,7 +302,6 @@ <set field="rateAmount" from-field="workEffortAssignmentRate.rate"/> </if-not-empty> </if-not-empty> - <!-- no rateAmount yet, try PartyRate if partyId not provided try the timesheet--> <if-empty field="rateAmount"> <if-empty field="timeEntry.partyId"> @@ -323,7 +327,6 @@ <set field="rateAmount" from-field="partyRate.rate"/> </if-not-empty> </if-empty> - <field-to-result field-name="rateAmount"/> </simple-method> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=691001&r1=691000&r2=691001&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Mon Sep 1 08:47:11 2008 @@ -964,6 +964,31 @@ </simple-method> <simple-method method-name="addProjectTimeToNewInvoice" short-description="add all reported time on all completed timesheets from all workefforts for a project"> + + <!-- recreate the invoice if still in preparation in order to correct errors. --> + <if-compare operator="equals" value="Y" field="parameters.reCreate"> + <entity-one entity-name="Invoice" value-name="invoice"/> + <if-empty field="invoice"> + <add-error><fail-message message="Could not find invoice with ID [${parameters.invoiceId}], not adding Timesheet Entries to it."/></add-error> + <check-errors/> + </if-empty> + <if-compare field="invoice.statusId" operator="not-equals" value="INVOICE_IN_PROCESS"> + <add-error><fail-message message="Could not find invoice with ID [${parameters.invoiceId}], not adding Timesheet Entries to it."/></add-error> + <check-errors/> + </if-compare> + <entity-and list-name="entries" entity-name="TimeEntry"> + <field-map field-name="invoiceId" env-name="parameters.invoiceId"/> + </entity-and> + <iterate list-name="entries" entry-name="timeEntry"> + <clear-field field-name="timeEntry.invoiceId"/> + <clear-field field-name="timeEntry.invoiceItemSeqId"/> + <store-value value-name="timeEntry"/> + </iterate> + <set field="removeItems.invoiceId" from-field="parameters.invoiceId"/> + <remove-by-and entity-name="InvoiceItem" map-name="removeItems"/> + <set field="notFirst" value="Y"/><!-- do not create, only add --> + </if-compare> + <log level="always" message="==============invoice items deleted"/> <entity-and entity-name="ProjectAndPhaseAndTask" list-name="tasks"> <field-map field-name="projectId" env-name="parameters.projectId"/> </entity-and> @@ -971,17 +996,21 @@ <if-empty field="notFirst"> <!-- first time so create invoice --> <set-service-fields service-name="addWorkEffortTimeToNewInvoice" map-name="parameters" to-map-name="addtaskToNewInvoice"/> - <set field="addtaskToNewInvoice.workEffortId" from-field="task.workEffortId"/> + <set field="addTaskToNewInvoice.workEffortId" from-field="task.workEffortId"/> <set field="addtaskToNewInvoice.combineInvoiceItem" value="Y"/> - <call-service service-name="addWorkEffortTimeToNewInvoice" in-map-name="addtaskToNewInvoice"> - <result-to-field result-name="invoiceId" field-name="addTaskToInvoice.invoiceId"/> + <set field="addtaskToNewInvoice.invoiceId" from-field="parameters.invoiceId"/> + <call-service service-name="addWorkEffortTimeToNewInvoice" in-map-name="addtaskToNewInvoice"> + <result-to-field result-name="invoiceId" field-name="parameters.invoiceId"/> </call-service> <set field="addTaskToInvoice.combineInvoiceItem" value="Y"/> <set field="notFirst" value="Y"/> - <field-to-result field-name="addTaskToInvoice.invoiceId" result-name="invoiceId"/> + <field-to-result field-name="parameters.invoiceId" result-name="invoiceId"/> <else> <!-- add to created invoice --> + <set field="addTaskToInvoice.combineInvoiceItem" value="Y"/> + <set field="addTaskToInvoice.invoiceId" from-field="parameters.invoiceId"/> <set field="addTaskToInvoice.workEffortId" from-field="task.workEffortId"/> + <log level="always" message="==============add workeffort iwth data ${addTaskToInvoice}"/> <call-service service-name="addWorkEffortTimeToInvoice" in-map-name="addTaskToInvoice"/> </else> </if-empty> Modified: ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml?rev=691001&r1=691000&r2=691001&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml Mon Sep 1 08:47:11 2008 @@ -227,9 +227,10 @@ location="org/ofbiz/project/ProjectServices.xml" invoke="addProjectTimeToNewInvoice"> <description>Add Project Time to a new Invoice</description> <attribute name="projectId" type="String" mode="IN" optional="false"/> - <attribute name="partyIdFrom" type="String" mode="IN" optional="false"/> - <attribute name="partyId" type="String" mode="IN" optional="false"/> - <attribute name="invoiceId" type="String" mode="OUT" optional="true"/> + <attribute name="partyIdFrom" type="String" mode="IN" optional="true"/> + <attribute name="partyId" type="String" mode="IN" optional="true"/> + <attribute name="invoiceId" type="String" mode="INOUT" optional="true"/> + <attribute name="reCreate" type="String" mode="IN" optional="true"/> </service> </services> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=691001&r1=691000&r2=691001&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Mon Sep 1 08:47:11 2008 @@ -518,10 +518,16 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="AddProjectTimeToNewInvoice" target="addProjectTimeToNewInvoice" title="" type="single"> - <field name="combineInvoiceItem"><hidden value="Y"/></field> <field name="projectId"><hidden value="${parameters.projectId}"/></field> <field name="partyIdFrom" title="${uiLabelMap.WorkEffortTimeBillFromParty}"><lookup target-form-name="LookupPartyName"/></field> <field name="partyId" title="${uiLabelMap.WorkEffortTimeBillToParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.clientPartyId}"/></field> + <field name="reCreate"> + <drop-down no-current-selected-key="N"> + <option key="Y" description="Yes"/> + <option key="N" description="No"/> + </drop-down> + </field> + <field name="invoiceId" position="2"><text/></field> <field name="submitButton" title="${uiLabelMap.PageTitleAddProjectTimeToNewInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> \ No newline at end of file From commitswilliam16@example.org Tue Sep 02 04:02:15 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 23995 invoked from network); 2 Sep 2008 04:02:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Sep 2008 04:02:15 -0000 Received: (qmail 33851 invoked by uid 500); 2 Sep 2008 04:02:13 -0000 Delivered-To: william16@example.org Received: (qmail 33823 invoked by uid 500); 2 Sep 2008 04:02:13 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 33813 invoked by uid 99); 2 Sep 2008 04:02:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 21:02:13 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 04:01:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5DA2C2388989; Mon, 1 Sep 2008 21:01:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691101 - in /ofbiz/trunk: applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Date: Tue, 02 Sep 2008 04:01:23 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hansbak Date: Mon Sep 1 21:01:22 2008 New Revision: 691101 URL: http://svn.apache.org/viewvc?rev=691101&view=rev Log: some more corrections on generate an invoice from a project Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=691101&r1=691100&r2=691101&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original) +++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Mon Sep 1 21:01:22 2008 @@ -174,10 +174,12 @@ <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" > <set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/> <get-related value-name="workEffort" relation-name="CustRequestWorkEffort" list-name="custRequestWorkEfforts"/> - <first-from-list entry-name="custRequestWorkEffort" list-name="custRequestWorkEfforts"/> - <get-related-one value-name="custRequestWorkEffort" relation-name="CustRequest" to-value-name="custRequest"/> - <if-not-empty field="custRequest"> - <set field="invoiceItemMap.description" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}]"/> + <if-not-empty field="custRequestWorkEfforts"> + <first-from-list entry-name="custRequestWorkEffort" list-name="custRequestWorkEfforts"/> + <get-related-one value-name="custRequestWorkEffort" relation-name="CustRequest" to-value-name="custRequest"/> + <if-not-empty field="custRequest"> + <set field="invoiceItemMap.description" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}]"/> + </if-not-empty> </if-not-empty> <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/> <clear-field field-name="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created --> @@ -211,11 +213,11 @@ <result-to-field result-name="invoiceItemSeqId" field-name="invoiceItemMap.invoiceItemSeqId"/> </call-service> </if-compare> - - <!-- update the timeentry --> - <set field="timeEntry.invoiceId" from-field="invoiceItemMap.invoiceId"/> - <set field="timeEntry.invoiceItemSeqId" from-field="invoiceItemMap.invoiceItemSeqId"/> - <store-value value-name="timeEntry"/> + <!-- update the time entry --> + <set field="updTimeEntry.timeEntryId" from-field="timeEntry.timeEntryId"/> + <set field="updTimeEntry.invoiceId" from-field="invoiceItemMap.invoiceId"/> + <set field="updTimeEntry.invoiceItemSeqId" from-field="invoiceItemMap.invoiceItemSeqId"/> + <call-service service-name="updateTimeEntry" in-map-name="updTimeEntry"/> <else> <log level="info" message="Timeentry: ${timeEntry.timeEntryId} already connected to invoiceId: ${timeEntry.invoiceId}...not added to invoiceItem"/> </else> @@ -266,9 +268,18 @@ </simple-method> <simple-method method-name="updateTimeEntry" short-description="Update TimeEntry"> <entity-one entity-name="TimeEntry" value-name="lookedUpValue"/> - <call-simple-method method-name="checkTimesheetStatus"/> - <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> - <store-value value-name="lookedUpValue"/> + <!-- allow update of invoiceId and seqId if not yet filled, else check status --> + <if-not-empty field="parameters.invoiceId"> + <if-empty field="lookedUpValue.invoiceId"> + <set field="lookedUpValue.invoiceId" from-field="parameters.invoiceId"/> + <set field="lookedUpValue.invoiceItemSeqId" from-field="parameters.invoiceItemSeqId"/> + <else> + <call-simple-method method-name="checkTimesheetStatus"/> + <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/> + </else> + </if-empty> + </if-not-empty> + <store-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="deleteTimeEntry" short-description="Delete TimeEntry"> <entity-one entity-name="TimeEntry" value-name="lookedUpValue"/> @@ -360,6 +371,4 @@ <check-errors/> </simple-method> - - </simple-methods> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=691101&r1=691100&r2=691101&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Mon Sep 1 21:01:22 2008 @@ -995,11 +995,10 @@ <iterate entry-name="task" list-name="tasks"> <if-empty field="notFirst"> <!-- first time so create invoice --> - <set-service-fields service-name="addWorkEffortTimeToNewInvoice" map-name="parameters" to-map-name="addtaskToNewInvoice"/> + <set-service-fields service-name="addWorkEffortTimeToNewInvoice" map-name="parameters" to-map-name="addTaskToNewInvoice"/> <set field="addTaskToNewInvoice.workEffortId" from-field="task.workEffortId"/> - <set field="addtaskToNewInvoice.combineInvoiceItem" value="Y"/> - <set field="addtaskToNewInvoice.invoiceId" from-field="parameters.invoiceId"/> - <call-service service-name="addWorkEffortTimeToNewInvoice" in-map-name="addtaskToNewInvoice"> + <set field="addTaskToNewInvoice.combineInvoiceItem" value="Y"/> + <call-service service-name="addWorkEffortTimeToNewInvoice" in-map-name="addTaskToNewInvoice"> <result-to-field result-name="invoiceId" field-name="parameters.invoiceId"/> </call-service> <set field="addTaskToInvoice.combineInvoiceItem" value="Y"/> From commitswilliam16@example.org Tue Sep 02 06:33:24 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 6176 invoked from network); 2 Sep 2008 06:33:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Sep 2008 06:33:24 -0000 Received: (qmail 33110 invoked by uid 500); 2 Sep 2008 06:33:22 -0000 Delivered-To: william16@example.org Received: (qmail 33089 invoked by uid 500); 2 Sep 2008 06:33:22 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 33080 invoked by uid 99); 2 Sep 2008 06:33:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 23:33:22 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 06:32:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 01B2E23889BA; Mon, 1 Sep 2008 23:32:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691119 - in /ofbiz/trunk/applications/ecommerce: script/org/ofbiz/ecommerce/customer/CustomerEvents.xml webapp/ecommerce/WEB-INF/controller.xml Date: Tue, 02 Sep 2008 06:32:32 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mor Date: Mon Sep 1 23:32:31 2008 New Revision: 691119 URL: http://svn.apache.org/viewvc?rev=691119&view=rev Log: Used usePrimaryEmailUsername on ProductStore to determine whether to use email for userLoginId or not. Thanks David for suggestion Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=691119&r1=691118&r2=691119&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Mon Sep 1 23:32:31 2008 @@ -1489,12 +1489,17 @@ <simple-method method-name="updateCustomerProfile" short-description="Update a customer profile"> <set field="partyId" from-field="userLogin.partyId"/> <call-simple-method method-name="createUpdatePerson"/> + <if-compare field="productStore.usePrimaryEmailUsername" operator="equals" value="Y"> + <set field="parameters.userLoginId" from-field="parameters.emailAddress"/> + <call-simple-method method-name="setUserLoginFromEmail"/> + </if-compare> <call-simple-method method-name="createUpdateUserLogin"/> <call-simple-method method-name="createUpdateEmailAddress"/> </simple-method> <simple-method method-name="setUserLoginFromEmail" short-description="Set userloginId from email. If user edit email address then set it as a new userLoginId and disabled date to far in the future for existing userLoginId"> <if-compare field="parameters.userLoginId" operator="not-equals" value="userLogin.userLoginId"> + <set field="loggedInUser" from-field="userLogin"/> <set-service-fields service-name="updateUserLoginId" map-name="parameters" to-map-name="serviceContext"/> <set field="serviceContext.userLogin" from-field="userLogin"/> <call-service service-name="updateUserLoginId" in-map-name="serviceContext"> @@ -1525,15 +1530,4 @@ <store-value value-name="loggedInUser"/> </if-compare> </simple-method> - - <simple-method method-name="updateProfileAndUserLoginFromEmail" short-description="Update a customer profile and userloginId from email"> - <set field="partyId" from-field="userLogin.partyId"/> - <set field="parameters.userLoginId" from-field="parameters.emailAddress"/> - <set field="loggedInUser" from-field="userLogin"/> - <call-simple-method method-name="createUpdatePerson"/> - <call-simple-method method-name="setUserLoginFromEmail"/> - <call-simple-method method-name="createUpdateUserLogin"/> - <call-simple-method method-name="createUpdateEmailAddress"/> - </simple-method> - </simple-methods> \ No newline at end of file Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=691119&r1=691118&r2=691119&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Sep 1 23:32:31 2008 @@ -1719,8 +1719,6 @@ <request-map uri="updateCustomerProfile"> <security https="true" auth="true"/> <event type="simple" path="org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="updateCustomerProfile"/> - <!-- Use following event only if email address will be used as userLoginId. Updating email address will set it as new userLoginId and disable existing userLoginId --> - <!--event type="simple" path="org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="updateProfileAndUserLoginFromEmail"/--> <response name="success" type="view" value="viewprofile"/> <response name="error" type="view" value="EditProfile"/> </request-map> From commitswilliam16@example.org Tue Sep 02 12:15:36 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 63862 invoked from network); 2 Sep 2008 12:15:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Sep 2008 12:15:35 -0000 Received: (qmail 71198 invoked by uid 500); 2 Sep 2008 12:15:33 -0000 Delivered-To: william16@example.org Received: (qmail 71159 invoked by uid 500); 2 Sep 2008 12:15:33 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 71150 invoked by uid 99); 2 Sep 2008 12:15:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 05:15:33 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 12:14:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 969FB238887D; Tue, 2 Sep 2008 05:14:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691211 - /ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Date: Tue, 02 Sep 2008 12:14:44 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mor Date: Tue Sep 2 05:14:43 2008 New Revision: 691211 URL: http://svn.apache.org/viewvc?rev=691211&view=rev Log: Code optimization. Thanks Adrian, Ashish for help. Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=691211&r1=691210&r2=691211&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Sep 2 05:14:43 2008 @@ -1517,12 +1517,8 @@ <set field="disabledDateTime" from-field="parameters.disabledDateTime" type="Date"/> <else> <now-date-to-env env-name="nowTimeStamp"/> - <if-not-empty field="parameters.disableForYear"> - <set-calendar field="disabledDateTime" from-field="nowTimeStamp" years="${parameters.disableForYear}"/> - <else> - <set-calendar field="disabledDateTime" from-field="nowTimeStamp" years="20"/> - </else> - </if-not-empty> + <set field="disableForYears" from-field="parameters.disableForYears" default-value="20"/> + <set-calendar field="disabledDateTime" from-field="nowTimeStamp" years="${disableForYears}"/> </else> </if-not-empty> <set field="loggedInUser.disabledDateTime" from-field="disabledDateTime"/> From commitswilliam16@example.org Tue Sep 02 20:11:42 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 10789 invoked from network); 2 Sep 2008 20:11:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Sep 2008 20:11:41 -0000 Received: (qmail 66054 invoked by uid 500); 2 Sep 2008 20:11:39 -0000 Delivered-To: william16@example.org Received: (qmail 66018 invoked by uid 500); 2 Sep 2008 20:11:39 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 66009 invoked by uid 99); 2 Sep 2008 20:11:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 13:11:39 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 20:10:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B735823889C4; Tue, 2 Sep 2008 13:11:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691362 - /ofbiz/trunk/applications/party/entitydef/entitymodel.xml Date: Tue, 02 Sep 2008 20:11:20 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jleroux Date: Tue Sep 2 13:11:19 2008 New Revision: 691362 URL: http://svn.apache.org/viewvc?rev=691362&view=rev Log: Fix an issue in artifactInfo reported by BJ on user ML. It came from my recent cleanup around "VAT code" in product form. Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=691362&r1=691361&r2=691362&view=diff ============================================================================== --- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Tue Sep 2 13:11:19 2008 @@ -444,6 +444,41 @@ <key-map field-name="termTypeId"/> </relation> </entity> + <entity entity-name="AgreementEmploymentAppl" + package-name="org.ofbiz.party.agreement" + title="Agreement Employment Application Entity"> + <field name="agreementId" type="id-ne"></field> + <field name="agreementItemSeqId" type="id-ne"></field> + <field name="partyIdFrom" type="id-ne"></field> + <field name="partyIdTo" type="id-ne"></field> + <field name="roleTypeIdFrom" type="id-ne"></field> + <field name="roleTypeIdTo" type="id-ne"></field> + <field name="fromDate" type="date-time"></field> + <field name="agreementDate" type="date-time"/> + <field name="thruDate" type="date-time"/> + <prim-key field="agreementId"/> + <prim-key field="agreementItemSeqId"/> + <prim-key field="partyIdTo"/> + <prim-key field="partyIdFrom"/> + <prim-key field="roleTypeIdTo"/> + <prim-key field="roleTypeIdFrom"/> + <prim-key field="fromDate"/> + <relation type="one" fk-name="AGRMNT_EMPL_APPL" rel-entity-name="Employment"> + <key-map field-name="roleTypeIdFrom"/> + <key-map field-name="roleTypeIdTo"/> + <key-map field-name="partyIdFrom"/> + <key-map field-name="partyIdTo"/> + <key-map field-name="fromDate"/> + </relation> + <relation type="many" rel-entity-name="Agreement"> + <key-map field-name="agreementId" rel-field-name="partyIdFrom"/> + <key-map field-name="agreementId" rel-field-name="partyIdTo"/> + </relation> + <relation type="one" fk-name="AGRMNT_EMPL_AITM" rel-entity-name="AgreementItem"> + <key-map field-name="agreementId"/> + <key-map field-name="agreementItemSeqId"/> + </relation> + </entity> <view-entity entity-name="AgreementItemAndProductAppl" package-name="org.ofbiz.party.agreement" title="Agreement Item and Agreement Product Applicability View Entity"> @@ -1115,13 +1150,11 @@ <field name="stateProvinceGeoId" type="id"></field> <field name="countyGeoId" type="id"></field> <field name="postalCodeGeoId" type="id"></field> + <field name="geoPointId" type="id"></field> <prim-key field="contactMechId"/> <relation type="one" fk-name="POST_ADDR_CMECH" rel-entity-name="ContactMech"> <key-map field-name="contactMechId"/> </relation> - <relation type="many" rel-entity-name="SimpleSalesTaxLookup"> - <key-map field-name="stateProvinceGeoId"/> - </relation> <relation type="one" fk-name="POST_ADDR_CGEO" title="Country" rel-entity-name="Geo"> <key-map field-name="countryGeoId" rel-field-name="geoId"/> </relation> @@ -1134,6 +1167,9 @@ <relation type="one" fk-name="POST_ADDR_PCGEO" title="PostalCode" rel-entity-name="Geo"> <key-map field-name="postalCodeGeoId" rel-field-name="geoId"/> </relation> + <relation type="one" fk-name="POST_ADDR_GEOPT" title="Geo Point" rel-entity-name="GeoPoint"> + <key-map field-name="geoPointId"/> + </relation> <index name="ADDRESS1_IDX"> <index-field name="address1"/> </index> @@ -2590,39 +2626,19 @@ <key-map field-name="partyId"/> </relation> </extend-entity> - <entity entity-name="AgreementEmploymentAppl" - package-name="org.ofbiz.party.agreement" - title="Agreement Employment Application Entity"> - <field name="agreementId" type="id-ne"></field> - <field name="agreementItemSeqId" type="id-ne"></field> - <field name="partyIdFrom" type="id-ne"></field> - <field name="partyIdTo" type="id-ne"></field> - <field name="roleTypeIdFrom" type="id-ne"></field> - <field name="roleTypeIdTo" type="id-ne"></field> - <field name="fromDate" type="date-time"></field> - <field name="agreementDate" type="date-time"/> - <field name="thruDate" type="date-time"/> - <prim-key field="agreementId"/> - <prim-key field="agreementItemSeqId"/> - <prim-key field="partyIdTo"/> - <prim-key field="partyIdFrom"/> - <prim-key field="roleTypeIdTo"/> - <prim-key field="roleTypeIdFrom"/> - <prim-key field="fromDate"/> - <relation type="one" fk-name="AGRMNT_EMPL_APPL" rel-entity-name="Employment"> - <key-map field-name="roleTypeIdFrom"/> - <key-map field-name="roleTypeIdTo"/> - <key-map field-name="partyIdFrom"/> - <key-map field-name="partyIdTo"/> - <key-map field-name="fromDate"/> - </relation> - <relation type="many" rel-entity-name="Agreement"> - <key-map field-name="agreementId" rel-field-name="partyIdFrom"/> - <key-map field-name="agreementId" rel-field-name="partyIdTo"/> - </relation> - <relation type="one" fk-name="AGRMNT_EMPL_AITM" rel-entity-name="AgreementItem"> - <key-map field-name="agreementId"/> - <key-map field-name="agreementItemSeqId"/> - </relation> + <entity entity-name="PartyGeoPoint" package-name="org.ofbiz.party.party" title="Party Geo Location with history"> + <field name="partyId" type="id-ne"></field> + <field name="geoPointId" type="id-ne"></field> + <field name="fromDate" type="date-time"></field> + <field name="thruDate" type="date-time"></field> + <prim-key field="partyId"/> + <prim-key field="geoPointId"/> + <prim-key field="fromDate"/> + <relation type="one" fk-name="PARTYGEOPT_PARTY" rel-entity-name="Party"> + <key-map field-name="partyId"/> + </relation> + <relation type="one" fk-name="PARTYGEOPT_GEOPT" rel-entity-name="GeoPoint"> + <key-map field-name="geoPointId"/> + </relation> </entity> -</entitymodel> \ No newline at end of file +</entitymodel> From commitswilliam16@example.org Tue Sep 02 20:58:11 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 35545 invoked from network); 2 Sep 2008 20:58:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Sep 2008 20:58:11 -0000 Received: (qmail 34229 invoked by uid 500); 2 Sep 2008 20:58:09 -0000 Delivered-To: william16@example.org Received: (qmail 34204 invoked by uid 500); 2 Sep 2008 20:58:09 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 34195 invoked by uid 99); 2 Sep 2008 20:58:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 13:58:09 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 20:57:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D3661238899E; Tue, 2 Sep 2008 13:57:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691380 - /ofbiz/trunk/applications/party/entitydef/entitymodel.xml Date: Tue, 02 Sep 2008 20:57:50 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jleroux Date: Tue Sep 2 13:57:50 2008 New Revision: 691380 URL: http://svn.apache.org/viewvc?rev=691380&view=rev Log: Some changes related to GeoPoint have slipped in in r691362. I kept the AgreementEmploymentAppl switch as it was not related to GeoPoint and is a good rewriting Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=691380&r1=691379&r2=691380&view=diff ============================================================================== --- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Tue Sep 2 13:57:50 2008 @@ -1150,7 +1150,6 @@ <field name="stateProvinceGeoId" type="id"></field> <field name="countyGeoId" type="id"></field> <field name="postalCodeGeoId" type="id"></field> - <field name="geoPointId" type="id"></field> <prim-key field="contactMechId"/> <relation type="one" fk-name="POST_ADDR_CMECH" rel-entity-name="ContactMech"> <key-map field-name="contactMechId"/> @@ -1167,9 +1166,6 @@ <relation type="one" fk-name="POST_ADDR_PCGEO" title="PostalCode" rel-entity-name="Geo"> <key-map field-name="postalCodeGeoId" rel-field-name="geoId"/> </relation> - <relation type="one" fk-name="POST_ADDR_GEOPT" title="Geo Point" rel-entity-name="GeoPoint"> - <key-map field-name="geoPointId"/> - </relation> <index name="ADDRESS1_IDX"> <index-field name="address1"/> </index> @@ -2626,19 +2622,4 @@ <key-map field-name="partyId"/> </relation> </extend-entity> - <entity entity-name="PartyGeoPoint" package-name="org.ofbiz.party.party" title="Party Geo Location with history"> - <field name="partyId" type="id-ne"></field> - <field name="geoPointId" type="id-ne"></field> - <field name="fromDate" type="date-time"></field> - <field name="thruDate" type="date-time"></field> - <prim-key field="partyId"/> - <prim-key field="geoPointId"/> - <prim-key field="fromDate"/> - <relation type="one" fk-name="PARTYGEOPT_PARTY" rel-entity-name="Party"> - <key-map field-name="partyId"/> - </relation> - <relation type="one" fk-name="PARTYGEOPT_GEOPT" rel-entity-name="GeoPoint"> - <key-map field-name="geoPointId"/> - </relation> - </entity> </entitymodel> From commitswilliam16@example.org Wed Sep 03 06:18:05 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 70847 invoked from network); 3 Sep 2008 06:17:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Sep 2008 06:17:58 -0000 Received: (qmail 38539 invoked by uid 500); 3 Sep 2008 06:17:56 -0000 Delivered-To: william16@example.org Received: (qmail 38513 invoked by uid 500); 3 Sep 2008 06:17:56 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 38503 invoked by uid 99); 3 Sep 2008 06:17:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 23:17:56 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 06:17:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 50260238889D; Tue, 2 Sep 2008 23:17:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691522 - /ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy Date: Wed, 03 Sep 2008 06:17:36 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jleroux Date: Tue Sep 2 23:17:36 2008 New Revision: 691522 URL: http://svn.apache.org/viewvc?rev=691522&view=rev Log: Fix typos in error msgs Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy?rev=691522&r1=691521&r2=691522&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy Tue Sep 2 23:17:36 2008 @@ -77,7 +77,7 @@ try { findByEntity.setString(field.getName(), fval); } catch (NumberFormatException nfe) { - Debug.logError(nfe, "Caught an exception : " + nfe.toString(), "FindGeneric.bsh"); + Debug.logError(nfe, "Caught an exception : " + nfe.toString(), "FindGeneric.groovy"); errMsgList.add("Entered value is non-numeric for numeric field: " + field.getName()); } } @@ -153,12 +153,12 @@ resultEli.close(); } catch (GenericEntityException e) { - Debug.logError(e, "Failure in operation, rolling back transaction", "FindGeneric.bsh"); + Debug.logError(e, "Failure in operation, rolling back transaction", "FindGeneric.groovy"); try { // only rollback the transaction if we started one... TransactionUtil.rollback(beganTransaction, "Error looking up entity values in WebTools Entity Data Maintenance", e); } catch (GenericEntityException e2) { - Debug.logError(e2, "Could not rollback transaction: " + e2.toString(), "FindGeneric.bsh"); + Debug.logError(e2, "Could not rollback transaction: " + e2.toString(), "FindGeneric.groovy"); } // after rolling back, rethrow the exception throw e; From commitswilliam16@example.org Wed Sep 03 07:47:04 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 20440 invoked from network); 3 Sep 2008 07:47:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Sep 2008 07:47:04 -0000 Received: (qmail 26557 invoked by uid 500); 3 Sep 2008 07:47:02 -0000 Delivered-To: william16@example.org Received: (qmail 26538 invoked by uid 500); 3 Sep 2008 07:47:02 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 26529 invoked by uid 99); 3 Sep 2008 07:47:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 00:47:01 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 07:46:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2F3A82388892; Wed, 3 Sep 2008 00:46:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691530 - /ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Date: Wed, 03 Sep 2008 07:46:11 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mor Date: Wed Sep 3 00:46:11 2008 New Revision: 691530 URL: http://svn.apache.org/viewvc?rev=691530&view=rev Log: Fix a small issue. Reported by Chirag Manocha. Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=691530&r1=691529&r2=691530&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Wed Sep 3 00:46:11 2008 @@ -1487,6 +1487,9 @@ </simple-method> <simple-method method-name="updateCustomerProfile" short-description="Update a customer profile"> + <call-class-method class-name="org.ofbiz.product.store.ProductStoreWorker" method-name="getProductStore" ret-field-name="productStore"> + <field field-name="request" type="javax.servlet.ServletRequest"/> + </call-class-method> <set field="partyId" from-field="userLogin.partyId"/> <call-simple-method method-name="createUpdatePerson"/> <if-compare field="productStore.usePrimaryEmailUsername" operator="equals" value="Y"> From commitswilliam16@example.org Wed Sep 03 14:39:28 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 36708 invoked from network); 3 Sep 2008 14:39:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Sep 2008 14:39:27 -0000 Received: (qmail 80752 invoked by uid 500); 3 Sep 2008 14:39:26 -0000 Delivered-To: william16@example.org Received: (qmail 80598 invoked by uid 500); 3 Sep 2008 14:39:25 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 80525 invoked by uid 99); 3 Sep 2008 14:39:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 07:39:25 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 14:38:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5CC432388988; Wed, 3 Sep 2008 07:38:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691626 [1/2] - /ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Date: Wed, 03 Sep 2008 14:38:36 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chrisg Date: Wed Sep 3 07:38:35 2008 New Revision: 691626 URL: http://svn.apache.org/viewvc?rev=691626&view=rev Log: German translation for the manufacturing application Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml From commitswilliam16@example.org Wed Sep 03 14:39:29 2008 Return-Path: <commitswilliam16@example.org> Delivered-To: william16@example.org Received: (qmail 36763 invoked from network); 3 Sep 2008 14:39:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Sep 2008 14:39:29 -0000 Received: (qmail 80867 invoked by uid 500); 3 Sep 2008 14:39:26 -0000 Delivered-To: william16@example.org Received: (qmail 80772 invoked by uid 500); 3 Sep 2008 14:39:26 -0000 Mailing-List: contact william16@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:william16@example.org> List-Unsubscribe: <mailto:william16@example.org> List-Post: <mailto:william16@example.org> List-Id: <commits.ofbiz.apache.org> Reply-To: william16@example.org Delivered-To: mailing list william16@example.org Received: (qmail 80763 invoked by uid 99); 3 Sep 2008 14:39:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 07:39:26 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 14:38:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 66CF123889A0; Wed, 3 Sep 2008 07:38:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r691626 [2/2] - /ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Date: Wed, 03 Sep 2008 14:38:36 -0000 To: william16@example.org From: william16@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <william16@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=691626&r1=691625&r2=691626&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original) +++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Wed Sep 3 07:38:35 2008 @@ -19,6 +19,7 @@ --> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <property key="FormFieldTitle_actualCompletionDate"> + <value xml:lang="de">Ist-Fertigstellungs-Datum</value> <value xml:lang="en">Actual Completion Date</value> <value xml:lang="it">Data Completamento Attuale</value> <value xml:lang="ro">Data Terminare Actuala</value> @@ -26,6 +27,7 @@ <value xml:lang="zh">实际结束日期</value> </property> <property key="FormFieldTitle_actualStartDate"> + <value xml:lang="de">Ist-Start-Datum</value> <value xml:lang="en">Actual Start Date</value> <value xml:lang="it">Data Inizio Attuale</value> <value xml:lang="ro">Data initiere Actuala</value> @@ -33,6 +35,7 @@ <value xml:lang="zh">实际开始日期</value> </property> <property key="FormFieldTitle_allocatedCost"> + <value xml:lang="de">Verrechnete Kosten</value> <value xml:lang="en">Allocated Cost</value> <value xml:lang="it">Costo Allocato</value> <value xml:lang="th">ส่วนแบ่งราคา</value> @@ -43,16 +46,19 @@ <value xml:lang="th">รับรองรหัสผู้ใช้ระบบ</value> </property> <property key="FormFieldTitle_calendarWeekId"> + <value xml:lang="de">Kalenderwoche</value> <value xml:lang="en">Calendar Week Id</value> <value xml:lang="it">Calendario Settmanale</value> <value xml:lang="th">รหัสปฏิทินประจำสัปดาห์</value> </property> <property key="FormFieldTitle_cancelDateTime"> + <value xml:lang="de">Zeitpunkt des Abbruchs</value> <value xml:lang="en">Cancel Date Time</value> <value xml:lang="it">Data/Ora di Annullamento</value> <value xml:lang="th">ยกเลิกวัน เวลา</value> </property> <property key="FormFieldTitle_costCustomMethodId"> + <value xml:lang="de">individuelle Kostenmethode</value> <value xml:lang="en">Cost Custom Method Id</value> <value xml:lang="it">Metodo Costo Personalizzato</value> <value xml:lang="ro">Metoda Cost Personalizat</value> @@ -60,6 +66,7 @@ <value xml:lang="zh">费用客户方法标识</value> </property> <property key="FormFieldTitle_costGlAccountTypeId"> + <value xml:lang="de">Kontenart für Kosten</value> <value xml:lang="en">Cost Gl Account Type Id</value> <value xml:lang="it">Tipo Conto Contabilità Generale</value> <value xml:lang="ro">Tip Cont Contabil General</value> @@ -67,11 +74,13 @@ <value xml:lang="zh">费用总账账户类型标识</value> </property> <property key="FormFieldTitle_defaultYearsOffset"> + <value xml:lang="de">Kontenart für Kosten</value> <value xml:lang="en">Default Years Offset</value> <value xml:lang="it">Scostamento Anni Di Default</value> <value xml:lang="th">ค่าชดเชยปีที่ผิดสัญญา</value> </property> <property key="FormFieldTitle_estimatedCompletionDate"> + <value xml:lang="de">Geschätztes Fertigstellungsdatum</value> <value xml:lang="en">Estimated Completion Date</value> <value xml:lang="it">Data Completamento Stimata</value> <value xml:lang="ro">Data Terminare Stimata</value> @@ -79,11 +88,13 @@ <value xml:lang="zh">预计结束日期</value> </property> <property key="FormFieldTitle_estimatedDuration"> + <value xml:lang="de">Geschätzte Dauer</value> <value xml:lang="en">Estimated Duration</value> <value xml:lang="it">Durata Stimata</value> <value xml:lang="th">ประมาณเวลา</value> </property> <property key="FormFieldTitle_estimatedMilliSeconds"> + <value xml:lang="de">Geschätzte Millisekunden</value> <value xml:lang="en">Estimated Milli Seconds</value> <value xml:lang="it">Milli Secondi Stimati</value> <value xml:lang="ro">Milisecunde Stimate</value> @@ -91,6 +102,7 @@ <value xml:lang="zh">预计毫秒数</value> </property> <property key="FormFieldTitle_estimatedSetupMillis"> + <value xml:lang="de">Geschätzte Rüstzeit (Millisekunden)</value> <value xml:lang="en">Estimated Setup Millis</value> <value xml:lang="it">Configurazione Stimata in Milli secondi</value> <value xml:lang="ro">Configuratie Stimata in Milisecunde</value> @@ -98,6 +110,7 @@ <value xml:lang="zh">预计安装毫秒数</value> </property> <property key="FormFieldTitle_estimatedStartDate"> + <value xml:lang="de">Geschätztes Start-Datum</value> <value xml:lang="en">Estimated Start Date</value> <value xml:lang="it">Data Inizio Stimata</value> <value xml:lang="ro">Data Initiere Stimata</value> @@ -105,16 +118,19 @@ <value xml:lang="zh">预计开始日期</value> </property> <property key="FormFieldTitle_failIfItemsAreNotAvailable"> + <value xml:lang="de">Abbruch falls Komponenten nicht vorhanden</value> <value xml:lang="en">Fail If Items Are Not Available</value> <value xml:lang="it">Fallisce se i Prodotti Non Sono Disponibili</value> <value xml:lang="th">เกิดความผิดพลาดถ้าไม่มีสินค้าอยู่</value> </property> <property key="FormFieldTitle_finishDateTime"> + <value xml:lang="de">Fertigstellungszeit</value> <value xml:lang="en">Finish Date Time</value> <value xml:lang="it">Data/Ora di Termine</value> <value xml:lang="th">วัน เวลาที่เสร็จ</value> </property> <property key="FormFieldTitle_fixedAssetId"> + <value xml:lang="de">Anlagen-Nr.</value> <value xml:lang="en">Fixed Asset Id</value> <value xml:lang="it">Codice Cespite</value> <value xml:lang="ro">Cod Mijloc Fix</value> @@ -122,11 +138,13 @@ <value xml:lang="zh">固定资产标识</value> </property> <property key="FormFieldTitle_fixedAssetTypeId"> + <value xml:lang="de">Anlagen-Art</value> <value xml:lang="en">Fixed Asset Type Id</value> <value xml:lang="it">Tipo Cespite</value> <value xml:lang="th">รหัสประเภทการเปลี่ยนแปลงทรัพย์สิน</value> </property> <property key="FormFieldTitle_fixedCost"> + <value xml:lang="de">Fixkosten</value> <value xml:lang="en">Fixed Cost</value> <value xml:lang="it">Costo Fisso</value> <value xml:lang="ro">Cost Fix</value> @@ -134,16 +152,19 @@ <value xml:lang="zh">固定成本</value> </property> <property key="FormFieldTitle_fridayCapacity"> + <value xml:lang="de">Freitagskapazität</value> <value xml:lang="en">Friday Capacity</value> <value xml:lang="it">Venerdì Capacità</value> <value xml:lang="th">การปฎิบัติหน้าที่ในวันศุกร์</value> </property> <property key="FormFieldTitle_fridayStartTime"> + <value xml:lang="de">Freitagsstartzeit</value> <value xml:lang="en">Friday Start Time</value> <value xml:lang="it">Venerdì Tempo Inizio</value> <value xml:lang="th">เวลาเริ่มต้นในวันศุกร์</value> </property> <property key="FormFieldTitle_issuedQuantity"> + <value xml:lang="de">Ausgegebene Menge</value> <value xml:lang="en">Issued Quantity</value> <value xml:lang="it">Quantità Prelevata</value> <value xml:lang="ro">Cantitate Preluat</value> @@ -151,37 +172,44 @@ <value xml:lang="zh">交付数量</value> </property> <property key="FormFieldTitle_jobId"> + <value xml:lang="de">Job-Nr.</value> <value xml:lang="en">Job Id</value> <value xml:lang="it">Numero Lavoro</value> <value xml:lang="th">รหัสงาน</value> </property> <property key="FormFieldTitle_jobName"> + <value xml:lang="de">Jobname</value> <value xml:lang="en">Job Name</value> <value xml:lang="it">Nome Lavoro</value> <value xml:lang="th">ชื่องาน</value> </property> <property key="FormFieldTitle_manufacturingTask"> + <value xml:lang="de">Arbeitsgang</value> <value xml:lang="en">Manufacturing Task</value> <value xml:lang="it">Operazione</value> <value xml:lang="th">การสร้างงาน</value> </property> <property key="FormFieldTitle_maxRetry"> + <value xml:lang="de">Anzahl Wiederholungsversuche</value> <value xml:lang="en">Max Retry</value> <value xml:lang="it">Tentativi Massimi</value> <value xml:lang="th">ทดสอบใหม่มากสุด </value> </property> <property key="FormFieldTitle_mondayCapacity"> + <value xml:lang="de">Montagskapazität</value> <value xml:lang="en">Monday Capacity</value> <value xml:lang="it">Lunedì Capacità</value> <value xml:lang="th">การปฏิบัติหน้าที่ในวันจันทร์</value> </property> <property key="FormFieldTitle_mondayStartTime"> + <value xml:lang="de">Montagsstartzeit</value> <value xml:lang="en">Monday Start Time</value> <value xml:lang="it">Lunedì Tempo Inizio</value> <value xml:lang="th">เวลาเริ่มต้นในวันจันทร์</value> </property> <property key="FormFieldTitle_offsettingGlAccountTypeId"> + <value xml:lang="de">Verechnungskontenart</value> <value xml:lang="en">Offsetting Gl Account Type Id</value> <value xml:lang="it">Tipo Intervallo Conto Contabilità Generale</value> <value xml:lang="ro">Tip Interval Cont Contabil General</value> @@ -190,6 +218,7 @@ <value xml:lang="zh">冲销总账账户类型标识</value> </property> <property key="FormFieldTitle_perMilliSecond"> + <value xml:lang="de">Pro Millisekunde</value> <value xml:lang="en">Per Milli Second</value> <value xml:lang="it">Per Milli Secondi</value> <value xml:lang="ro">Pe Milisecunde</value> @@ -197,6 +226,7 @@ <value xml:lang="zh">每毫秒</value> </property> <property key="FormFieldTitle_productFeature"> + <value xml:lang="de">Produkt-Merkmal</value> <value xml:lang="en">Product Feature</value> <value xml:lang="it">Caratteristica Prodotto</value> <value xml:lang="ro">Caratteristica Produs</value> @@ -204,6 +234,7 @@ <value xml:lang="zh">产品特性</value> </property> <property key="FormFieldTitle_productId"> + <value xml:lang="de">Produkt-Nr.</value> <value xml:lang="en">Product Id</value> <value xml:lang="it">Codice Prodotto</value> <value xml:lang="ro">Cod Produs</value> @@ -211,6 +242,7 @@ <value xml:lang="zh">产品标识</value> </property> <property key="FormFieldTitle_productIdFor"> + <value xml:lang="de">Produkt-Nr. für</value> <value xml:lang="en">Product Id For</value> <value xml:lang="it">Codice Prodotto Da</value> <value xml:lang="ro">Cod Produs De la</value> @@ -218,6 +250,7 @@ <value xml:lang="zh">产品标识用于</value> </property> <property key="FormFieldTitle_productIdIn"> + <value xml:lang="de">Produkt-Nr. in</value> <value xml:lang="en">Product Id In</value> <value xml:lang="it">Codice Prodotto In</value> <value xml:lang="ro">Cod Produs In</value> @@ -232,6 +265,7 @@ <value xml:lang="zh">产品标识来自实例</value> </property> <property key="FormFieldTitle_productionRuns"> + <value xml:lang="de">Produktionsauftrag</value> <value xml:lang="en">production Runs</value> <value xml:lang="it">Ordini di Produzione</value> <value xml:lang="ro">Comenzi de Productie</value> @@ -239,6 +273,7 @@ <value xml:lang="zh">生产运行</value> </property> <property key="FormFieldTitle_quantityProduced"> + <value xml:lang="de">Produzierte Menge</value> <value xml:lang="en">Quantity Produced</value> <value xml:lang="it">Quantità Prodotta</value> <value xml:lang="ro">Cantitate Produsa</value> @@ -246,6 +281,7 @@ <value xml:lang="zh">已生产的数量</value> </property> <property key="FormFieldTitle_quantityToProduce"> + <value xml:lang="de">Zu produzierende Menge</value> <value xml:lang="en">Quantity To Produce</value> <value xml:lang="it">Quantità Da Produrre</value> <value xml:lang="ro">Cantitate de Produs</value> @@ -253,6 +289,7 @@ <value xml:lang="zh">要生产的数量</value> </property> <property key="FormFieldTitle_requirementStartDate"> + <value xml:lang="de">Bedarfs-Start-Datum</value> <value xml:lang="en">Requirement Start Date</value> <value xml:lang="it">Data Inizio Fabbisogno</value> <value xml:lang="ro">Data Initiala Necesar</value> @@ -260,6 +297,7 @@ <value xml:lang="zh">需求开始日期</value> </property> <property key="FormFieldTitle_routingId"> + <value xml:lang="de">Arbeitsplan-Nr.</value> <value xml:lang="en">routingId</value> <value xml:lang="it">Id Ciclo</value> <value xml:lang="ro">Id Ciclu</value> @@ -267,6 +305,7 @@ <value xml:lang="zh">规程标识</value> </property> <property key="FormFieldTitle_ruleId"> + <value xml:lang="de">Regel-Nr.</value> <value xml:lang="en">Rule Id</value> <value xml:lang="it">Codice Regola</value> <value xml:lang="ro">Cod Regula</value> @@ -274,6 +313,7 @@ <value xml:lang="zh">规则标识</value> </property> <property key="FormFieldTitle_ruleOperator"> + <value xml:lang="de">Regel-Operator</value> <value xml:lang="en">Rule Operator</value> <value xml:lang="it">Regola Operatore</value> <value xml:lang="ro">Regula Operator</value> @@ -281,6 +321,7 @@ <value xml:lang="zh">规则操作符</value> </property> <property key="FormFieldTitle_ruleSeqId"> + <value xml:lang="de">Regel-Folgenummer</value> <value xml:lang="en">Rule Seq Id</value> <value xml:lang="it">Codice Regola Sequenza</value> <value xml:lang="ro">Cod Regula Secventa</value> @@ -288,26 +329,31 @@ <value xml:lang="zh">规则顺序标识</value> </property> <property key="FormFieldTitle_runTime"> + <value xml:lang="de">Laufzeit</value> <value xml:lang="en">Run Time</value> <value xml:lang="it">Orario di Esecuzione</value> <value xml:lang="th">ระยะเวลาดำเนินงาน</value> </property> <property key="FormFieldTitle_saturdayCapacity"> + <value xml:lang="de">Samstagskapazität</value> <value xml:lang="en">Saturday Capacity</value> <value xml:lang="it">Sabato Capacità</value> <value xml:lang="th">การปฏิบัติหน้าที่ในวันเสาร์</value> </property> <property key="FormFieldTitle_saturdayStartTime"> + <value xml:lang="de">Samstagstartzeit</value> <value xml:lang="en">Saturday Start Time</value> <value xml:lang="it">Sabato Tempo Inizio</value> <value xml:lang="th">เวลาเริ่มต้นในวันเสาร์</value> </property> <property key="FormFieldTitle_secondaryLocationSeqId"> + <value xml:lang="de">Zusätzlicher Lagerort</value> <value xml:lang="en">Secondary Location Seq Id</value> <value xml:lang="it">Locazione Secondaria</value> <value xml:lang="th">รหัสสถานที่ตั้งที่สอง</value> </property> <property key="FormFieldTitle_shipmentId"> + <value xml:lang="de">Versand-Nr.</value> <value xml:lang="en">Shipment Id</value> <value xml:lang="it">Numero Spedizione</value> <value xml:lang="ro">Numar Expediere</value> @@ -315,31 +361,37 @@ <value xml:lang="zh">货运标识</value> </property> <property key="FormFieldTitle_startDateTime"> + <value xml:lang="de">Startzeit</value> <value xml:lang="en">Start Date Time</value> <value xml:lang="it">Data/Ora di Inizio</value> <value xml:lang="th">วันเวลาเริ่มต้น</value> </property> <property key="FormFieldTitle_sundayCapacity"> + <value xml:lang="de">Sonntagskapazität</value> <value xml:lang="en">Sunday Capacity</value> <value xml:lang="it">Domenica Capacità</value> <value xml:lang="th">การปฏิบัติงานในวันอาทิตย์</value> </property> <property key="FormFieldTitle_sundayStartTime"> + <value xml:lang="de">Sonntagsstartzeit</value> <value xml:lang="en">Sunday Start Time</value> <value xml:lang="it">Domenica Tempo Inizio</value> <value xml:lang="th">เวลาเริ่มต้นในวันอาทิตย์</value> </property> <property key="FormFieldTitle_thursdayCapacity"> + <value xml:lang="de">Donnerstagskapazität</value> <value xml:lang="en">Thursday Capacity</value> <value xml:lang="it">Giovedì Capacità</value> <value xml:lang="th">การปฏิบัติหน้าที่ในวันพฤหัสบดี</value> </property> <property key="FormFieldTitle_thursdayStartTime"> + <value xml:lang="de">Donnerstagsstartzeit</value> <value xml:lang="en">Thursday Start Time</value> <value xml:lang="it">Giovedì Tempo Inizio</value> <value xml:lang="th">เวลาเริ่มต้นในวันพฤหัสบดี</value> </property> <property key="FormFieldTitle_totIssuedQuantity"> + <value xml:lang="de">Ausgegebene Menge gesamt</value> <value xml:lang="en">Tot Issued Quantity</value> <value xml:lang="it">Totale Quantità Prelevata</value> <value xml:lang="ro">Total Cantitate Preluata</value> @@ -347,6 +399,7 @@ <value xml:lang="zh">全部交付数量</value> </property> <property key="FormFieldTitle_totOrderedQuantity"> + <value xml:lang="de">Bestellmenge gesamt</value> <value xml:lang="en">Tot Ordered Quantity</value> <value xml:lang="it">Totale Quantità Ordinata</value> <value xml:lang="ro">Total Cantitate Comandata</value> @@ -354,6 +407,7 @@ <value xml:lang="zh">全部订单数量</value> </property> <property key="FormFieldTitle_totPlannedQuantity"> + <value xml:lang="de">Geplante Menge gesamt</value> <value xml:lang="en">Tot Planned Quantity</value> <value xml:lang="it">Totale Quantità Pianificata</value> <value xml:lang="ro">Total Cantitate Planificata</value> @@ -361,16 +415,19 @@ <value xml:lang="zh">全部计划数量</value> </property> <property key="FormFieldTitle_tuesdayCapacity"> + <value xml:lang="de">Dienstagskapazität</value> <value xml:lang="en">Tuesday Capacity</value> <value xml:lang="it">Martedì Capacità</value> <value xml:lang="th">การปฏิบัติงานในวันอังคาร</value> </property> <property key="FormFieldTitle_tuesdayStartTime"> + <value xml:lang="de">Dienstagssstartzeit</value> <value xml:lang="en">Tuesday Start Time</value> <value xml:lang="it">Martedì Tempo Inizio</value> <value xml:lang="th">เวลาเริ่มต้นในวันอังคาร</value> </property> <property key="FormFieldTitle_type"> + <value xml:lang="de">Art</value> <value xml:lang="en">Type</value> <value xml:lang="es">Tipo</value> <value xml:lang="it">Tipo</value> @@ -379,6 +436,7 @@ <value xml:lang="zh">类型</value> </property> <property key="FormFieldTitle_variableCost"> + <value xml:lang="de">Variable Kosten</value> <value xml:lang="en">Variable Cost</value> <value xml:lang="it">Costo Variabile</value> <value xml:lang="ro">Cost Variabil</value> @@ -386,16 +444,19 @@ <value xml:lang="zh">可变成本</value> </property> <property key="FormFieldTitle_wednesdayCapacity"> + <value xml:lang="de">Mittwochskapazität</value> <value xml:lang="en">Wednesday Capacity</value> <value xml:lang="it">Mercoledì Capacità</value> <value xml:lang="th">กรปฏิบัติงานในวันพุธ</value> </property> <property key="FormFieldTitle_wednesdayStartTime"> + <value xml:lang="de">Mittwochsstartzeit</value> <value xml:lang="en">Wednesday Start Time</value> <value xml:lang="it">Mercoledì Tempo Inizio</value> <value xml:lang="th">เวลาเริ่มต้นในวันพุธ</value> </property> <property key="FormFieldTitle_workEffortName"> + <value xml:lang="en">Arbeitseinsatzname</value> <value xml:lang="en">Work Effort Name</value> <value xml:lang="it">Nome Impegno di Lavoro</value> <value xml:lang="ro">Nume Sarcina de Lucru</value> @@ -403,6 +464,7 @@ <value xml:lang="zh">人工服务名称</value> </property> <property key="ManufacturingATPDate"> + <value xml:lang="de">ATP-Datum</value> <value xml:lang="en">ATP Date</value> <value xml:lang="es">Fecha ATP</value> <value xml:lang="fr">ATP à date</value> @@ -412,6 +474,7 @@ <value xml:lang="zh">承诺提供日期</value> </property> <property key="ManufacturingActualCompletionDate"> + <value xml:lang="de">Ist-Fertigstellungs-Datum</value> <value xml:lang="en">Completion Date</value> <value xml:lang="es">Fecha de fin real</value> <value xml:lang="fr">Completion Date</value> @@ -421,6 +484,7 @@ <value xml:lang="zh">完成日期</value> </property> <property key="ManufacturingActualCosts"> + <value xml:lang="de">Ist-Kosten</value> <value xml:lang="en">Actual Costs</value> <value xml:lang="es">Costos Reales</value> <value xml:lang="it">Costi Attuali</value> @@ -429,6 +493,7 @@ <value xml:lang="zh">实际花费</value> </property> <property key="ManufacturingActualEndDateTime"> + <value xml:lang="de">Ist-Fertigstellungs-Datum/Zeit</value> <value xml:lang="en">Actual End Date/Time</value> <value xml:lang="es">Fecha/Hora de Fin Real</value> <value xml:lang="it">Data/Ora Fine Attuale</value> @@ -437,11 +502,13 @@ <value xml:lang="zh">实际结束日期/时间</value> </property> <property key="ManufacturingActualMaterials"> + <value xml:lang="de">Ist-Materialien</value> <value xml:lang="en">Actual Materials</value> <value xml:lang="it">Materiali Attuali</value> <value xml:lang="th">ข้อเท็จจริง</value> </property> <property key="ManufacturingActualStartDate"> + <value xml:lang="de">Ist-Start-Datum</value> <value xml:lang="en">Start Date</value> <value xml:lang="es">Fecha de inicio real</value> <value xml:lang="fr">Start Date</value> @@ -451,6 +518,7 @@ <value xml:lang="zh">开始日期</value> </property> <property key="ManufacturingActualStartDateTime"> + <value xml:lang="de">Ist-Start-Zeit</value> <value xml:lang="en">Actual Start Date/Time</value> <value xml:lang="es">Fecha/Hora de Inicio Real</value> <value xml:lang="it">Data/Ora Inizio Attuale</value> @@ -459,6 +527,7 @@ <value xml:lang="zh">实际开始日期/时间</value> </property> <property key="ManufacturingAddExistingRoutingTask"> + <value xml:lang="de">Einen bestehenden Arbeitsgang hinzufügen</value> <value xml:lang="en">Add a existing RoutingTask</value> <value xml:lang="es">Añadir un proceso existente</value> <value xml:lang="fr">Ajouter une opération existante</value> @@ -468,6 +537,7 @@ <value xml:lang="zh">添加一个已存在的规程任务</value> </property> <property key="ManufacturingAddProductionRunFixedAssetAssign"> + <value xml:lang="de">Anlage zuweisen</value> <value xml:lang="en">Assign Fixed Asset</value> <value xml:lang="es">Asignar activo fijo</value> <value xml:lang="it">Assegna Cespite</value> @@ -476,6 +546,7 @@ <value xml:lang="zh">指定固定资产</value> </property> <property key="ManufacturingAddProductionRunProductComponent"> + <value xml:lang="de">Komponente zu Produktionsauftrag hinzufügen</value> <value xml:lang="en">Add ProductComponent to ProductionRun</value> <value xml:lang="es">Añadir componente</value> <value xml:lang="fr">Ajouter un composant à l'O.F.</value> @@ -485,6 +556,7 @@ <value xml:lang="zh">把产品组件添加到生产运行</value> </property> <property key="ManufacturingAddQuantityProduced"> + <value xml:lang="de">Produzierte Menge hinzufügen</value> <value xml:lang="en">Add Qty Produced</value> <value xml:lang="es">Añadir Cant. Producida</value> <value xml:lang="fr">Add Qty Produced</value> @@ -494,6 +566,7 @@ <value xml:lang="zh">添加已生产的数量</value> </property> <property key="ManufacturingAddQuantityRejected"> + <value xml:lang="de">Ausschuss-Menge hinzufügen</value> <value xml:lang="en">Add Qty Rejected</value> <value xml:lang="es">Añadir Cantidad rechazada</value> <value xml:lang="fr">Add Qty Rejected</value> @@ -503,6 +576,7 @@ <value xml:lang="zh">添加已拒绝的数量</value> </property> <property key="ManufacturingAddRoutingTask"> + <value xml:lang="de">Arbeitsgang hinzufügen</value> <value xml:lang="en">Add a RoutingTask</value> <value xml:lang="es">Añadir una ruta</value> <value xml:lang="fr">Ajouter une opération</value> @@ -512,6 +586,7 @@ <value xml:lang="zh">添加一个规程任务</value> </property> <property key="ManufacturingAddSetupTime"> + <value xml:lang="de">Rüstzeit hinzufügen</value> <value xml:lang="en">Add Actual Setup Time</value> <value xml:lang="es">Añadir Tiempo de configuración</value> <value xml:lang="fr">Add Setup Time</value> @@ -521,6 +596,7 @@ <value xml:lang="zh">添加实际安装时间</value> </property> <property key="ManufacturingAddTaskTime"> + <value xml:lang="de">Arbeitsgangzeit hinzufügen</value> <value xml:lang="en">Add Actual Task Time</value> <value xml:lang="es">Añadir Tiempo de Tarea</value> <value xml:lang="fr">Add Task Time</value> @@ -530,6 +606,7 @@ <value xml:lang="zh">添加实际任务时间</value> </property> <property key="ManufacturingAnyMachineGroup"> + <value xml:lang="de">Beliebige Maschinengruppe</value> <value xml:lang="en">Any Fixed Asset Group</value> <value xml:lang="es">Cualquier grupo de máquinas</value> <value xml:lang="fr">Tous les groupes de machine</value> @@ -539,16 +616,19 @@ <value xml:lang="zh">任一固定资产组</value> </property> <property key="ManufacturingApproveRequirements"> + <value xml:lang="de">Bedarfe bestätigen</value> <value xml:lang="en">Approve Requirements</value> <value xml:lang="es">Aprovar Requerimientos</value> <value xml:lang="th">ความต้องการที่ตรงกัน</value> </property> <property key="ManufacturingAssociatedProductionRuns"> + <value xml:lang="de">Zugehörige Produktionsaufträge</value> <value xml:lang="en">Associated Production Runs</value> <value xml:lang="it">Ordini di Produzione Associati</value> <value xml:lang="th">สินค้าที่เกี่ยวข้องกัน</value> </property> <property key="ManufacturingBillOfMaterials"> + <value xml:lang="de">Stückliste</value> <value xml:lang="en">Bill Of Materials</value> <value xml:lang="es">BOM</value> <value xml:lang="fr">Nomenclature</value> @@ -558,6 +638,7 @@ <value xml:lang="zh">物料清单</value> </property> <property key="ManufacturingBomSimulation"> + <value xml:lang="de">Stücklistensimulation</value> <value xml:lang="en">Bom Simulation</value> <value xml:lang="es">Simulación de BOM</value> <value xml:lang="fr">Bom Simulation</value> @@ -567,6 +648,7 @@ <value xml:lang="zh">物料清单仿真</value> </property> <property key="ManufacturingBomType"> + <value xml:lang="de">Stücklistenart</value> <value xml:lang="en">Bom Type</value> <value xml:lang="es">Tipo de BOM</value> <value xml:lang="fr">Bom Type</value> @@ -576,6 +658,7 @@ <value xml:lang="zh">物料清单类型</value> </property> <property key="ManufacturingCalendar"> + <value xml:lang="de">Kalender</value> <value xml:lang="en">Calendar</value> <value xml:lang="es">Calendario</value> <value xml:lang="fr">Calendrier</value> @@ -585,6 +668,7 @@ <value xml:lang="zh">日历</value> </property> <property key="ManufacturingCalendarCapacity"> + <value xml:lang="de">Fertigung-Kalender-Kapazität</value> <value xml:lang="en">Manufacturing Calendar Capacity</value> <value xml:lang="es">Capaidad del calendario</value> <value xml:lang="fr">Durée</value> @@ -594,6 +678,7 @@ <value xml:lang="zh">工作时间长度(毫秒)</value> </property> <property key="ManufacturingCalendarExceptionDate"> + <value xml:lang="de">Ausnahme-Datum</value> <value xml:lang="en">Exception Day</value> <value xml:lang="es">Fecha de excepción</value> <value xml:lang="fr">Exception jour</value> @@ -603,6 +688,7 @@ <value xml:lang="zh">非工作日</value> </property> <property key="ManufacturingCalendarExceptionDayIdAlreadyExist"> + <value xml:lang="de">Ausnahme-Tag existiert schon</value> <value xml:lang="en">Manufacturing Calendar Exception Day Id Already Exist</value> <value xml:lang="es">El código de excepción ya existe</value> <value xml:lang="fr">Il n'est pas possible définir deux exceptions le même jour.</value> @@ -613,6 +699,7 @@ <value xml:lang="zh">非工作日标识已存在</value> </property> <property key="ManufacturingCalendarExceptionDayUseCalendar"> + <value xml:lang="de">Es gibt noch einen Ausnahme-Tag für diesen Kalender</value> <value xml:lang="en">There is still an exception day for this calendar</value> <value xml:lang="es">Aún hay una excepción para este calendario</value> <value xml:lang="fr">Il existe encore une exception jour pour ce calendrier</value> @@ -622,6 +709,7 @@ <value xml:lang="zh">这个日历还有一个非工作日</value> </property> <property key="ManufacturingCalendarExceptionWeek"> + <value xml:lang="de">Ausnahme-Woche</value> <value xml:lang="en">Exception Week</value> <value xml:lang="es">Semana de excepción</value> <value xml:lang="fr">Exception semaine</value> @@ -631,6 +719,7 @@ <value xml:lang="zh">非工作周</value> </property> <property key="ManufacturingCalendarExceptionWeekIdAlreadyExist"> + <value xml:lang="de">Es gibt schon eine Ausnahme-Woche für diesen Kalender</value> <value xml:lang="en">Manufacturing Calendar Exception Week Id Already Exist</value> <value xml:lang="es">El código ya existe</value> <value xml:lang="fr">Il n'est pas possible définir deux exceptions semaine le même jour.</value> @@ -641,6 +730,7 @@ <value xml:lang="zh">非工作周标识已存在</value> </property> <property key="ManufacturingCalendarExceptionWeekUseCalendar"> + <value xml:lang="de">Es gibt noch eine Ausnahme-Woche für diesen Kalender</value> <value xml:lang="en">There is still an exception week for this calendar</value> <value xml:lang="es">Aún hay una semana excepción para este calendario</value> <value xml:lang="fr">Il existe encore une exception semaine pour ce calendrier</value> @@ -650,6 +740,7 @@ <value xml:lang="zh">这个日历还有一个非工作周</value> </property> <property key="ManufacturingCalendarId"> + <value xml:lang="de">Kalender-Nr.</value> <value xml:lang="en">Calendar ID</value> <value xml:lang="es">Calendario</value> <value xml:lang="fr">Identifiant calendrier</value> @@ -659,6 +750,7 @@ <value xml:lang="zh">日历标识</value> </property> <property key="ManufacturingCalendarIdAlreadyExist"> + <value xml:lang="de">Kalender-Nr. schon vorhanden</value> <value xml:lang="en">Calendar Id already exist</value> <value xml:lang="es">El código ya existe</value> <value xml:lang="fr">L'identifiant du calendrier existe déja</value> @@ -668,6 +760,7 @@ <value xml:lang="zh">日历标识已存在</value> </property> <property key="ManufacturingCalendarPermissionError"> + <value xml:lang="de">Sie haben keine Berechtigung diese Seite anzuschauen ("MANUFACTURING_VIEW" oder "MANUFACTURING_ADMIN" wird benötigt)</value> <value xml:lang="en">You do not have permission to view this page. ("MANUFACTURING_VIEW" or "MANUFACTURING_ADMIN" needed)</value> <value xml:lang="es">Usted no tiene permiso para ver esta página. Necesita los permisos "MANUFACTURING_VIEW" o "MANUFACTURING_ADMIN"</value> <value xml:lang="fr">Erreur sécurité : pour effectuer une opération sur un calendrier, il faut avoir la permission MANUFACTURING_CREATE ou MANUFACTURING_ADMIN.</value> @@ -677,6 +770,7 @@ <value xml:lang="zh">你没有权限浏览这个页面。(需要"MANUFACTURING_VIEW"或"MANUFACTURING_ADMIN")</value> </property> <property key="ManufacturingCalendarUseCalendarWeek"> + <value xml:lang="de">Es gibt noch einen Kalender der diese Woche nutzt</value> <value xml:lang="en">There is still an calendar which use this week</value> <value xml:lang="es">Hay un calendario que usa esta semana</value> <value xml:lang="fr">Il existe un calendrier qui utilise encore cette semaine</value> @@ -686,6 +780,7 @@ <value xml:lang="zh">还有一个日历使用了这个周</value> </property> <property key="ManufacturingCalendarWeek"> + <value xml:lang="de">Woche</value> <value xml:lang="en">Week</value> <value xml:lang="es">Semana</value> <value xml:lang="fr">Semaine</value> @@ -695,6 +790,7 @@ <value xml:lang="zh">周</value> </property> <property key="ManufacturingCalendarWeekExceptionUseCalendarWeek"> + <value xml:lang="de">Es gibt noch eine Ausnehme die diese Woche nutzt</value> <value xml:lang="en">There is still an exception week which use this week</value> <value xml:lang="es">Hay una semana de excepción que usa esta semana</value> <value xml:lang="fr">Il existe encore une exception
{'source': 'Apache Software Foundation Public Mail Archives'}