You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by di...@apache.org on 2016/11/05 14:34:02 UTC
svn commit: r1768222 [8/8] - in /ofbiz/trunk:
applications/accounting/minilang/ applications/accounting/minilang/admin/
applications/accounting/minilang/budget/
applications/accounting/minilang/finaccount/
applications/accounting/minilang/invoice/ appl...
Modified: ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/CommonScreens.xml Sat Nov 5 14:34:00 2016
@@ -383,7 +383,7 @@ under the License.
<section>
<condition><not><if-empty field="partyId"/></not></condition>
<widgets>
- <include-menu location="component://scrum/widget/scrumMenus.xml" name="ResourceTabBar"/>
+ <include-menu name="ResourceTabBar" location="component://scrum/widget/scrumMenus.xml"/>
<container>
<section>
<widgets>
Modified: ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/ResourceForms.xml Sat Nov 5 14:34:00 2016
@@ -179,8 +179,8 @@
<field name="userLoginId"><hidden/></field>
<field name="userPrefValue" title="Enable">
<drop-down allow-empty="false" no-current-selected-key="Y">
- <option key="N" description="No"/>
- <option key="Y" description="Yes"/>
+ <option key="No" description="N"/>
+ <option key="Yes" description="Y"/>
</drop-down>
</field>
<field name="submit" title="${uiLabelMap.CommonSubmit}"><submit/></field>
@@ -296,7 +296,7 @@
<alt-target use-when="product!=null" target="UpdateCompanyAndOwner"/>
<field name="partyId" title="${uiLabelMap.ScrumCompanyAndPerson}" tooltip="${uiLabelMap.ScrumCompanyNameShow} - ${uiLabelMap.ScrumProductName}" event="onchange" action="javascript:document.UpdateCompanyAndOwner.partyCompany.value=this.options[this.selectedIndex].text;" parameter-name="partyId" use-when="companyCurrent!=null">
<drop-down allow-empty="false" current-description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}" >
- <option key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})" description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}"/>
+ <option key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}" description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})"/>
<option key="" description=""/>
<list-options list-name="scrumRolesPersonAndCompanyList" description="${groupName}[${partyIdFrom}] - ${lastName} ${firstName} ${middleName}" key-name="partyId"/>
</drop-down>
Modified: ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/TaskForms.xml Sat Nov 5 14:34:00 2016
@@ -779,8 +779,8 @@
</field>
<field name="unplannedFlag" position="2" title="${uiLabelMap.ScrumUnplanBacklog}">
<drop-down allow-empty="true" >
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml Sat Nov 5 14:34:00 2016
@@ -501,8 +501,8 @@ under the License.
<field name="workEffortName" title="${uiLabelMap.ScrumProjectName}"><text/></field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" map-name="workEffAttMap">
<drop-down allow-empty="true">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="currentStatusId" use-when="workEffortId==null"><hidden value="SPJ_ACTIVE"/></field>
@@ -697,14 +697,14 @@ under the License.
<field name="custSequenceNum" title="${uiLabelMap.CommonSequenceNum}" use-when="custRequest!=null&&isTeamMember==true"><display/></field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" use-when="custRequest==null">
<drop-down allow-empty="false" no-current-selected-key="Y">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" use-when="custRequest!=null&&isTeamMember==false&&projectBilled==null">
<drop-down allow-empty="false" no-current-selected-key="Y">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" use-when="custRequest!=null&&isTeamMember==false&&projectBilled!=null" tooltip="${uiLabelMap.ScrumSetOnProjectLevel}">
@@ -713,8 +713,8 @@ under the License.
<field name="billed" title="${uiLabelMap.ScrumBilled}" use-when="custRequest!=null&&isTeamMember==true"><display/></field>
<field name="custRequestTypeId" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="isTeamMember==false">
<drop-down allow-empty="false" no-current-selected-key="N">
- <option key="RF_UNPLAN_BACKLOG" description="${uiLabelMap.CommonY}"/>
- <option key="RF_PROD_BACKLOG" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="RF_UNPLAN_BACKLOG"/>
+ <option key="${uiLabelMap.CommonN}" description="RF_PROD_BACKLOG"/>
</drop-down>
</field>
<field name="custRequestTypeId" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="custRequest!=null&&isTeamMember==true">
@@ -722,8 +722,8 @@ under the License.
</field>
<field name="unplannedFlag" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="custRequest==null">
<drop-down allow-empty="false" no-current-selected-key="N">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" use-when="custRequest!=null">
@@ -806,14 +806,14 @@ under the License.
</field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" position="2">
<drop-down allow-empty="true" current-description="" >
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="custRequestTypeId" title="${uiLabelMap.ScrumPlanned}">
<drop-down allow-empty="true">
- <option key="RF_PROD_BACKLOG" description="${uiLabelMap.CommonY}"/>
- <option key="RF_UNPLAN_BACKLOG" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="RF_PROD_BACKLOG"/>
+ <option key="${uiLabelMap.CommonN}" description="RF_UNPLAN_BACKLOG"/>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
@@ -863,14 +863,14 @@ under the License.
</field>
<field name="custRequestTypeId" title="${uiLabelMap.ScrumPlanned}">
<drop-down allow-empty="true">
- <option key="RF_PROD_BACKLOG" description="${uiLabelMap.CommonY}"/>
- <option key="RF_UNPLAN_BACKLOG" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="RF_PROD_BACKLOG"/>
+ <option key="${uiLabelMap.CommonN}" description="RF_UNPLAN_BACKLOG"/>
</drop-down>
</field>
<field name="billed" title="${uiLabelMap.ScrumBilled}" position="2">
<drop-down allow-empty="true" current-description="" >
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
@@ -1471,7 +1471,7 @@ under the License.
</field>
<field name="partyId" title="${uiLabelMap.ScrumCompanyAndProductOwner}" tooltip="${uiLabelMap.ScrumCompanyNameShow} - ${uiLabelMap.ScrumProductName}" event="onchange" action="javascript:document.EditProduct.partyCompany.value=this.options[this.selectedIndex].text;" parameter-name="partyId" use-when="companyCurrent!=null">
<drop-down allow-empty="false" current-description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}" >
- <option key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})" description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}"/>
+ <option key="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}" description="${companyCurrentList[0].groupName}[${companyCurrentList[0].partyIdFrom}] - ${companyCurrentList[0].lastName} ${companyCurrentList[0].firstName} ${companyCurrentList[0].middleName}(${companyCurrentList[0].partyId})"/>
<option key="" description=""/>
<list-options list-name="scrumRolesPersonAndCompanyList" description="${groupName}[${partyIdFrom}] - ${lastName} ${firstName} ${middleName}" key-name="partyId"/>
</drop-down>
@@ -1686,7 +1686,7 @@ under the License.
<field name="internalName" title="${uiLabelMap.ScrumProductName}"><text/></field>
<field name="statusId" parameter-name="statusId">
<drop-down allow-empty="false">
- <option key="Any" description="${uiLabelMap.CommonAny}"/>
+ <option key="${uiLabelMap.CommonAny}" description="Any"/>
<entity-options entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="PRODUCT_STATUS"/>
</entity-options>
@@ -1812,8 +1812,8 @@ under the License.
<field name="backlogId" parameter-name="custRequestId" use-when="${groovy:showPosition1==false}"><hidden value="${custRequestId}"/></field>
<field name="billed" position="1" use-when="${groovy:showPosition1==true}" title="${uiLabelMap.ScrumBilled}">
<drop-down allow-empty="true">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="dummy1" title=" " position="1" use-when="${groovy:showPosition1==true}"><display description=" "/></field>
@@ -1853,8 +1853,8 @@ under the License.
</field>
<field name="reCreate" position="1" title="${uiLabelMap.ScrumRecreateInvoice}: ${invoiceId}" use-when="context.get("invoiceId")!=null">
<drop-down no-current-selected-key="N">
- <option key="Y" description="${uiLabelMap.CommonYes}"/>
- <option key="N" description="${uiLabelMap.CommonNo}"/>
+ <option key="${uiLabelMap.CommonYes}" description="Y"/>
+ <option key="${uiLabelMap.CommonNo}" description="N"/>
</drop-down>
</field>
<field name="invoiceDate" title="${uiLabelMap.ScrumInvoiceDate}" use-when="context.get("invoiceId")!=null"><date-time type="date"></date-time></field>
@@ -2826,15 +2826,15 @@ under the License.
<field name="description" title="${uiLabelMap.ScrumProductBacklogItem}" required-field="true"><text size="50" maxlength="255"/></field>
<field name="billed" title="${uiLabelMap.ScrumBilled}">
<drop-down allow-empty="false" no-current-selected-key="Y">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
+ <option key="${uiLabelMap.CommonY}" description="Y"/>
+ <option key="${uiLabelMap.CommonN}" description="N"/>
</drop-down>
</field>
<field name="unplanned" title="${uiLabelMap.ScrumUnplanBacklog}" event="onchange" action="javascript:document.QuickAddBacklog.action='QuickAddBacklog';document.QuickAddBacklog.submit();" required-field="true">
<drop-down allow-empty="false">
<option key="" description="- ${uiLabelMap.CommonSelectOne} -"/>
- <option key="Y" description="${uiLabelMap.CommonYes}"/>
- <option key="N" description="${uiLabelMap.CommonNo}"/>
+ <option key="${uiLabelMap.CommonYes}" description="Y"/>
+ <option key="${uiLabelMap.CommonNo}" description="N"/>
</drop-down>
</field>
<field name="productId" title="${uiLabelMap.ScrumProductName}" use-when="${groovy: unplanned.equals("Y")}" event="onchange" action="javascript:document.QuickAddBacklog.action='QuickAddBacklog';document.QuickAddBacklog.submit();"
Modified: ofbiz/trunk/specialpurpose/solr/entitydef/eecas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/entitydef/eecas.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/entitydef/eecas.xml (original)
+++ ofbiz/trunk/specialpurpose/solr/entitydef/eecas.xml Sat Nov 5 14:34:00 2016
@@ -37,15 +37,15 @@ xsi:noNamespaceSchemaLocation="http://of
<action service="addToSolr" mode="sync" value-attr="instance"/>
</eca>
<eca entity="ProductPrice" operation="create-store-remove" event="return">
- <condition operator="equals" field-name="productPriceTypeId" value="LIST_PRICE"/>
+ <condition field-name="productPriceTypeId" operator="equals" value="LIST_PRICE"/>
<action service="addToSolr" mode="sync" value-attr="instance"/>
</eca>
<eca entity="ProductPrice" operation="create-store-remove" event="return">
- <condition operator="equals" field-name="productPriceTypeId" value="DEFAULT_PRICE"/>
+ <condition field-name="productPriceTypeId" operator="equals" value="DEFAULT_PRICE"/>
<action service="addToSolr" mode="sync" value-attr="instance"/>
</eca>
<eca entity="ProductPrice" operation="create-store-remove" event="return">
- <condition operator="equals" field-name="productPriceTypeId" value="DEFAULT_PRICE"/>
+ <condition field-name="productPriceTypeId" operator="equals" value="DEFAULT_PRICE"/>
<action service="addToSolr" mode="sync" value-attr="instance"/>
</eca>
-->
Modified: ofbiz/trunk/specialpurpose/webpos/minilang/ManagerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/minilang/ManagerEvents.xml?rev=1768222&r1=1768221&r2=1768222&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/minilang/ManagerEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/minilang/ManagerEvents.xml Sat Nov 5 14:34:00 2016
@@ -45,7 +45,7 @@ under the License.
<add-error><fail-property resource="WebPosUiLabels" property="WebPosManagerOpenTerminalDrawingAmountNotValid"/></add-error>
<check-errors/>
<else>
- <make-value value-field="terminalState" entity-name="PosTerminalState"/>
+ <make-value entity-name="PosTerminalState" value-field="terminalState"/>
<call-object-method obj-field="webPosSession" method-name="getId" ret-field="terminalState.posTerminalId"/>
<call-class-method class-name="org.apache.ofbiz.base.util.UtilDateTime" method-name="nowTimestamp" ret-field="terminalState.openedDate"/>
<call-object-method obj-field="webPosSession" method-name="getUserLoginId" ret-field="terminalState.openedByUserLoginId"/>
@@ -310,7 +310,7 @@ under the License.
</simple-map-processor>
</call-map-processor>
<if-not-empty field="context.amountInOut">
- <make-value value-field="internTx" entity-name="PosTerminalInternTx"/>
+ <make-value entity-name="PosTerminalInternTx" value-field="internTx"/>
<call-object-method obj-field="webPosTransaction" method-name="getTerminalLogId" ret-field="internTx.posTerminalLogId"/>
<set field="internTx.paidAmount" from-field="context.amountInOut" type="BigDecimal"/>
<set field="internTx.reasonComment" from-field="parameters.reasonCommentInOut"/>