svn commit: r731038 [4/4] - in /ofbiz/trunk/applications: order/config/ party/config/ party/src/org/ofbiz/party/comm
Locked
svn commit: r731038 [4/4] - in /ofbiz/trunk/applications: order/config/ party/config/ party/src/org/ofbiz/party/comm
 
|
Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=731038&r1=731037&r2=731038&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Sat Jan 3 09:47:18 2009 @@ -30,7 +30,6 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityConditionList; -import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.util.EntityFindOptions; import org.ofbiz.entity.util.EntityUtil; @@ -42,7 +41,7 @@ public class CommunicationEventServices { public static final String module = CommunicationEventServices.class.getName(); - public static final String resource = "PartyUiLabels"; + public static final String resource = "PartyErrorUiLabels"; public static Map<String, Object> sendCommEventAsEmail(DispatchContext ctx, Map<String, ? extends Object> context) { GenericDelegator delegator = ctx.getDelegator(); @@ -307,9 +306,8 @@ return errorMessages.size() == 0 ? ServiceUtil.returnSuccess() : ServiceUtil.returnError(errorMessages); } - - - public static Map setCommEventComplete(DispatchContext dctx, Map context) { + + public static Map<String, Object> setCommEventComplete(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String communicationEventId = (String) context.get("communicationEventId"); Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=731038&r1=731037&r2=731038&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java Sat Jan 3 09:47:18 2009 @@ -56,7 +56,7 @@ public class ContactMechServices { public static final String module = ContactMechServices.class.getName(); - public static final String resource = "PartyUiLabels"; + public static final String resource = "PartyErrorUiLabels"; /** * Creates a ContactMech @@ -990,7 +990,7 @@ /** * Copies all contact mechs from one party to another. Does not delete or overwrite any contact mechs. */ - public static Map copyPartyContactMechs(DispatchContext dctx, Map context) { + public static Map<String, Object> copyPartyContactMechs(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1039,8 +1039,7 @@ /** * Creates an EmailAddressVerification */ - - public static Map createEmailAddressVerification(DispatchContext dctx, Map context) { + public static Map<String, Object> createEmailAddressVerification(DispatchContext dctx, Map<String, ? extends Object> context) { GenericDelegator delegator = (GenericDelegator) dctx.getDelegator(); String emailAddress = (String) context.get("emailAddress"); String verifyHash = null; Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java?rev=731038&r1=731037&r2=731038&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java Sat Jan 3 09:47:18 2009 @@ -39,7 +39,7 @@ public class PartyRelationshipServices { public static final String module = PartyRelationshipServices.class.getName(); - public static final String resource = "PartyUiLabels"; + public static final String resource = "PartyErrorUiLabels"; /** Creates a PartyRelationshipType *@param ctx The DispatchContext that this service is operating in 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=731038&r1=731037&r2=731038&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 Jan 3 09:47:18 2009 @@ -21,7 +21,6 @@ import java.sql.Timestamp; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -42,7 +41,6 @@ import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityConditionList; import org.ofbiz.entity.condition.EntityExpr; -import org.ofbiz.entity.condition.EntityFieldValue; import org.ofbiz.entity.condition.EntityFunction; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.model.DynamicViewEntity; @@ -63,7 +61,7 @@ public class PartyServices { public static final String module = PartyServices.class.getName(); - public static final String resource = "PartyUiLabels"; + public static final String resource = "PartyErrorUiLabels"; /** * Deletes a Party. @@ -1392,12 +1390,10 @@ * @return */ public static Map<String, Object> linkParty(DispatchContext dctx, Map<String, ? extends Object> context) { - LocalDispatcher dispatcher = dctx.getDispatcher(); GenericDelegator _delegator = dctx.getDelegator(); GenericDelegator delegator = _delegator.cloneDelegator(); delegator.setEntityEcaHandler(null); - GenericValue userLogin = (GenericValue) context.get("userLogin"); String partyIdTo = (String) context.get("partyIdTo"); String partyId = (String) context.get("partyId"); Timestamp now = UtilDateTime.nowTimestamp(); @@ -1672,7 +1668,7 @@ return ServiceUtil.returnSuccess(); } - public static String getPartyId(Map context) { + public static String getPartyId(Map<String, ? extends Object> context) { String partyId = (String) context.get("partyId"); if (UtilValidate.isEmpty(partyId)) { GenericValue userLogin = (GenericValue) context.get("userLogin"); Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=731038&r1=731037&r2=731038&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Sat Jan 3 09:47:18 2009 @@ -52,7 +52,7 @@ <link target="ListCommCustRequests?partyId=${partyId}&communicationEventId=${communicationEventId}"/> </menu-item> --> - <menu-item name="ListUnknownPartyComms" title="${uiLabelMap.EmailfromUnknownParties}"> + <menu-item name="ListUnknownPartyComms" title="${uiLabelMap.PartyEmailFromUnknownParties}"> <link target="listUnknownPartyComms"/> </menu-item> </menu> 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=731038&r1=731037&r2=731038&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sat Jan 3 09:47:18 2009 @@ -712,7 +712,7 @@ <field name="roleTypeIdTo" title="${uiLabelMap.PartyPartyInTheRoleOf}"> <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/> </field> - <field name="partyRelationshipTypeId" title="${uiLabelMap.IsA}"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field> + <field name="partyRelationshipTypeId" title="${uiLabelMap.PartyIsA}"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field> <field name="partyIdFrom" title="${uiLabelMap.PartyOfParty}"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId"> <sub-hyperlink description="[${partyIdFrom}]" target="viewprofile?partyId=${partyIdFrom}"/> @@ -738,7 +738,7 @@ </entity-options> </drop-down> </field> - <field name="partyRelationshipTypeId" title="${uiLabelMap.IsA}"> + <field name="partyRelationshipTypeId" title="${uiLabelMap.PartyIsA}"> <drop-down allow-empty="true"> <entity-options entity-name="PartyRelationshipType" description="${partyRelationshipName}"> <entity-order-by field-name="partyRelationshipName"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=731038&r1=731037&r2=731038&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml Sat Jan 3 09:47:18 2009 @@ -29,7 +29,7 @@ </entity-and> </actions> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field> - <field name="partyClassificationGroupId" title="${uiLabelMap.Description} [${uiLabelMap.PartyClassificationGroupId}]"> + <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}"> <display-entity entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId" description="${description}&nbsp;[${partyClassificationGroupId}]"/> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> @@ -53,8 +53,8 @@ <field name="partyClassificationTypeId"> <display-entity entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId" description="${description}"/> </field> - <field name="parentGroupId" title="${uiLabelMap.ParentGroupId}"><display/></field> - <field name="description" title="${uiLabelMap.Description}"><display/></field> + <field name="parentGroupId"><display/></field> + <field name="description" title="${uiLabelMap.CommonEmptyHeader}"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deletePartyClassificationGroup?partyClassificationGroupId=${partyClassificationGroupId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> @@ -74,8 +74,8 @@ </entity-options> </drop-down> </field> - <field name="parentGroupId" title="${uiLabelMap.ParentGroupId}"><lookup target-form-name="LookupPartyClassificationGroup"/></field> - <field name="description" title="${uiLabelMap.Description}"><text size="55"/></field> + <field name="parentGroupId"><lookup target-form-name="LookupPartyClassificationGroup"/></field> + <field name="description" title="${uiLabelMap.CommonEmptyHeader}"><text size="55"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> @@ -114,7 +114,7 @@ <field-map field-name="partyClassificationGroupId"/> </entity-and> </actions> - <field name="partyClassificationGroupId" title="${uiLabelMap.Description} [${uiLabelMap.PartyClassificationGroupId}]"> + <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}"> <display-entity entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId" description="${description}&nbsp;[${partyClassificationGroupId}]"/> </field> <field name="partyId" title="${uiLabelMap.Party}"> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=731038&r1=731037&r2=731038&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sat Jan 3 09:47:18 2009 @@ -55,7 +55,7 @@ <menu-item name="EditPartyClassifications" title="${uiLabelMap.PartyClassifications}"> <link target="EditPartyClassifications?partyId=${partyId}"/> </menu-item> - <menu-item name="ContactList" title="${uiLabelMap.PartyContactList}"> + <menu-item name="ContactList" title="${uiLabelMap.PartyContactLists}"> <link target="ListPartyContactLists?partyId=${partyId}"/> </menu-item> <menu-item name="PartyContents" title="${uiLabelMap.PartyContent}"> @@ -73,7 +73,7 @@ <menu-item name="EditEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}"> <link target="EditEmploymentApps?partyId=${partyId}&&referredByPartyId=${partyId}"/> </menu-item> - <menu-item name="FinancialHistory" title="${uiLabelMap.FinancialHistory}"> + <menu-item name="FinancialHistory" title="${uiLabelMap.PartyFinancialHistory}"> <condition> <if-has-permission permission="ACCOUNTING" action="_VIEW"/> </condition> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=731038&r1=731037&r2=731038&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Jan 3 09:47:18 2009 @@ -242,12 +242,12 @@ <if-compare field-name="party.partyTypeId" operator="equals" value="PERSON"/> </condition> <widgets> - <screenlet title="${uiLabelMap.AddRelatedAccount}"> + <screenlet title="${uiLabelMap.PartyAddRelatedAccount}"> <include-form name="AddAccount" location="component://party/webapp/partymgr/party/PartyForms.xml"/> </screenlet> </widgets> <fail-widgets> - <screenlet title="${uiLabelMap.AddRelatedContact}"> + <screenlet title="${uiLabelMap.PartyAddRelatedContact}"> <include-form name="AddContact" location="component://party/webapp/partymgr/party/PartyForms.xml"/> </screenlet> </fail-widgets> @@ -992,7 +992,7 @@ <screen name="PartyFinancialHistory"> <section> <actions> - <set field="titleProperty" value="PageTitleEditPartyAttribute"/> + <set field="titleProperty" value="PartyFinancialHistory"/> <set field="headerItem" value="accountsMain"/> <set field="tabButtonItem" value="FinancialHistory"/> <set field="partyId" from-field="parameters.partyId"/> @@ -1001,7 +1001,7 @@ <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <label style="h1" text="${uiLabelMap.FinancialHistory}"/> + <label style="h1" text="${uiLabelMap.PartyFinancialHistory}"/> <section> <actions> <entity-condition entity-name="InvoiceAndApplAndPayment" list-name="ListInvoicesApplPayments"> @@ -1061,7 +1061,7 @@ <set field="actualCurrencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/> </actions> <widgets> - <screenlet title="${uiLabelMap.InvoicesNotApplied}" navigation-form-name="partyFinancialHistoryInvoicesN"> + <screenlet title="${uiLabelMap.PartyInvoicesNotApplied}" navigation-form-name="partyFinancialHistoryInvoicesN"> <include-form name="ListUnAppliedInvoices" location="component://party/webapp/partymgr/party/PartyForms.xml"/> <section> <condition> @@ -1088,7 +1088,7 @@ <set field="actualCurrencyUomId" from-field="defaultOrganizationPartyCurrencyId"/> </actions> <widgets> - <screenlet title="${uiLabelMap.PaymentsNotApplied}" navigation-form-name="partyFinancialHistoryPaymentsN"> + <screenlet title="${uiLabelMap.PartyPaymentsNotApplied}" navigation-form-name="partyFinancialHistoryPaymentsN"> <include-form name="ListUnAppliedPayments" location="component://party/webapp/partymgr/party/PartyForms.xml"/> <section> <condition> Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=731038&r1=731037&r2=731038&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Sat Jan 3 09:47:18 2009 @@ -473,7 +473,7 @@ <not><if-empty field-name="contacts"/></not> </condition> <widgets> - <screenlet title="${uiLabelMap.ListRelatedContacts}" navigation-form-name="ListContacts"> + <screenlet title="${uiLabelMap.PartyListRelatedContacts}" navigation-form-name="ListContacts"> <include-form name="ListRelatedContacts" location="component://party/webapp/partymgr/party/PartyForms.xml"/> </screenlet> </widgets> @@ -483,7 +483,7 @@ <not><if-empty field-name="accounts"/></not> </condition> <widgets> - <screenlet title="${uiLabelMap.ListRelatedAccounts}" navigation-form-name="ListAccounts"> + <screenlet title="${uiLabelMap.PartyListRelatedAccounts}" navigation-form-name="ListAccounts"> <include-form name="ListRelatedAccounts" location="component://party/webapp/partymgr/party/PartyForms.xml"/> </screenlet> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |