svn commit: r582480 - in /ofbiz/trunk/applications: accounting/webapp/accounting/W
Locked
svn commit: r582480 - in /ofbiz/trunk/applications: accounting/webapp/accounting/W
 
|
Author: jleroux
Date: Sat Oct 6 05:01:17 2007 New Revision: 582480 URL: http://svn.apache.org/viewvc?rev=582480&view=rev Log: A patch from Bilgin Ibryam "trivial, not related to each other, mostly UI, bug fixes " (https://issues.apache.org/jira/browse/OFBIZ-1231) - OFBIZ-1231 Thanks to Jonathon for review and test ! Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml ofbiz/trunk/applications/party/servicedef/services.xml ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=582480&r1=582479&r2=582480&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sat Oct 6 05:01:17 2007 @@ -1407,6 +1407,7 @@ <!-- ================ Entity Lookup Requests ================= --> <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map> + <request-map uri="LookupProductFeature"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductFeature"/></request-map> <request-map uri="LookupVariantProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupVariantProduct"/></request-map> <request-map uri="LookupProductCategory"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductCategory"/></request-map> <request-map uri="LookupProductStore"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductStore"/></request-map> @@ -1592,6 +1593,7 @@ <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/> + <view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/> <view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/> <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/> <view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=582480&r1=582479&r2=582480&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Sat Oct 6 05:01:17 2007 @@ -53,7 +53,7 @@ </entity-options> </drop-down> </field> - <field name="instanceOfProductId" title="${uiLabelMap.CommonEmptyHeader}"><lookup target-form-name="LookupProduct"/></field> + <field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field> <field name="classEnumId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> @@ -86,10 +86,8 @@ </drop-down> </field> <field name="parentFixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> - <field name="locatedAtFacilityId" title="${uiLabelMap.CommonEmptyHeader}"><lookup target-form-name="LookupFacility"/></field> - <field name="locatedAtLocationSeqId" title="${uiLabelMap.CommonEmptyHeader}"><lookup target-form-name="LookupFacilityLocation"/></field> - <field name="locatedAtFacilityId" title="${uiLabelMap.CommonEmptyHeader}"><lookup target-form-name="LookupFacility"/></field> - <field name="locatedAtLocationSeqId" title="${uiLabelMap.CommonEmptyHeader}"><lookup target-form-name="LookupFacilityLocation"/></field> + <field name="locatedAtFacilityId"><lookup target-form-name="LookupFacility"/></field> + <field name="locatedAtLocationSeqId"><lookup target-form-name="LookupFacilityLocation"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=582480&r1=582479&r2=582480&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Oct 6 05:01:17 2007 @@ -1503,6 +1503,7 @@ <request-map uri="LookupProductAndPrice"><security https="true" auth="true"/><response name="success" type="view" value="LookupProductAndPrice"/></request-map> <request-map uri="LookupProductFeature"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductFeature"/></request-map> <request-map uri="LookupUserLoginAndPartyDetails"><security https="true" auth="true"/><response name="success" type="view" value="LookupUserLoginAndPartyDetails"/></request-map> + <request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupPreferredContactMech"/></request-map> <request-map uri="LookupVariantProduct"><security https="true" auth="true"/><response name="success" type="view" value="LookupVariantProduct"/></request-map> <request-map uri="LookupFacility"><security https="true" auth="true"/><response name="success" type="view" value="LookupFacility"/></request-map> @@ -1715,6 +1716,7 @@ <view-map name="LookupProductAndPrice" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductAndPrice"/> <view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/> <view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/> + <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/> <view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/> <view-map name="LookupFacility" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacility"/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=582480&r1=582479&r2=582480&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Sat Oct 6 05:01:17 2007 @@ -199,6 +199,9 @@ <field name="fromPartyId" title="${uiLabelMap.OrderRequestingParty}"> <lookup target-form-name="LookupPartyName"/> </field> + <field name="fulfillContactMechId"> + <lookup target-form-name="LookupPreferredContactMech" target-parameter="fromPartyId"/> + </field> <field name="createdDate"><hidden/></field> <field name="createdByUserLogin"><hidden/></field> <field name="lastModifiedDate"><hidden/></field> Modified: ofbiz/trunk/applications/party/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=582480&r1=582479&r2=582480&view=diff ============================================================================== --- ofbiz/trunk/applications/party/servicedef/services.xml (original) +++ ofbiz/trunk/applications/party/servicedef/services.xml Sat Oct 6 05:01:17 2007 @@ -101,6 +101,8 @@ <auto-attributes mode="IN" include="nonpk" optional="true"/> <attribute name="preferredCurrencyUomId" type="String" mode="IN" optional="true"/> <attribute name="description" type="String" mode="IN" optional="true"/> + <override name="firstName" optional="false"/> + <override name="lastName" optional="false"/> </service> <service name="createPartyGroup" engine="java" default-entity-name="PartyGroup" location="org.ofbiz.party.party.PartyServices" invoke="createPartyGroup" auth="false"> Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=582480&r1=582479&r2=582480&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java Sat Oct 6 05:01:17 2007 @@ -146,6 +146,10 @@ statusId = "PARTY_ENABLED"; } Map newPartyMap = UtilMisc.toMap("partyId", partyId, "partyTypeId", "PERSON", "description", description, "createdDate", now, "lastModifiedDate", now, "statusId", statusId); + String preferredCurrencyUomId = (String) context.get("preferredCurrencyUomId"); + if (!UtilValidate.isEmpty(preferredCurrencyUomId)) { + newPartyMap.put("preferredCurrencyUomId", preferredCurrencyUomId); + } if (userLogin != null) { newPartyMap.put("createdByUserLogin", userLogin.get("userLoginId")); newPartyMap.put("lastModifiedByUserLogin", userLogin.get("userLoginId")); Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=582480&r1=582479&r2=582480&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sat Oct 6 05:01:17 2007 @@ -28,6 +28,8 @@ <field use-when="person!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="person==null&&partyId==null" name="partyId" title="${uiLabelMap.PartyPartyId}"><ignored/></field> <field use-when="person==null&&partyId!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${partyId}]"><display also-hidden="false"/></field> + <field name="firstName" title="${uiLabelMap.PartyFirstName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="40" maxlength="60"/></field> + <field name="lastName" title="${uiLabelMap.PartyLastName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="40" maxlength="60"/></field> <field name="gender"> <drop-down allow-empty="true"> <option key="M" description="${uiLabelMap.CommonMale}"/> @@ -62,6 +64,14 @@ <field name="existingCustomer"> <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> + <field name="preferredCurrencyUomId"> + <drop-down allow-empty="true"> + <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> + <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> + <entity-order-by field-name="abbreviation"/> + </entity-options> + </drop-down> + </field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> @@ -74,6 +84,14 @@ <field use-when="partyGroup==null&&partyId==null" name="partyId" title="${uiLabelMap.PartyPartyId}"><ignored/></field> <field use-when="partyGroup==null&&partyId!=null" name="partyId" title="${uiLabelMap.PartyPartyId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${partyId}]"><display also-hidden="false"/></field> <field name="partyTypeId"><ignored/></field> + <field name="preferredCurrencyUomId"> + <drop-down allow-empty="true"> + <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> + <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> + <entity-order-by field-name="abbreviation"/> + </entity-options> + </drop-down> + </field> <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field> <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl?rev=582480&r1=582479&r2=582480&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl Sat Oct 6 05:01:17 2007 @@ -70,9 +70,11 @@ <div> <span class="label">${uiLabelMap.PartyLink}</span> <input type="text" name="partyId" value="${partyId?if_exists}"/> + <a href="javascript:call_fieldlookup2(document.linkpartycnf.partyId,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> <span class="label">${uiLabelMap.CommonTo}</span> <input type="text" name="partyIdTo" value="${partyIdTo?if_exists}"/> + <a href="javascript:call_fieldlookup2(document.linkpartycnf.partyIdTo,'LookupPartyName');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> <a href="javascript:document.linkpartycnf.submit()" class="smallSubmit">${uiLabelMap.CommonLink}</a> </div> </form> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |