Author: lektran
Date: Sat Jun 30 23:56:41 2007
New Revision: 552254
URL: http://svn.apache.org/viewvc?view=rev&rev=552254
Log:
Tabs to spaces
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh?view=diff&rev=552254&r1=552253&r2=552254
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
Sat Jun 30 23:56:41 2007
@@ -155,34 +155,34 @@
context.put("email",delegator.findByPrimaryKey("ContactMech",UtilMisc.toMap("contactMechId",selEmails.iterator().next().getString("contactMechId"))));
}
else { //get email address from party contact mech
- List contacts = delegator.findByAnd("PartyContactMech",
- UtilMisc.toMap("partyId",partyId));
- List selContacts = EntityUtil.filterByDate(contacts, nowTimestamp,
"fromDate", "thruDate", true);
- if (selContacts != null && selContacts.size() > 0) {
- Iterator i = selContacts.iterator();
- while (i.hasNext()) {
- email = i.next().getRelatedOne("ContactMech");
- if
(email.getString("contactMechTypeId").equals("ELECTRONIC_ADDRESS")) {
- context.put("email",email);
- break;
- }
- }
- }
+ List contacts = delegator.findByAnd("PartyContactMech",
+ UtilMisc.toMap("partyId",partyId));
+ List selContacts = EntityUtil.filterByDate(contacts, nowTimestamp,
"fromDate", "thruDate", true);
+ if (selContacts != null && selContacts.size() > 0) {
+ Iterator i = selContacts.iterator();
+ while (i.hasNext()) {
+ email = i.next().getRelatedOne("ContactMech");
+ if
(email.getString("contactMechTypeId").equals("ELECTRONIC_ADDRESS")) {
+ context.put("email",email);
+ break;
+ }
+ }
+ }
}
// website
List contacts = delegator.findByAnd("PartyContactMech",
- UtilMisc.toMap("partyId",partyId));
+ UtilMisc.toMap("partyId",partyId));
List selContacts = EntityUtil.filterByDate(contacts, nowTimestamp, "fromDate",
"thruDate", true);
if (selContacts != null && selContacts.size() > 0) {
- Iterator i = selContacts.iterator();
- while (i.hasNext()) {
- website = i.next().getRelatedOne("ContactMech");
- if
(website.getString("contactMechTypeId").equals("WEB_ADDRESS")) {
- context.put("website",website);
- break;
- }
- }
+ Iterator i = selContacts.iterator();
+ while (i.hasNext()) {
+ website = i.next().getRelatedOne("ContactMech");
+ if (website.getString("contactMechTypeId").equals("WEB_ADDRESS"))
{
+ context.put("website",website);
+ break;
+ }
+ }
}
//Bank account
