You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2010/03/17 18:28:04 UTC
svn commit: r924378 [1/8] - in /ofbiz/trunk: ./
applications/accounting/config/
applications/accounting/webapp/accounting/WEB-INF/
applications/accounting/webapp/accounting/payment/report/
applications/accounting/widget/ applications/commonext/webapp/o...
Author: lektran
Date: Wed Mar 17 17:28:01 2010
New Revision: 924378
URL: http://svn.apache.org/viewvc?rev=924378&view=rev
Log:
Tabs to spaces
Modified:
ofbiz/trunk/.project
ofbiz/trunk/ant
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy
ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml
ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_Report.xml
ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/NetBeforeOverheadReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/ProductDemandReport.rptdesign
ofbiz/trunk/applications/order/webapp/ordermgr/reports/SalesReport.rptdesign
ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy
ofbiz/trunk/applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign
ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd
ofbiz/trunk/framework/base/src/org/ofbiz/base/json/JSON.jj
ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
ofbiz/trunk/framework/birt/build.xml
ofbiz/trunk/framework/birt/data/helpdata/HELP_BIRT.xml
ofbiz/trunk/framework/common/data/GeoData_CN.xml
ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java
ofbiz/trunk/framework/documents/Framework.xml
ofbiz/trunk/framework/entity/documents/EntityEngine.xml
ofbiz/trunk/framework/example/webapp/birt/WEB-INF/birt.tld
ofbiz/trunk/framework/example/webapp/birt/WEB-INF/server-config.wsdd
ofbiz/trunk/framework/example/webapp/example/WEB-INF/birt.tld
ofbiz/trunk/framework/images/webapp/images/calendarDateSelect/format/format_iso_date.js
ofbiz/trunk/framework/images/webapp/images/selectall.js
ofbiz/trunk/framework/minilang/documents/MiniLang.xml
ofbiz/trunk/framework/service/documents/ServiceEngine.xml
ofbiz/trunk/framework/service/dtd/service-group.xsd
ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Parser.jj
ofbiz/trunk/framework/sql/src/org/ofbiz/sql/test/GoodParseAll.sql
ofbiz/trunk/framework/sql/src/org/ofbiz/sql/test/TestSelect.sql
ofbiz/trunk/framework/testtools/documents/TestTools.xml
ofbiz/trunk/framework/testtools/dtd/SeleniumXml.xsd
ofbiz/trunk/framework/testtools/dtd/test-suite.xsd
ofbiz/trunk/framework/testtools/testdef/seleniumxml/example/recorded/AjaxExample.html
ofbiz/trunk/framework/testtools/testdef/seleniumxml/example/recorded/NewExample.html
ofbiz/trunk/framework/testtools/testdef/seleniumxml/example/recorded/NewFeature.html
ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS.xml
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EditEntity.jsp
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
ofbiz/trunk/specialpurpose/build.xml
ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml
ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml
ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml
ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml
ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml
ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml
ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml
ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml
ofbiz/trunk/specialpurpose/ebay/data/helpdata/HELP_EBAY_main.xml
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
ofbiz/trunk/specialpurpose/ebaystore/build.xml
ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml
ofbiz/trunk/specialpurpose/ebaystore/data/helpdata/HELP_EBAY_LeaveFeedback.xml
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountForms.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js
ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css
ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/images/rsscss.css
ofbiz/trunk/specialpurpose/ofbizwebsite/webapp/ofbiz/script/slides.js
ofbiz/trunk/specialpurpose/projectmgr/entitydef/entitymodel.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/legacy.css
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/login.css
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/js/application.js
ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/js/application.js
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/trunk/.project
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.project?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/.project (original)
+++ ofbiz/trunk/.project Wed Mar 17 17:28:01 2010
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>ofbiz</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+ <name>ofbiz</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
</projectDescription>
Modified: ofbiz/trunk/ant
URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/ant (original)
+++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
@@ -26,14 +26,14 @@ else
fi
find_jar() {
- top="$(cd "$(dirname "$0")"; echo "$PWD")"
- set -- "$top"/framework/base/lib/ant-launcher-*.jar
- if [ $# = 1 ] && [ -e "$1" ]; then
- echo "$1"
- else
- echo "Couldn't find ant-launcher.jar" 1>&2
- exit 1
- fi
+ top="$(cd "$(dirname "$0")"; echo "$PWD")"
+ set -- "$top"/framework/base/lib/ant-launcher-*.jar
+ if [ $# = 1 ] && [ -e "$1" ]; then
+ echo "$1"
+ else
+ echo "Couldn't find ant-launcher.jar" 1>&2
+ exit 1
+ fi
}
"$JAVA" -jar "$(find_jar)" "$@"
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Mar 17 17:28:01 2010
@@ -6690,7 +6690,7 @@
<value xml:lang="en">Organization GL Settings</value>
<value xml:lang="fr">Configurations internes du GL</value>
<value xml:lang="hi_IN">सà¤à¤à¤ न à¤à¥à¤à¤²(Gl) सà¥à¤à¤¿à¤à¤à¥à¤¸</value>
- <value xml:lang="nl">Organisatie grootboek instellingen</value>
+ <value xml:lang="nl">Organisatie grootboek instellingen</value>
<value xml:lang="zh">ç»ç»æºææ»è´¦è®¾ç½®</value>
</property>
<property key="AccountingOrganizationPartyId">
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=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Mar 17 17:28:01 2010
@@ -2531,7 +2531,7 @@ under the License.
<!-- Reports -->
<request-map uri="paymentReport">
- <security https="true" auth="true"/>
+ <security https="true" auth="true"/>
<response name="success" type="view" value="paymentReport"/>
</request-map>
<request-map uri="paymentReportHtml">
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign Wed Mar 17 17:28:01 2010
@@ -333,22 +333,22 @@ try {
input = FastMap.newInstance();
inputFields = FastMap.newInstance();
if(params!=null){
- inputFields.put("partyIdTo", params["partyIdTo"]);
- inputFields.put("paymentId", params["paymentId"]);
- inputFields.put("paymentTypeId", params["paymentTypeId"]);
- inputFields.put("paymentId_op", params["paymentId_op"]);
- inputFields.put("paymentRefNum_ic", params["paymentRefNum_ic"]);
- inputFields.put("noConditionFind", params["noConditionFind"]);
- inputFields.put("partyIdFrom", params["partyIdFrom"]);
- inputFields.put("paymentRefNum_op", params["paymentRefNum_op"]);
- inputFields.put("amount", params["amount"]);
- inputFields.put("statusId", params["statusId"]);
- inputFields.put("paymentGatewayResponseId", params["paymentGatewayResponseId"]);
- inputFields.put("paymentId_ic", params["paymentId_ic"]);
- inputFields.put("paymentRefNum", params["paymentRefNum"]);
- inputFields.put("comments_ic", params["comments_ic"]);
- inputFields.put("comments_op", params["comments_op"]);
- inputFields.put("comments", params["comments"]);
+ inputFields.put("partyIdTo", params["partyIdTo"]);
+ inputFields.put("paymentId", params["paymentId"]);
+ inputFields.put("paymentTypeId", params["paymentTypeId"]);
+ inputFields.put("paymentId_op", params["paymentId_op"]);
+ inputFields.put("paymentRefNum_ic", params["paymentRefNum_ic"]);
+ inputFields.put("noConditionFind", params["noConditionFind"]);
+ inputFields.put("partyIdFrom", params["partyIdFrom"]);
+ inputFields.put("paymentRefNum_op", params["paymentRefNum_op"]);
+ inputFields.put("amount", params["amount"]);
+ inputFields.put("statusId", params["statusId"]);
+ inputFields.put("paymentGatewayResponseId", params["paymentGatewayResponseId"]);
+ inputFields.put("paymentId_ic", params["paymentId_ic"]);
+ inputFields.put("paymentRefNum", params["paymentRefNum"]);
+ inputFields.put("comments_ic", params["comments_ic"]);
+ inputFields.put("comments_op", params["comments_op"]);
+ inputFields.put("comments", params["comments"]);
}
input.put("userLogin",userLogin);
input.put("inputFields",inputFields);
@@ -364,16 +364,16 @@ try {
}]]></method>
<method name="fetch"><![CDATA[if(payments==null)return false;
if(payment=payments.next()){
- row["paymentId"] = payment.getString("paymentId");
- row["paymentType"] = payment.getString("paymentTypeId");
- row["status"] = payment.getString("statusId");
- row["from"] = payment.getString("partyIdFrom");
- row["to"] = payment.getString("partyIdTo");
- row["date"] = payment.getString("effectiveDate");
- row["amount"] = payment.getString("amount");
+ row["paymentId"] = payment.getString("paymentId");
+ row["paymentType"] = payment.getString("paymentTypeId");
+ row["status"] = payment.getString("statusId");
+ row["from"] = payment.getString("partyIdFrom");
+ row["to"] = payment.getString("partyIdTo");
+ row["date"] = payment.getString("effectiveDate");
+ row["amount"] = payment.getString("amount");
}else{
- payments.close();
- return false;
+ payments.close();
+ return false;
}
return true;]]></method>
</script-data-set>
Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Wed Mar 17 17:28:01 2010
@@ -378,7 +378,7 @@ under the License.
<parameter param-name="paymentId" from-field="payment.paymentId"/>
</link>
</menu-item>
- <menu-item name="paymentReport" title="Payment Report">
+ <menu-item name="paymentReport" title="Payment Report">
<link target="paymentReport"/>
</menu-item>
</menu>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Wed Mar 17 17:28:01 2010
@@ -73,13 +73,13 @@ under the License.
<widgets>
<include-menu name="PaymentSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<container style="leftclear">
- <section>
- <condition>
- <not><if-empty field="paymentId"/></not>
- </condition>
- <widgets>
- <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
- </widgets>
+ <section>
+ <condition>
+ <not><if-empty field="paymentId"/></not>
+ </condition>
+ <widgets>
+ <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
+ </widgets>
</section>
</container>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Wed Mar 17 17:28:01 2010
@@ -542,7 +542,7 @@ under the License.
<screen name="PaymentReport">
<section>
<actions>
- <set field="headerItem" value="payments"/>
+ <set field="headerItem" value="payments"/>
<set field="tabButtonItem" value="paymentReport"/>
</actions>
<widgets>
@@ -550,9 +550,9 @@ under the License.
<decorator-section name="body">
<section>
<widgets>
- <screenlet title="Payment Report">
- <include-form name="PaymentReport" location="component://accounting/widget/PaymentForms.xml"/>
- </screenlet>
+ <screenlet title="Payment Report">
+ <include-form name="PaymentReport" location="component://accounting/widget/PaymentForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy Wed Mar 17 17:28:01 2010
@@ -39,5 +39,5 @@ if("website".equals(tabButtonItemTop)){
context.showScreen = "message";
return;
}
- context.webSite = webSite;
+ context.webSite = webSite;
}
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Wed Mar 17 17:28:01 2010
@@ -436,7 +436,7 @@ under the License.
<field name="fromDate" type="date-time"/>
<field name="thruDate" type="date-time"/>
<field name="approverPartyId" type="id-ne"/>
- <field name="leaveStatus" type="short-varchar"/>
+ <field name="leaveStatus" type="short-varchar"/>
<field name="description" type="description"/>
<prim-key field="partyId"/>
<prim-key field="leaveTypeId"/>
@@ -452,7 +452,7 @@ under the License.
</relation>
<relation type="one" fk-name="EMPL_LEAVE_APPR" title="Approver" rel-entity-name="Party">
<key-map field-name="approverPartyId" rel-field-name="partyId"/>
- </relation>
+ </relation>
</entity>
<entity entity-name="EmplLeaveType"
package-name="org.ofbiz.humanres.employment"
Modified: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Wed Mar 17 17:28:01 2010
@@ -238,7 +238,7 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="EmplLeaveReasonTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="EmplLeaveReasonTypeTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
<screenlet id="AddEmplLeaveTypePanel" title="${uiLabelMap.HumanResAddEmplLeaveType}" collapsible="true">
<include-form name="AddEmplLeaveType" location="component://humanres/widget/forms/GlobalHrSettingForms.xml"/>
</screenlet>
Modified: ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml (original)
+++ ofbiz/trunk/applications/order/data/SalesOrderDemoData.xml Wed Mar 17 17:28:01 2010
@@ -1761,7 +1761,7 @@ under the License.
<ProductPromo productPromoId="DEMO_PROMO004" promoName="Demo Promotion 4" promoText="With special code [9021] get products in the Featured Products category for their special promotion price." userEntered="Y" showToCustomer="Y" requireCode="Y" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromo productPromoId="DEMO_PROMO005" promoName="Demo Promotion 5" promoText="With special code [9021] get products in the Featured Products category for their special promotion price." userEntered="Y" showToCustomer="Y" requireCode="Y" createdDate="2001-05-13 12:00:00.0"/>
- <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE001" productPromoId="DEMO_PROMO001" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
+ <ProductPromoCode productPromoCodeId="DEMO_PROMOCODE001" productPromoId="DEMO_PROMO001" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE002" productPromoId="DEMO_PROMO002" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE003" productPromoId="DEMO_PROMO003" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE004" productPromoId="DEMO_PROMO003" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
@@ -1771,16 +1771,16 @@ under the License.
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE008" productPromoId="DEMO_PROMO004" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE009" productPromoId="DEMO_PROMO004" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
<ProductPromoCode productPromoCodeId="DEMO_PROMOCODE010" productPromoId="DEMO_PROMO005" userEntered="Y" requireEmailOrParty="N" createdDate="2001-05-13 12:00:00.0"/>
-
- <OrderProductPromoCode orderId="DEMO_B2C_AU01" productPromoCodeId="DEMO_PROMOCODE001"/>
- <OrderProductPromoCode orderId="DEMO_B2C_CA01" productPromoCodeId="DEMO_PROMOCODE002"/>
- <OrderProductPromoCode orderId="DEMO_B2C_IE01" productPromoCodeId="DEMO_PROMOCODE003"/>
- <OrderProductPromoCode orderId="DEMO_B2C_SG01" productPromoCodeId="DEMO_PROMOCODE004"/>
- <OrderProductPromoCode orderId="DEMO_B2C_UK01" productPromoCodeId="DEMO_PROMOCODE005"/>
- <OrderProductPromoCode orderId="DEMO_B2C_US01" productPromoCodeId="DEMO_PROMOCODE006"/>
- <OrderProductPromoCode orderId="DEMO_B2C_DE01" productPromoCodeId="DEMO_PROMOCODE007"/>
- <OrderProductPromoCode orderId="DEMO_B2C_ES01" productPromoCodeId="DEMO_PROMOCODE008"/>
- <OrderProductPromoCode orderId="DEMO_B2C_FR01" productPromoCodeId="DEMO_PROMOCODE009"/>
- <OrderProductPromoCode orderId="DEMO_B2C_IT01" productPromoCodeId="DEMO_PROMOCODE010"/>
-
+
+ <OrderProductPromoCode orderId="DEMO_B2C_AU01" productPromoCodeId="DEMO_PROMOCODE001"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_CA01" productPromoCodeId="DEMO_PROMOCODE002"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_IE01" productPromoCodeId="DEMO_PROMOCODE003"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_SG01" productPromoCodeId="DEMO_PROMOCODE004"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_UK01" productPromoCodeId="DEMO_PROMOCODE005"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_US01" productPromoCodeId="DEMO_PROMOCODE006"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_DE01" productPromoCodeId="DEMO_PROMOCODE007"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_ES01" productPromoCodeId="DEMO_PROMOCODE008"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_FR01" productPromoCodeId="DEMO_PROMOCODE009"/>
+ <OrderProductPromoCode orderId="DEMO_B2C_IT01" productPromoCodeId="DEMO_PROMOCODE010"/>
+
</entity-engine-xml>
Modified: ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_Report.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_Report.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_Report.xml (original)
+++ ofbiz/trunk/applications/order/data/helpdata/HELP_ORDER_Report.xml Wed Mar 17 17:28:01 2010
@@ -19,81 +19,81 @@
xmlns="http://docbook.org/ns/docbook">
<title>Order Reports Help.</title>
<para>
- The Order Reports provide general information about orders in the system.
+ The Order Reports provide general information about orders in the system.
</para>
<section>
- <title>
- Initial steps.
- </title>
- <section>
+ <title>
+ Initial steps.
+ </title>
+ <section>
<para>
If your reports look empty it may be required to initialize the warehouse entities in the BI component.
</para>
- <orderedlist>
- <listitem>
- <para>Go to :<link xl:href="https://localhost:8443/bi/control/main">Business Intelligence</link></para>
- </listitem>
- <listitem>
- <para>Click "Quick Init DataWarehouse". System will automatic initial Data in the warehouse for Reports</para>
- </listitem>
- <listitem>
- <para>Go back to : <link xl:href="https://localhost:8443/ordermgr/control/OrderPurchaseReportOptions">Order Reports.</link></para>
- </listitem>
- </orderedlist>
- </section>
+ <orderedlist>
+ <listitem>
+ <para>Go to :<link xl:href="https://localhost:8443/bi/control/main">Business Intelligence</link></para>
+ </listitem>
+ <listitem>
+ <para>Click "Quick Init DataWarehouse". System will automatic initial Data in the warehouse for Reports</para>
+ </listitem>
+ <listitem>
+ <para>Go back to : <link xl:href="https://localhost:8443/ordermgr/control/OrderPurchaseReportOptions">Order Reports.</link></para>
+ </listitem>
+ </orderedlist>
+ </section>
</section>
<section>
<title>Reports List</title>
<section>
- <title>1. Sales Order By Referrer Report</title>
- <para>
- There are referrers, link, totals orders, quantity totals and amount totals. They are grouped by referrer.
- </para>
- </section>
- <section>
- <title>2. Sales Order By Channel Report</title>
- <para>
- There are total Orders, total Items, quantity totals and amount totals. They are grouped by Sales Channel.
- </para>
- </section>
- <section>
- <title>3. Sale Orders Discount Code Report</title>
- <para>
- There are order, product, promotion and discount. This report is list of All orders.
- </para>
- </section>
- <section>
- <title>4. Last Three Months Sales Report</title>
- <para>
- There are products, prices, stock, sale out quantity and sale out total amount.
- This report is list of all products, it contains the sales and movements in last 3 months.
- </para>
- </section>
- <section>
- <title>5. Coupon Sales Report</title>
- <para>
- This report lists promotions, total orders, percent of total orders, total orders amount, percent of total orders amount and shipping amounts.
- </para>
- </section>
- <section>
- <title>6. Sales Report</title>
- <para>
- This Sales report contains paid and unpaid sales orders.
- </para>
- </section>
- <section>
- <title>7. Net Before Overhead Report</title>
- <para>
- Net Before Overhead Report is the profit calculation of paid-shipped orders and all the occurred fee excluding the overhead cost.
- They are grouped by Product Store Id.(Demo data for Net Before Overhead Report have in Product Store Id "B2CStore")
- </para>
- </section>
- <section>
- <title>8. Product Demand Report</title>
- <para>
- Product Demand Report is the report to show us which product sells good and which product doesnât sell good or not selling at all in one account as well as for all accounts in last 4 weeks.
- They are grouped by Product Store Id.(Demo data for Product Demand Report have in Product Store Id "B2CStore")
- </para>
- </section>
+ <title>1. Sales Order By Referrer Report</title>
+ <para>
+ There are referrers, link, totals orders, quantity totals and amount totals. They are grouped by referrer.
+ </para>
+ </section>
+ <section>
+ <title>2. Sales Order By Channel Report</title>
+ <para>
+ There are total Orders, total Items, quantity totals and amount totals. They are grouped by Sales Channel.
+ </para>
+ </section>
+ <section>
+ <title>3. Sale Orders Discount Code Report</title>
+ <para>
+ There are order, product, promotion and discount. This report is list of All orders.
+ </para>
+ </section>
+ <section>
+ <title>4. Last Three Months Sales Report</title>
+ <para>
+ There are products, prices, stock, sale out quantity and sale out total amount.
+ This report is list of all products, it contains the sales and movements in last 3 months.
+ </para>
+ </section>
+ <section>
+ <title>5. Coupon Sales Report</title>
+ <para>
+ This report lists promotions, total orders, percent of total orders, total orders amount, percent of total orders amount and shipping amounts.
+ </para>
+ </section>
+ <section>
+ <title>6. Sales Report</title>
+ <para>
+ This Sales report contains paid and unpaid sales orders.
+ </para>
+ </section>
+ <section>
+ <title>7. Net Before Overhead Report</title>
+ <para>
+ Net Before Overhead Report is the profit calculation of paid-shipped orders and all the occurred fee excluding the overhead cost.
+ They are grouped by Product Store Id.(Demo data for Net Before Overhead Report have in Product Store Id "B2CStore")
+ </para>
+ </section>
+ <section>
+ <title>8. Product Demand Report</title>
+ <para>
+ Product Demand Report is the report to show us which product sells good and which product doesnât sell good or not selling at all in one account as well as for all accounts in last 4 weeks.
+ They are grouped by Product Store Id.(Demo data for Product Demand Report have in Product Store Id "B2CStore")
+ </para>
+ </section>
</section>
</section>
Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_olap.xml Wed Mar 17 17:28:01 2010
@@ -39,7 +39,7 @@ under the License.
<field name="origCurrencyDimId" type="id-ne"></field>
<field name="billToCustomerDimId" type="id-ne"></field> <!-- TODO: implement the dimension -->
- <field name="productStoreId" type="id-ne"></field>
+ <field name="productStoreId" type="id-ne"></field>
<field name="salesChannelEnumId" type="id-ne"></field>
<field name="saleChannel" type="description"></field>
<field name="orderStatus" type="description"></field>
@@ -215,8 +215,8 @@ under the License.
<exclude field="salesChannelEnumId"/>
<exclude field="saleChannel"/>
<exclude field="orderStatus"/>
- <exclude field="visitId"/>
- <exclude field="initialReferrer"/>
+ <exclude field="visitId"/>
+ <exclude field="initialReferrer"/>
<exclude field="productPromoCode"/>
<exclude field="categoryName"/>
</alias-all>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml Wed Mar 17 17:28:01 2010
@@ -266,8 +266,8 @@ under the License.
<field-map field-name="visitId" from-field="orderHeader.visitId"/>
</entity-one>
<if-not-empty field="visit">
- <set field="fact.visitId" from-field="visit.visitId"/>
- <set field="fact.initialReferrer" from-field="visit.initialReferrer"/>
+ <set field="fact.visitId" from-field="visit.visitId"/>
+ <set field="fact.initialReferrer" from-field="visit.initialReferrer"/>
</if-not-empty>
</if-not-empty>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/reports/NetBeforeOverheadMonthlyEvent.xml Wed Mar 17 17:28:01 2010
@@ -26,7 +26,7 @@
<set field="DateYear" value="2009"/>
<set field="DateMonth" value="12"/>
<entity-condition entity-name="SalesOrderItemStarSchema" list="countdates" distinct="true">
- <condition-list combine="and">
+ <condition-list combine="and">
<condition-expr field-name="orderDateYearName" operator="equals" from-field="DateYear"/>
<condition-expr field-name="orderDateMonthOfYear" operator="equals" from-field="DateMonth"/>
<condition-expr field-name="productStoreId" operator="equals" from-field="productStoreId"/>
@@ -45,7 +45,7 @@
<select-field field-name="NBO"/>
</entity-condition>
<entity-condition entity-name="SalesOrderItemStarSchema" list="saleschannels" distinct="true">
- <condition-list combine="and">
+ <condition-list combine="and">
<condition-expr field-name="orderDateYearName" operator="equals" from-field="DateYear"/>
<condition-expr field-name="orderDateMonthOfYear" operator="equals" from-field="DateMonth"/>
<condition-expr field-name="productStoreId" operator="equals" from-field="productStoreId"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/NetBeforeOverheadReport.groovy Wed Mar 17 17:28:01 2010
@@ -30,26 +30,26 @@ DateYear = DateStr.substring(0,4);
if (DateMonth == "01"||DateMonth == "03"||DateMonth == "05"||DateMonth == "07"||DateMonth == "08"||DateMonth == "10"||DateMonth == "12")
{
- NunberDate = 31;
+ NunberDate = 31;
}
else if (DateMonth == "02")
{
- NunberDate = 29;
+ NunberDate = 29;
}
else
{
- NunberDate = 30;
+ NunberDate = 30;
}
birtParameters = [:];
try {
- birtParameters.productStoreId = productStoreId;
- birtParameters.DateDay = DateDay;
- birtParameters.DateMonth = DateMonth;
- birtParameters.DateYear = DateYear;
- birtParameters.NunberDate = NunberDate;
+ birtParameters.productStoreId = productStoreId;
+ birtParameters.DateDay = DateDay;
+ birtParameters.DateMonth = DateMonth;
+ birtParameters.DateYear = DateYear;
+ birtParameters.NunberDate = NunberDate;
} catch (e) {
- Debug.logError(e, "");
+ Debug.logError(e, "");
}
request.setAttribute("birtParameters", birtParameters);
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy Wed Mar 17 17:28:01 2010
@@ -21,9 +21,9 @@ import org.ofbiz.base.util.*;
birtParameters = [:];
if(request.getParameter("saleChannel")){
- birtParameters.saleChannel = request.getParameter("saleChannel");
+ birtParameters.saleChannel = request.getParameter("saleChannel");
}else{
- birtParameters.saleChannel = "null";
+ birtParameters.saleChannel = "null";
}
request.setAttribute("birtParameters", birtParameters);
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/ProductDemandReport.groovy Wed Mar 17 17:28:01 2010
@@ -28,11 +28,11 @@ int Year = cal.get(Calendar.YEAR);
birtParameters = [:];
try
{
- birtParameters.productStoreId = productStoreId;
- birtParameters.Week = Week;
- birtParameters.Year = Year;
+ birtParameters.productStoreId = productStoreId;
+ birtParameters.Week = Week;
+ birtParameters.Year = Year;
} catch (e) {
- Debug.logError(e, "");
+ Debug.logError(e, "");
}
request.setAttribute("birtParameters", birtParameters);
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/SalesReport.groovy Wed Mar 17 17:28:01 2010
@@ -24,10 +24,10 @@ thruDateStr = parameters.thruDate;
birtParameters = [:];
try {
- birtParameters.fromDate = Date.valueOf(fromDateStr);
- birtParameters.thruDate = Date.valueOf(thruDateStr);
+ birtParameters.fromDate = Date.valueOf(fromDateStr);
+ birtParameters.thruDate = Date.valueOf(thruDateStr);
} catch (e) {
- Debug.logError(e, "");
+ Debug.logError(e, "");
}
request.setAttribute("birtParameters", birtParameters);
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=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed Mar 17 17:28:01 2010
@@ -1103,7 +1103,7 @@ under the License.
<response name="success" type="view" value="OrderByReferrerReport"/>
</request-map>
<request-map uri="OrdersByChannel.pdf"><security https="true" auth="true"/>
- <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="OrderByChannel.groovy"/>
+ <event type="groovy" path="component://order/webapp/ordermgr/WEB-INF/actions/reports/" invoke="OrderByChannel.groovy"/>
<response name="success" type="view" value="OrdersByChannelReport"/>
</request-map>
<request-map uri="OrderDiscountCode.pdf">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign Wed Mar 17 17:28:01 2010
@@ -167,38 +167,38 @@ totalShippingCharge = 0;
totalShippingBalance = 0;
productPromoCodes = delegator.findList("ProductPromoCode", EntityCondition.makeCondition("productPromoId", EntityOperator.EQUALS, productPromoId), null, null, null, false);
if(productPromoCodes.size()>0){
- productPromoCodeId = productPromoCodes.get(0).getString("productPromoCodeId");
- orderProductPromoCodes = delegator.findList("OrderProductPromoCode", EntityCondition.makeCondition("productPromoCodeId", EntityOperator.EQUALS, productPromoCodeId), null, null, null, false);
- totalOrders = orderProductPromoCodes.size();
- for(i = 0; i < totalOrders; i++){
- orderId = orderProductPromoCodes.get(i).getString("orderId");
- input.put("userLogin",userLogin);
- input.put("orderId",orderId);
- //Order Total
- orderInfo = dispatcher.runSync("getOrderHeaderInformation", input);
- amount = orderInfo.get("grandTotal");
- totalOrdersAmount = totalOrdersAmount + amount;
- //Shipping Total
- cond = FastList.newInstance();
- cond.add(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId));
- cond.add(EntityCondition.makeCondition("orderAdjustmentTypeId", EntityOperator.EQUALS, "SHIPPING_CHARGES"));
- orderAdjustments = delegator.findList("OrderAdjustment", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false);
- orderAdjustmentSize = orderAdjustments.size();
- for(j = 0; j < orderAdjustmentSize; j++){
- shippingCharge = 0;
- shippingCharge = orderAdjustments.get(j).get("amount");
- if(shippingCharge){
- shippingCharge = shippingCharge.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
- }
- totalShippingCharge = totalShippingCharge + shippingCharge;
- }
- shippingAmount = dispatcher.runSync("getOrderShippingAmount", input);
- amount = shippingAmount.get("shippingAmount");
- if(amount){
- amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
- }
- totalShippingAmount = totalShippingAmount + amount;
- }
+ productPromoCodeId = productPromoCodes.get(0).getString("productPromoCodeId");
+ orderProductPromoCodes = delegator.findList("OrderProductPromoCode", EntityCondition.makeCondition("productPromoCodeId", EntityOperator.EQUALS, productPromoCodeId), null, null, null, false);
+ totalOrders = orderProductPromoCodes.size();
+ for(i = 0; i < totalOrders; i++){
+ orderId = orderProductPromoCodes.get(i).getString("orderId");
+ input.put("userLogin",userLogin);
+ input.put("orderId",orderId);
+ //Order Total
+ orderInfo = dispatcher.runSync("getOrderHeaderInformation", input);
+ amount = orderInfo.get("grandTotal");
+ totalOrdersAmount = totalOrdersAmount + amount;
+ //Shipping Total
+ cond = FastList.newInstance();
+ cond.add(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId));
+ cond.add(EntityCondition.makeCondition("orderAdjustmentTypeId", EntityOperator.EQUALS, "SHIPPING_CHARGES"));
+ orderAdjustments = delegator.findList("OrderAdjustment", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false);
+ orderAdjustmentSize = orderAdjustments.size();
+ for(j = 0; j < orderAdjustmentSize; j++){
+ shippingCharge = 0;
+ shippingCharge = orderAdjustments.get(j).get("amount");
+ if(shippingCharge){
+ shippingCharge = shippingCharge.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ }
+ totalShippingCharge = totalShippingCharge + shippingCharge;
+ }
+ shippingAmount = dispatcher.runSync("getOrderShippingAmount", input);
+ amount = shippingAmount.get("shippingAmount");
+ if(amount){
+ amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ }
+ totalShippingAmount = totalShippingAmount + amount;
+ }
}
row["productPromoId"] = productPromoId;
row["promoName"] = promoName;
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign?rev=924378&r1=924377&r2=924378&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign Wed Mar 17 17:28:01 2010
@@ -224,51 +224,51 @@ try {
month = thisMonth;
while(i<3){
i = i + 1;
- switch(month)
- {
- case 1:
- months.add(1);
- break;
- case 2:
- months.add(2);
- break;
- case 3:
- months.add(3);
- break;
- case 4:
- months.add(4);
- break;
- case 5:
- months.add(5);
- break;
- case 6:
- months.add(6);
- break;
- case 7:
- months.add(7);
- break;
- case 8:
- months.add(8);
- break;
- case 9:
- months.add(9);
- break;
- case 10:
- months.add(10);
- break;
- case 11:
- months.add(11);
- break;
- case 12:
- months.add(12);
- break;
- }
- month = month - 1
- }
- Debug.log("================ Last 3 Months Sale Order Report====="+months);
- cond = FastList.newInstance();
- cond.add(EntityCondition.makeCondition("orderDateMonthOfYear", EntityOperator.IN, months));
- cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, thisYear));
+ switch(month)
+ {
+ case 1:
+ months.add(1);
+ break;
+ case 2:
+ months.add(2);
+ break;
+ case 3:
+ months.add(3);
+ break;
+ case 4:
+ months.add(4);
+ break;
+ case 5:
+ months.add(5);
+ break;
+ case 6:
+ months.add(6);
+ break;
+ case 7:
+ months.add(7);
+ break;
+ case 8:
+ months.add(8);
+ break;
+ case 9:
+ months.add(9);
+ break;
+ case 10:
+ months.add(10);
+ break;
+ case 11:
+ months.add(11);
+ break;
+ case 12:
+ months.add(12);
+ break;
+ }
+ month = month - 1
+ }
+ Debug.log("================ Last 3 Months Sale Order Report====="+months);
+ cond = FastList.newInstance();
+ cond.add(EntityCondition.makeCondition("orderDateMonthOfYear", EntityOperator.IN, months));
+ cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, thisYear));
salesOrderItemStarSchemas = delegator.findList("SalesOrderItemStarSchema", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false);
} catch(e) {
Debug.logError(e,"");
@@ -298,13 +298,13 @@ price = 0;
internalName = "None";
input = FastMap.newInstance();
try {
- product = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId")));
- input.put("product", product);
- input.put("userLogin", userLogin);
+ product = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId")));
+ input.put("product", product);
+ input.put("userLogin", userLogin);
result = dispatcher.runSync("calculateProductPrice", input);
price = result.get("price");
if(product.get("internalName")){
- internalName = product.get("internalName");
+ internalName = product.get("internalName");
}
} catch (e) {
Debug.logError(e, module);
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/ applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Scott Gray <sc...@hotwaxmedia.com>.
On 18/03/2010, at 12:00 PM, Adam Heath wrote:
> Scott Gray wrote:
>> On 18/03/2010, at 11:40 AM, Adam Heath wrote:
>>
>>> Scott Gray wrote:
>>>> On 17/03/2010, at 12:49 PM, Adam Heath wrote:
>>>>
>>>>> Scott Gray wrote:
>>>>>> On 17/03/2010, at 12:16 PM, Adam Heath wrote:
>>>>>>
>>>>>>> Scott Gray wrote:
>>>>>>>> On 17/03/2010, at 11:53 AM, Adam Heath wrote:
>>>>>>>>
>>>>>>>>> lektran@apache.org wrote:
>>>>>>>>>> Author: lektran
>>>>>>>>>> Date: Wed Mar 17 17:28:01 2010
>>>>>>>>>> New Revision: 924378
>>>>>>>>>>
>>>>>>>>>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>>>>>>>>>> Log:
>>>>>>>>>> Tabs to spaces
>>>>>>>>>> Modified: ofbiz/trunk/ant
>>>>>>>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>>>>>>>>>> ==============================================================================
>>>>>>>>>> --- ofbiz/trunk/ant (original)
>>>>>>>>>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>>>>>>>>>> @@ -26,14 +26,14 @@ else
>>>>>>>>>> fi
>>>>>>>>>>
>>>>>>>>>> find_jar() {
>>>>>>>>>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>>>>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>>>>> - if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>>>>> - echo "$1"
>>>>>>>>>> - else
>>>>>>>>>> - echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>>>>> - exit 1
>>>>>>>>>> - fi
>>>>>>>>>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>>>>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>>>>> + if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>>>>> + echo "$1"
>>>>>>>>>> + else
>>>>>>>>>> + echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>>>>> + exit 1
>>>>>>>>>> + fi
>>>>>>>>>> }
>>>>>>>>>> "$JAVA" -jar "$(find_jar)" "$@"
>>>>>>>>> I disagree. shell scripts need to be tab-based.
>>>>>>>> Why?
>>>>>>> What there a discussion as to how shell scripts should be formatted?
>>>>>>> I've used tabs for years, tons of scripts I have worked in have used
>>>>>>> tabs. Is there a well known standard for formatting in shell scripts?
>>>>>>>
>>>>>>> Changing it to match how it is done in other files is not reason enough.
>>>>>> We've never discussed file type specific formatting guidelines, so I guess the assumption has always been that we use consistent formatting everywhere.
>>>>>> You having used tabs for years is just as equally not a good reason to use tabs when everything else uses spaces.
>>>>> but why change it? that introduces churn just for the sake of it. If
>>>>> there is no consensus, then leaving things along seems the better
>>>>> approach.
>>>> I changed it because we've always used spaces for indentation everywhere, as it I see it you are seeking an exception to that for shell scripts and a consensus has not yet formed around that.
>>>> If you're looking for precedent then note that this is the only shell script which contained tabs for indenting and those tabs were introduced by you less than 3 months ago.
>>> debian/ofbiz-applications.postinst
>>> debian/ofbiz-framework.config
>>> debian/ofbiz-framework.postrm
>>> debian/ofbiz-framework.ofbiz.init
>>> debian/ofbiz-specialpurpose.postinst
>>> debian/ofbiz-applications.prerm
>>> debian/ofbiz-framework.postinst
>>> debian/ofbiz-framework.prerm
>>> debian/ofbiz-specialpurpose.prerm
>>>
>>> The above are shell scripts, added/maintained by me, of course, that
>>> all contain tabs.
>>>
>>> debian/move-files.pl contains tabs.
>>>
>>> debian/rules does as well, but that is a Makefile, so it kind of has to.
>>>
>>> debian/ofbiz-framework.logrotate has tabs, but that's the pattern in
>>> debian.
>>>
>>> debian/extract-entity-engine.xslt and debian/override-data.xslt are
>>> xml files with a single-space indent.
>>
>> Yes I purposely didn't touch those because I know nothing about debian and how tabs to spaces would affect it.
>>
>> Arguing that these recently introduced files set some sort of precedent when we've had shell scripts using spaces and not tabs for quite a number of years doesn't really cut it IMO. I'm sorry that spaces don't jibe with how you like to work but you are the one trying to introduce change here, not me.
>
> Yeah, I know that I'm the one who introduced these files.
>
> I didn't change any of the other shell scripts, you are the one who
> did so. I'm just trying to discuss if that is the proper approach for
> ofbiz. And I don't think we have reached a consensus. You and I
> obviously don't agree, so that proves their isn't consensus. The
> safest thing to do in that case is not change a thing with the file(s).
Uh say what? You introduced tabs into a shell script that had only spaces for indentation which resulted in a mix of indentation styles. You are the only person who has ever introduced tabs into shell scripts, we've always used spaces for indentation in any files that are managed by the community, all I did was restore the consistency that has existed for quite a number of years.
If you want to change what we've always done then discuss it and get your consensus. All my commit did was restore the file in question back to its previous formatting state.
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/
applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/
applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Adam Heath <do...@brainfood.com>.
Scott Gray wrote:
> On 18/03/2010, at 11:40 AM, Adam Heath wrote:
>
>> Scott Gray wrote:
>>> On 17/03/2010, at 12:49 PM, Adam Heath wrote:
>>>
>>>> Scott Gray wrote:
>>>>> On 17/03/2010, at 12:16 PM, Adam Heath wrote:
>>>>>
>>>>>> Scott Gray wrote:
>>>>>>> On 17/03/2010, at 11:53 AM, Adam Heath wrote:
>>>>>>>
>>>>>>>> lektran@apache.org wrote:
>>>>>>>>> Author: lektran
>>>>>>>>> Date: Wed Mar 17 17:28:01 2010
>>>>>>>>> New Revision: 924378
>>>>>>>>>
>>>>>>>>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>>>>>>>>> Log:
>>>>>>>>> Tabs to spaces
>>>>>>>>> Modified: ofbiz/trunk/ant
>>>>>>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>>>>>>>>> ==============================================================================
>>>>>>>>> --- ofbiz/trunk/ant (original)
>>>>>>>>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>>>>>>>>> @@ -26,14 +26,14 @@ else
>>>>>>>>> fi
>>>>>>>>>
>>>>>>>>> find_jar() {
>>>>>>>>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>>>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>>>> - if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>>>> - echo "$1"
>>>>>>>>> - else
>>>>>>>>> - echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>>>> - exit 1
>>>>>>>>> - fi
>>>>>>>>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>>>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>>>> + if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>>>> + echo "$1"
>>>>>>>>> + else
>>>>>>>>> + echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>>>> + exit 1
>>>>>>>>> + fi
>>>>>>>>> }
>>>>>>>>> "$JAVA" -jar "$(find_jar)" "$@"
>>>>>>>> I disagree. shell scripts need to be tab-based.
>>>>>>> Why?
>>>>>> What there a discussion as to how shell scripts should be formatted?
>>>>>> I've used tabs for years, tons of scripts I have worked in have used
>>>>>> tabs. Is there a well known standard for formatting in shell scripts?
>>>>>>
>>>>>> Changing it to match how it is done in other files is not reason enough.
>>>>> We've never discussed file type specific formatting guidelines, so I guess the assumption has always been that we use consistent formatting everywhere.
>>>>> You having used tabs for years is just as equally not a good reason to use tabs when everything else uses spaces.
>>>> but why change it? that introduces churn just for the sake of it. If
>>>> there is no consensus, then leaving things along seems the better
>>>> approach.
>>> I changed it because we've always used spaces for indentation everywhere, as it I see it you are seeking an exception to that for shell scripts and a consensus has not yet formed around that.
>>> If you're looking for precedent then note that this is the only shell script which contained tabs for indenting and those tabs were introduced by you less than 3 months ago.
>> debian/ofbiz-applications.postinst
>> debian/ofbiz-framework.config
>> debian/ofbiz-framework.postrm
>> debian/ofbiz-framework.ofbiz.init
>> debian/ofbiz-specialpurpose.postinst
>> debian/ofbiz-applications.prerm
>> debian/ofbiz-framework.postinst
>> debian/ofbiz-framework.prerm
>> debian/ofbiz-specialpurpose.prerm
>>
>> The above are shell scripts, added/maintained by me, of course, that
>> all contain tabs.
>>
>> debian/move-files.pl contains tabs.
>>
>> debian/rules does as well, but that is a Makefile, so it kind of has to.
>>
>> debian/ofbiz-framework.logrotate has tabs, but that's the pattern in
>> debian.
>>
>> debian/extract-entity-engine.xslt and debian/override-data.xslt are
>> xml files with a single-space indent.
>
> Yes I purposely didn't touch those because I know nothing about debian and how tabs to spaces would affect it.
>
> Arguing that these recently introduced files set some sort of precedent when we've had shell scripts using spaces and not tabs for quite a number of years doesn't really cut it IMO. I'm sorry that spaces don't jibe with how you like to work but you are the one trying to introduce change here, not me.
Yeah, I know that I'm the one who introduced these files.
I didn't change any of the other shell scripts, you are the one who
did so. I'm just trying to discuss if that is the proper approach for
ofbiz. And I don't think we have reached a consensus. You and I
obviously don't agree, so that proves their isn't consensus. The
safest thing to do in that case is not change a thing with the file(s).
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/ applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Scott Gray <sc...@hotwaxmedia.com>.
On 18/03/2010, at 11:40 AM, Adam Heath wrote:
> Scott Gray wrote:
>> On 17/03/2010, at 12:49 PM, Adam Heath wrote:
>>
>>> Scott Gray wrote:
>>>> On 17/03/2010, at 12:16 PM, Adam Heath wrote:
>>>>
>>>>> Scott Gray wrote:
>>>>>> On 17/03/2010, at 11:53 AM, Adam Heath wrote:
>>>>>>
>>>>>>> lektran@apache.org wrote:
>>>>>>>> Author: lektran
>>>>>>>> Date: Wed Mar 17 17:28:01 2010
>>>>>>>> New Revision: 924378
>>>>>>>>
>>>>>>>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>>>>>>>> Log:
>>>>>>>> Tabs to spaces
>>>>>>>> Modified: ofbiz/trunk/ant
>>>>>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>>>>>>>> ==============================================================================
>>>>>>>> --- ofbiz/trunk/ant (original)
>>>>>>>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>>>>>>>> @@ -26,14 +26,14 @@ else
>>>>>>>> fi
>>>>>>>>
>>>>>>>> find_jar() {
>>>>>>>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>>> - if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>>> - echo "$1"
>>>>>>>> - else
>>>>>>>> - echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>>> - exit 1
>>>>>>>> - fi
>>>>>>>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>>> + if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>>> + echo "$1"
>>>>>>>> + else
>>>>>>>> + echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>>> + exit 1
>>>>>>>> + fi
>>>>>>>> }
>>>>>>>> "$JAVA" -jar "$(find_jar)" "$@"
>>>>>>> I disagree. shell scripts need to be tab-based.
>>>>>> Why?
>>>>> What there a discussion as to how shell scripts should be formatted?
>>>>> I've used tabs for years, tons of scripts I have worked in have used
>>>>> tabs. Is there a well known standard for formatting in shell scripts?
>>>>>
>>>>> Changing it to match how it is done in other files is not reason enough.
>>>> We've never discussed file type specific formatting guidelines, so I guess the assumption has always been that we use consistent formatting everywhere.
>>>> You having used tabs for years is just as equally not a good reason to use tabs when everything else uses spaces.
>>> but why change it? that introduces churn just for the sake of it. If
>>> there is no consensus, then leaving things along seems the better
>>> approach.
>>
>> I changed it because we've always used spaces for indentation everywhere, as it I see it you are seeking an exception to that for shell scripts and a consensus has not yet formed around that.
>> If you're looking for precedent then note that this is the only shell script which contained tabs for indenting and those tabs were introduced by you less than 3 months ago.
>
> debian/ofbiz-applications.postinst
> debian/ofbiz-framework.config
> debian/ofbiz-framework.postrm
> debian/ofbiz-framework.ofbiz.init
> debian/ofbiz-specialpurpose.postinst
> debian/ofbiz-applications.prerm
> debian/ofbiz-framework.postinst
> debian/ofbiz-framework.prerm
> debian/ofbiz-specialpurpose.prerm
>
> The above are shell scripts, added/maintained by me, of course, that
> all contain tabs.
>
> debian/move-files.pl contains tabs.
>
> debian/rules does as well, but that is a Makefile, so it kind of has to.
>
> debian/ofbiz-framework.logrotate has tabs, but that's the pattern in
> debian.
>
> debian/extract-entity-engine.xslt and debian/override-data.xslt are
> xml files with a single-space indent.
Yes I purposely didn't touch those because I know nothing about debian and how tabs to spaces would affect it.
Arguing that these recently introduced files set some sort of precedent when we've had shell scripts using spaces and not tabs for quite a number of years doesn't really cut it IMO. I'm sorry that spaces don't jibe with how you like to work but you are the one trying to introduce change here, not me.
Regards
Scott
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/
applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/
applications/accounting/widget/ applications/commonext/webapp/o...
Posted by BJ Freeman <bj...@free-man.net>.
Yes I remember many discussion and a major effort to make all the file
to indent based on 4 spaces.
=========================
BJ Freeman
http://bjfreeman.elance.com
Strategic Power Office with Supplier Automation <http://www.businessesnetwork.com/automation/viewforum.php?f=93>
Specialtymarket.com <http://www.specialtymarket.com/>
Systems Integrator-- Glad to Assist
Chat Y! messenger: bjfr33man
Linkedin
<http://www.linkedin.com/profile?viewProfile=&key=1237480&locale=en_US&trk=tab_pro>
Scott Gray sent the following on 3/18/2010 10:49 AM:
> On 18/03/2010, at 11:40 AM, Adam Heath wrote:
>
>> Scott Gray wrote:
>>> On 17/03/2010, at 12:49 PM, Adam Heath wrote:
>>>
>>>> Scott Gray wrote:
>>>>> On 17/03/2010, at 12:16 PM, Adam Heath wrote:
>>>>>
>>>>>> Scott Gray wrote:
>>>>>>> On 17/03/2010, at 11:53 AM, Adam Heath wrote:
>>>>>>>
>>>>>>>> lektran@apache.org wrote:
>>>>>>>>> Author: lektran
>>>>>>>>> Date: Wed Mar 17 17:28:01 2010
>>>>>>>>> New Revision: 924378
>>>>>>>>>
>>>>>>>>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>>>>>>>>> Log:
>>>>>>>>> Tabs to spaces
>>>>>>>>> Modified: ofbiz/trunk/ant
>>>>>>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>>>>>>>>> ==============================================================================
>>>>>>>>> --- ofbiz/trunk/ant (original)
>>>>>>>>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>>>>>>>>> @@ -26,14 +26,14 @@ else
>>>>>>>>> fi
>>>>>>>>>
>>>>>>>>> find_jar() {
>>>>>>>>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>>>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>>>> - if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>>>> - echo "$1"
>>>>>>>>> - else
>>>>>>>>> - echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>>>> - exit 1
>>>>>>>>> - fi
>>>>>>>>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>>>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>>>> + if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>>>> + echo "$1"
>>>>>>>>> + else
>>>>>>>>> + echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>>>> + exit 1
>>>>>>>>> + fi
>>>>>>>>> }
>>>>>>>>> "$JAVA" -jar "$(find_jar)" "$@"
>>>>>>>> I disagree. shell scripts need to be tab-based.
>>>>>>> Why?
>>>>>> What there a discussion as to how shell scripts should be formatted?
>>>>>> I've used tabs for years, tons of scripts I have worked in have used
>>>>>> tabs. Is there a well known standard for formatting in shell scripts?
>>>>>>
>>>>>> Changing it to match how it is done in other files is not reason enough.
>>>>> We've never discussed file type specific formatting guidelines, so I guess the assumption has always been that we use consistent formatting everywhere.
>>>>> You having used tabs for years is just as equally not a good reason to use tabs when everything else uses spaces.
>>>> but why change it? that introduces churn just for the sake of it. If
>>>> there is no consensus, then leaving things along seems the better
>>>> approach.
>>> I changed it because we've always used spaces for indentation everywhere, as it I see it you are seeking an exception to that for shell scripts and a consensus has not yet formed around that.
>>> If you're looking for precedent then note that this is the only shell script which contained tabs for indenting and those tabs were introduced by you less than 3 months ago.
>> debian/ofbiz-applications.postinst
>> debian/ofbiz-framework.config
>> debian/ofbiz-framework.postrm
>> debian/ofbiz-framework.ofbiz.init
>> debian/ofbiz-specialpurpose.postinst
>> debian/ofbiz-applications.prerm
>> debian/ofbiz-framework.postinst
>> debian/ofbiz-framework.prerm
>> debian/ofbiz-specialpurpose.prerm
>>
>> The above are shell scripts, added/maintained by me, of course, that
>> all contain tabs.
>>
>> debian/move-files.pl contains tabs.
>>
>> debian/rules does as well, but that is a Makefile, so it kind of has to.
>>
>> debian/ofbiz-framework.logrotate has tabs, but that's the pattern in
>> debian.
>>
>> debian/extract-entity-engine.xslt and debian/override-data.xslt are
>> xml files with a single-space indent.
>
> Yes I purposely didn't touch those because I know nothing about debian and how tabs to spaces would affect it.
>
> Arguing that these recently introduced files set some sort of precedent when we've had shell scripts using spaces and not tabs for quite a number of years doesn't really cut it IMO. I'm sorry that spaces don't jibe with how you like to work but you are the one trying to introduce change here, not me.
>
> Regards
> Scott
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/
applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/
applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Adam Heath <do...@brainfood.com>.
Scott Gray wrote:
> On 17/03/2010, at 12:49 PM, Adam Heath wrote:
>
>> Scott Gray wrote:
>>> On 17/03/2010, at 12:16 PM, Adam Heath wrote:
>>>
>>>> Scott Gray wrote:
>>>>> On 17/03/2010, at 11:53 AM, Adam Heath wrote:
>>>>>
>>>>>> lektran@apache.org wrote:
>>>>>>> Author: lektran
>>>>>>> Date: Wed Mar 17 17:28:01 2010
>>>>>>> New Revision: 924378
>>>>>>>
>>>>>>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>>>>>>> Log:
>>>>>>> Tabs to spaces
>>>>>>> Modified: ofbiz/trunk/ant
>>>>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>>>>>>> ==============================================================================
>>>>>>> --- ofbiz/trunk/ant (original)
>>>>>>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>>>>>>> @@ -26,14 +26,14 @@ else
>>>>>>> fi
>>>>>>>
>>>>>>> find_jar() {
>>>>>>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>> - if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>> - echo "$1"
>>>>>>> - else
>>>>>>> - echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>> - exit 1
>>>>>>> - fi
>>>>>>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>>> + if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>>> + echo "$1"
>>>>>>> + else
>>>>>>> + echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>>> + exit 1
>>>>>>> + fi
>>>>>>> }
>>>>>>> "$JAVA" -jar "$(find_jar)" "$@"
>>>>>> I disagree. shell scripts need to be tab-based.
>>>>> Why?
>>>> What there a discussion as to how shell scripts should be formatted?
>>>> I've used tabs for years, tons of scripts I have worked in have used
>>>> tabs. Is there a well known standard for formatting in shell scripts?
>>>>
>>>> Changing it to match how it is done in other files is not reason enough.
>>> We've never discussed file type specific formatting guidelines, so I guess the assumption has always been that we use consistent formatting everywhere.
>>> You having used tabs for years is just as equally not a good reason to use tabs when everything else uses spaces.
>> but why change it? that introduces churn just for the sake of it. If
>> there is no consensus, then leaving things along seems the better
>> approach.
>
> I changed it because we've always used spaces for indentation everywhere, as it I see it you are seeking an exception to that for shell scripts and a consensus has not yet formed around that.
> If you're looking for precedent then note that this is the only shell script which contained tabs for indenting and those tabs were introduced by you less than 3 months ago.
debian/ofbiz-applications.postinst
debian/ofbiz-framework.config
debian/ofbiz-framework.postrm
debian/ofbiz-framework.ofbiz.init
debian/ofbiz-specialpurpose.postinst
debian/ofbiz-applications.prerm
debian/ofbiz-framework.postinst
debian/ofbiz-framework.prerm
debian/ofbiz-specialpurpose.prerm
The above are shell scripts, added/maintained by me, of course, that
all contain tabs.
debian/move-files.pl contains tabs.
debian/rules does as well, but that is a Makefile, so it kind of has to.
debian/ofbiz-framework.logrotate has tabs, but that's the pattern in
debian.
debian/extract-entity-engine.xslt and debian/override-data.xslt are
xml files with a single-space indent.
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/ applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Scott Gray <sc...@hotwaxmedia.com>.
On 17/03/2010, at 12:49 PM, Adam Heath wrote:
> Scott Gray wrote:
>> On 17/03/2010, at 12:16 PM, Adam Heath wrote:
>>
>>> Scott Gray wrote:
>>>> On 17/03/2010, at 11:53 AM, Adam Heath wrote:
>>>>
>>>>> lektran@apache.org wrote:
>>>>>> Author: lektran
>>>>>> Date: Wed Mar 17 17:28:01 2010
>>>>>> New Revision: 924378
>>>>>>
>>>>>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>>>>>> Log:
>>>>>> Tabs to spaces
>>>>>> Modified: ofbiz/trunk/ant
>>>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>>>>>> ==============================================================================
>>>>>> --- ofbiz/trunk/ant (original)
>>>>>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>>>>>> @@ -26,14 +26,14 @@ else
>>>>>> fi
>>>>>>
>>>>>> find_jar() {
>>>>>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>> - if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>> - echo "$1"
>>>>>> - else
>>>>>> - echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>> - exit 1
>>>>>> - fi
>>>>>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>>> + if [ $# = 1 ] && [ -e "$1" ]; then
>>>>>> + echo "$1"
>>>>>> + else
>>>>>> + echo "Couldn't find ant-launcher.jar" 1>&2
>>>>>> + exit 1
>>>>>> + fi
>>>>>> }
>>>>>> "$JAVA" -jar "$(find_jar)" "$@"
>>>>> I disagree. shell scripts need to be tab-based.
>>>> Why?
>>> What there a discussion as to how shell scripts should be formatted?
>>> I've used tabs for years, tons of scripts I have worked in have used
>>> tabs. Is there a well known standard for formatting in shell scripts?
>>>
>>> Changing it to match how it is done in other files is not reason enough.
>>
>> We've never discussed file type specific formatting guidelines, so I guess the assumption has always been that we use consistent formatting everywhere.
>> You having used tabs for years is just as equally not a good reason to use tabs when everything else uses spaces.
>
> but why change it? that introduces churn just for the sake of it. If
> there is no consensus, then leaving things along seems the better
> approach.
I changed it because we've always used spaces for indentation everywhere, as it I see it you are seeking an exception to that for shell scripts and a consensus has not yet formed around that.
If you're looking for precedent then note that this is the only shell script which contained tabs for indenting and those tabs were introduced by you less than 3 months ago.
Regards
Scott
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/
applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/
applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Adam Heath <do...@brainfood.com>.
Scott Gray wrote:
> On 17/03/2010, at 12:16 PM, Adam Heath wrote:
>
>> Scott Gray wrote:
>>> On 17/03/2010, at 11:53 AM, Adam Heath wrote:
>>>
>>>> lektran@apache.org wrote:
>>>>> Author: lektran
>>>>> Date: Wed Mar 17 17:28:01 2010
>>>>> New Revision: 924378
>>>>>
>>>>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>>>>> Log:
>>>>> Tabs to spaces
>>>>> Modified: ofbiz/trunk/ant
>>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>>>>> ==============================================================================
>>>>> --- ofbiz/trunk/ant (original)
>>>>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>>>>> @@ -26,14 +26,14 @@ else
>>>>> fi
>>>>>
>>>>> find_jar() {
>>>>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>> - if [ $# = 1 ] && [ -e "$1" ]; then
>>>>> - echo "$1"
>>>>> - else
>>>>> - echo "Couldn't find ant-launcher.jar" 1>&2
>>>>> - exit 1
>>>>> - fi
>>>>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>>> + if [ $# = 1 ] && [ -e "$1" ]; then
>>>>> + echo "$1"
>>>>> + else
>>>>> + echo "Couldn't find ant-launcher.jar" 1>&2
>>>>> + exit 1
>>>>> + fi
>>>>> }
>>>>> "$JAVA" -jar "$(find_jar)" "$@"
>>>> I disagree. shell scripts need to be tab-based.
>>> Why?
>> What there a discussion as to how shell scripts should be formatted?
>> I've used tabs for years, tons of scripts I have worked in have used
>> tabs. Is there a well known standard for formatting in shell scripts?
>>
>> Changing it to match how it is done in other files is not reason enough.
>
> We've never discussed file type specific formatting guidelines, so I guess the assumption has always been that we use consistent formatting everywhere.
> You having used tabs for years is just as equally not a good reason to use tabs when everything else uses spaces.
but why change it? that introduces churn just for the sake of it. If
there is no consensus, then leaving things along seems the better
approach.
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/ applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Scott Gray <sc...@hotwaxmedia.com>.
On 17/03/2010, at 12:16 PM, Adam Heath wrote:
> Scott Gray wrote:
>> On 17/03/2010, at 11:53 AM, Adam Heath wrote:
>>
>>> lektran@apache.org wrote:
>>>> Author: lektran
>>>> Date: Wed Mar 17 17:28:01 2010
>>>> New Revision: 924378
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>>>> Log:
>>>> Tabs to spaces
>>>> Modified: ofbiz/trunk/ant
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/ant (original)
>>>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>>>> @@ -26,14 +26,14 @@ else
>>>> fi
>>>>
>>>> find_jar() {
>>>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>> - if [ $# = 1 ] && [ -e "$1" ]; then
>>>> - echo "$1"
>>>> - else
>>>> - echo "Couldn't find ant-launcher.jar" 1>&2
>>>> - exit 1
>>>> - fi
>>>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>>> + if [ $# = 1 ] && [ -e "$1" ]; then
>>>> + echo "$1"
>>>> + else
>>>> + echo "Couldn't find ant-launcher.jar" 1>&2
>>>> + exit 1
>>>> + fi
>>>> }
>>>> "$JAVA" -jar "$(find_jar)" "$@"
>>> I disagree. shell scripts need to be tab-based.
>>
>> Why?
>
> What there a discussion as to how shell scripts should be formatted?
> I've used tabs for years, tons of scripts I have worked in have used
> tabs. Is there a well known standard for formatting in shell scripts?
>
> Changing it to match how it is done in other files is not reason enough.
We've never discussed file type specific formatting guidelines, so I guess the assumption has always been that we use consistent formatting everywhere.
You having used tabs for years is just as equally not a good reason to use tabs when everything else uses spaces.
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/
applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/
applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Adam Heath <do...@brainfood.com>.
Scott Gray wrote:
> On 17/03/2010, at 11:53 AM, Adam Heath wrote:
>
>> lektran@apache.org wrote:
>>> Author: lektran
>>> Date: Wed Mar 17 17:28:01 2010
>>> New Revision: 924378
>>>
>>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>>> Log:
>>> Tabs to spaces
>>> Modified: ofbiz/trunk/ant
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/ant (original)
>>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>>> @@ -26,14 +26,14 @@ else
>>> fi
>>>
>>> find_jar() {
>>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>> - if [ $# = 1 ] && [ -e "$1" ]; then
>>> - echo "$1"
>>> - else
>>> - echo "Couldn't find ant-launcher.jar" 1>&2
>>> - exit 1
>>> - fi
>>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>>> + if [ $# = 1 ] && [ -e "$1" ]; then
>>> + echo "$1"
>>> + else
>>> + echo "Couldn't find ant-launcher.jar" 1>&2
>>> + exit 1
>>> + fi
>>> }
>>> "$JAVA" -jar "$(find_jar)" "$@"
>> I disagree. shell scripts need to be tab-based.
>
> Why?
What there a discussion as to how shell scripts should be formatted?
I've used tabs for years, tons of scripts I have worked in have used
tabs. Is there a well known standard for formatting in shell scripts?
Changing it to match how it is done in other files is not reason enough.
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/ applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Scott Gray <sc...@hotwaxmedia.com>.
On 17/03/2010, at 11:53 AM, Adam Heath wrote:
> lektran@apache.org wrote:
>> Author: lektran
>> Date: Wed Mar 17 17:28:01 2010
>> New Revision: 924378
>>
>> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
>> Log:
>> Tabs to spaces
>
>> Modified: ofbiz/trunk/ant
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/ant (original)
>> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
>> @@ -26,14 +26,14 @@ else
>> fi
>>
>> find_jar() {
>> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
>> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
>> - if [ $# = 1 ] && [ -e "$1" ]; then
>> - echo "$1"
>> - else
>> - echo "Couldn't find ant-launcher.jar" 1>&2
>> - exit 1
>> - fi
>> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
>> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
>> + if [ $# = 1 ] && [ -e "$1" ]; then
>> + echo "$1"
>> + else
>> + echo "Couldn't find ant-launcher.jar" 1>&2
>> + exit 1
>> + fi
>> }
>> "$JAVA" -jar "$(find_jar)" "$@"
>
> I disagree. shell scripts need to be tab-based.
Why?
Re: svn commit: r924378 [1/8] - in /ofbiz/trunk: ./ applications/accounting/config/
applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/payment/report/
applications/accounting/widget/ applications/commonext/webapp/o...
Posted by Adam Heath <do...@brainfood.com>.
lektran@apache.org wrote:
> Author: lektran
> Date: Wed Mar 17 17:28:01 2010
> New Revision: 924378
>
> URL: http://svn.apache.org/viewvc?rev=924378&view=rev
> Log:
> Tabs to spaces
> Modified: ofbiz/trunk/ant
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?rev=924378&r1=924377&r2=924378&view=diff
> ==============================================================================
> --- ofbiz/trunk/ant (original)
> +++ ofbiz/trunk/ant Wed Mar 17 17:28:01 2010
> @@ -26,14 +26,14 @@ else
> fi
>
> find_jar() {
> - top="$(cd "$(dirname "$0")"; echo "$PWD")"
> - set -- "$top"/framework/base/lib/ant-launcher-*.jar
> - if [ $# = 1 ] && [ -e "$1" ]; then
> - echo "$1"
> - else
> - echo "Couldn't find ant-launcher.jar" 1>&2
> - exit 1
> - fi
> + top="$(cd "$(dirname "$0")"; echo "$PWD")"
> + set -- "$top"/framework/base/lib/ant-launcher-*.jar
> + if [ $# = 1 ] && [ -e "$1" ]; then
> + echo "$1"
> + else
> + echo "Couldn't find ant-launcher.jar" 1>&2
> + exit 1
> + fi
> }
> "$JAVA" -jar "$(find_jar)" "$@"
I disagree. shell scripts need to be tab-based.