Modified: ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml Wed Nov 3 11:03:43 2010 @@ -2375,6 +2375,11 @@ under the License. <field name="price" type="currency-precise"></field> <field name="termUomId" type="id"><description>Mainly used for recurring and usage prices to specify a time/freq measure, or a usage unit measure (bits, minutes, etc)</description></field> <field name="customPriceCalcService" type="id"><description>Points to a CustomMethod used to specify a service for the calculation of the unit price of the product (NOTE: a better name for this field might be priceCalcCustomMethodId)</description></field> + <field name="priceWithTax" type="currency-precise"/> + <field name="taxAmount" type="currency-precise"/> + <field name="taxPercentage" type="fixed-point"/> + <field name="taxAuthPartyId" type="id-ne"/> + <field name="taxAuthGeoId" type="id-ne"/> <field name="createdDate" type="date-time"></field> <field name="createdByUserLogin" type="id-vlong"></field> <field name="lastModifiedDate" type="date-time"></field> @@ -2406,6 +2411,12 @@ under the License. <relation type="one" fk-name="PROD_PRICE_CMET" rel-entity-name="CustomMethod"> <key-map field-name="customPriceCalcService" rel-field-name="customMethodId"/> </relation> + <relation type="one" fk-name="PROD_PRC_TAXPTY" title="TaxAuthority" rel-entity-name="Party"> + <key-map field-name="taxAuthPartyId" rel-field-name="partyId"/> + </relation> + <relation type="one" fk-name="PROD_PRC_TAXGEO" title="TaxAuthority" rel-entity-name="Geo"> + <key-map field-name="taxAuthGeoId" rel-field-name="geoId"/> + </relation> <relation type="one" fk-name="PROD_PRICE_CBUL" title="CreatedBy" rel-entity-name="UserLogin"> <key-map field-name="createdByUserLogin" rel-field-name="userLoginId"/> </relation>
Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original) +++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml Wed Nov 3 11:03:43 2010 @@ -27,18 +27,20 @@ under the License. <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/> <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> <check-errors/> + + <call-simple-method method-name="inlineHandlePriceWithTaxIncuded"/> <make-value value-field="newEntity" entity-name="ProductPrice"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> - + <now-timestamp field="nowTimestamp"/> - + <if-empty field="newEntity.fromDate"> <set field="newEntity.fromDate" from-field="nowTimestamp"/> </if-empty> <field-to-result field="newEntity.fromDate" result-name="fromDate"/> - + <set field="newEntity.lastModifiedDate" from-field="nowTimestamp"/> <set field="newEntity.createdDate" from-field="nowTimestamp"/> <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/> @@ -53,6 +55,8 @@ under the License. <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> <check-errors/> + <call-simple-method method-name="inlineHandlePriceWithTaxIncuded"/> + <entity-one entity-name="ProductPrice" value-field="lookedUpValue"/> <!-- grab the old price value before setting nonpk parameter fields --> @@ -82,6 +86,71 @@ under the License. <remove-value value-field="lookedUpValue"/> </simple-method> + <simple-method method-name="inlineHandlePriceWithTaxIncuded" short-description="Inline Handle Price with Tax Included"> + <if-not-empty field="parameters.taxAuthCombinedId"> + <set field="taxAuthCombinedId" from-field="parameters.taxAuthCombinedId"/> + <!-- if passed in value will be split based on: "${taxAuthGeoId}::${taxAuthPartyId}" --> + <set field="parameters.taxAuthGeoId" + value="${groovy:taxAuthCombinedId.substring(0,taxAuthCombinedId.indexOf('::'))}"/> + <set field="parameters.taxAuthPartyId" + value="${groovy:taxAuthCombinedId.substring(taxAuthCombinedId.indexOf('::')+2)}"/> + </if-not-empty> + + <!-- handle price with tax included related fields (priceWithTax, taxAmount, taxPercentage, taxAuthPartyId, taxAuthGeoId) --> + <if> + <condition> + <and> + <not><if-empty field="parameters.taxAuthPartyId"></if-empty></not> + <not><if-empty field="parameters.taxAuthGeoId"></if-empty></not> + </and> + </condition> + <then> + <set field="parameters.priceWithTax" from-field="parameters.price"/> + <!-- if taxPercentage not passed in look it up based on taxAuthGeoId and taxAuthPartyId --> + <if-empty field="parameters.taxPercentage"> + <!-- we only have basic data to constrain by here, so assume that if it is a VAT tax setup it should be pretty simple --> + <entity-condition entity-name="TaxAuthorityRateProduct" list="taxAuthorityRateProductList" filter-by-date="true"> + <condition-list combine="and"> + <condition-expr field-name="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> + <condition-expr field-name="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> + <condition-list combine="or"> + <condition-expr field-name="taxAuthorityRateTypeId" value="SALES_TAX"/> + <condition-expr field-name="taxAuthorityRateTypeId" value="VAT_TAX"/> + </condition-list> + </condition-list> + </entity-condition> + <set field="parameters.taxPercentage" from-field="taxAuthorityRateProductList[0].taxPercentage" type="BigDecimal"/> + </if-empty> + + <if-empty field="parameters.taxPercentage"> + <add-error><fail-message message="Tax Authority was specified but no Tax Percentage passed in, and could not find one in the Tax Authority Rate Product settings, so cannot handle price with tax included."/></add-error> + <check-errors/> + </if-empty> + + <calculate field="parameters.taxAmount" type="BigDecimal" decimal-scale="3" rounding-mode="HalfEven"> + <calcop operator="subtract"> + <calcop operator="get" field="parameters.priceWithTax"/> + <calcop operator="divide"> + <calcop operator="get" field="parameters.priceWithTax"/> + <calcop operator="add"> + <number value="1"/> + <calcop operator="divide"> + <calcop operator="get" field="parameters.taxPercentage"/> + <number value="100"/> + </calcop> + </calcop> + </calcop> + </calcop> + </calculate> + <calculate field="parameters.price" type="BigDecimal" decimal-scale="3" rounding-mode="HalfEven"> + <calcop operator="subtract"> + <calcop operator="get" field="parameters.priceWithTax"/> + <calcop operator="get" field="parameters.taxAmount"></calcop> + </calcop> + </calculate> + </then> + </if> + </simple-method> <simple-method method-name="saveProductPriceChange" short-description="Save History of ProductPrice Change"> <check-permission permission="CATALOG" action="_UPDATE"> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 3 11:03:43 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1028265 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1030401 Modified: ofbiz/branches/jquery/applications/product/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/servicedef/services.xml (original) +++ ofbiz/branches/jquery/applications/product/servicedef/services.xml Wed Nov 3 11:03:43 2010 @@ -239,14 +239,23 @@ under the License. <!-- Product Price Services --> <service name="createProductPrice" default-entity-name="ProductPrice" engine="simple" location="component://product/script/org/ofbiz/product/price/PriceServices.xml" invoke="createProductPrice" auth="true"> - <description>Create an ProductPrice</description> + <description> + Create an ProductPrice. + Price is always stored without tax. + If a taxAuthGeoId and taxAuthPartyId are (or taxAuthCombinedId is) passed in then the price will be considered a price + with tax included and the tax will be removed before storing to the database + (the priceWithTax, taxAmount, and taxPercentage fields will also be populated). + </description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"> + <exclude field-name="priceWithTax"/> + <exclude field-name="taxAmount"/> <exclude field-name="createdDate"/> <exclude field-name="createdByUserLogin"/> <exclude field-name="lastModifiedDate"/> <exclude field-name="lastModifiedByUserLogin"/> </auto-attributes> + <attribute name="taxAuthCombinedId" type="String" mode="IN" optional="true"><!-- if passed in value will be split based on: "${taxAuthGeoId}::${taxAuthPartyId}" --></attribute> <override name="fromDate" mode="INOUT" optional="true"/> <override name="price" optional="false"/> </service> @@ -255,6 +264,8 @@ under the License. <description>Update an ProductPrice</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"> + <exclude field-name="priceWithTax"/> + <exclude field-name="taxAmount"/> <exclude field-name="createdDate"/> <exclude field-name="createdByUserLogin"/> <exclude field-name="lastModifiedDate"/> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml Wed Nov 3 11:03:43 2010 @@ -462,12 +462,12 @@ under the License. </menu-item> </menu> - <menu name="WebAnalyticsConfigTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2"> + <menu name="WebAnalyticsConfigButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2"> <menu-item name="FindWebAnalyticsConfigs" title="${uiLabelMap.CommonFind}"><link target="FindWebAnalyticsConfigs"/></menu-item> <menu-item name="EditWebAnalyticsConfig" title="${uiLabelMap.CommonNew}"><link target="EditWebAnalyticsConfig"/></menu-item> </menu> - <menu name="WebAnalyticsTypeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2"> + <menu name="WebAnalyticsTypeButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2"> <menu-item name="FindWebAnalyticsTypes" title="${uiLabelMap.CommonFind}"><link target="FindWebAnalyticsTypes"/></menu-item> <menu-item name="EditWebAnalyticsType" title="${uiLabelMap.CommonNew}"><link target="EditWebAnalyticsType"/></menu-item> </menu> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml Wed Nov 3 11:03:43 2010 @@ -294,14 +294,22 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> + <decorator-section name="pre-body"> <section> - <!-- do check for CATALOG, _VIEW permission --> <condition> <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> <include-menu name="WebAnalyticsTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + </widgets> + </section> + </decorator-section> + <decorator-section name="body"> + <section> + <condition> + <if-has-permission permission="CATALOG" action="_VIEW"/> + </condition> + <widgets> <container style="no-clear"> <decorator-section-include name="body"/> </container> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionScreens.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionScreens.xml Wed Nov 3 11:03:43 2010 @@ -44,7 +44,7 @@ under the License. <decorator-section name="menu-bar"> <container style="button-bar"> <link target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}" style="buttontext create"/> - <link target="FindSubscriptionResource" text="${uiLabelMap.PageTitleFindSubscriptionResource}" style="buttontext"/> + <link target="FindSubscriptionResource" text="${uiLabelMap.PageTitleFindSubscriptionResource}" style="buttontext search"/> </container> </decorator-section> <decorator-section name="search-options"> @@ -188,7 +188,7 @@ under the License. <label text="${uiLabelMap.PageTitleFindSubscriptionResource}"/> </container> <container style="button-bar"> - <link target="EditSubscriptionResource" text="${uiLabelMap.ProductNewSubscriptionResource}" style="buttontext"/> + <link target="EditSubscriptionResource" text="${uiLabelMap.ProductNewSubscriptionResource}" style="buttontext create"/> </container> <include-form name="ListSubscriptionResources" location="component://product/widget/catalog/SubscriptionForms.xml"/> </widgets> Modified: ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsScreens.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsScreens.xml (original) +++ ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsScreens.xml Wed Nov 3 11:03:43 2010 @@ -35,9 +35,7 @@ under the License. <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> - <container> - <include-menu name="WebAnalyticsConfigTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </container> + <include-menu name="WebAnalyticsConfigButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/> </decorator-section> <decorator-section name="search-options"> <include-form name="FindWebAnalyticsConfig" location="component://product/widget/catalog/WebAnalyticsForms.xml"/> @@ -65,7 +63,7 @@ under the License. <widgets> <decorator-screen name="CommonWebAnalyticsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="WebAnalyticsConfigTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="WebAnalyticsConfigButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <screenlet title="${uiLabelMap.PageTitleEditWebAnalyticsConfig}"> <include-form name="EditWebAnalyticsConfig" location="component://product/widget/catalog/WebAnalyticsForms.xml"/> </screenlet> @@ -91,7 +89,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container> - <include-menu name="WebAnalyticsTypeTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="WebAnalyticsTypeButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/> </container> </decorator-section> <decorator-section name="search-options"> @@ -119,7 +117,7 @@ under the License. <widgets> <decorator-screen name="CommonWebAnalyticsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-menu name="WebAnalyticsTypeTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="WebAnalyticsTypeButtonBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <screenlet title="${uiLabelMap.PageTitleEditWebAnalyticsTypes}"> <include-form name="EditWebAnalyticsType" location="component://product/widget/catalog/WebAnalyticsForms.xml"/> </screenlet> Modified: ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml Wed Nov 3 11:03:43 2010 @@ -60,7 +60,7 @@ <value xml:lang="es">Manten. Activos</value> <value xml:lang="fr">Maintenance</value> <value xml:lang="hi_IN">सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¤¾ रà¤à¤°à¤à¤¾à¤µ</value> - <value xml:lang="it">Gestione cespiti</value> + <value xml:lang="it">Manutenzione</value> <value xml:lang="nl">Vermogensbeheer</value> <value xml:lang="th">à¸à¸²à¸£à¸£à¸±à¸à¸©à¸²à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸</value> <value xml:lang="zh">èµäº§ç»´æ¤</value> @@ -5442,7 +5442,7 @@ <value xml:lang="en">Powered by</value> <value xml:lang="fr">Fonctionne grâce à </value> <value xml:lang="hi_IN">दà¥à¤µà¤¾à¤°à¤¾ सà¤à¤à¤¾à¤²à¤¿à¤¤</value> - <value xml:lang="it">Potenziato da</value> + <value xml:lang="it">Realizzato con</value> <value xml:lang="zh">è¿è¡å¹³å°</value> </property> <property key="CommonPreferences"> Modified: ofbiz/branches/jquery/framework/common/servicedef/services_email.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/servicedef/services_email.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/servicedef/services_email.xml (original) +++ ofbiz/branches/jquery/framework/common/servicedef/services_email.xml Wed Nov 3 11:03:43 2010 @@ -33,8 +33,12 @@ under the License. <attribute name="sendFrom" type="String" mode="IN" optional="true"/> <attribute name="authUser" type="String" mode="IN" optional="true"/> <attribute name="authPass" type="String" mode="IN" optional="true"/> + <attribute name="port" type="String" mode="IN" optional="true"/> <attribute name="sendVia" type="String" mode="IN" optional="true"/> - <attribute name="sendType" type="String" mode="IN" optional="true"/> + <attribute name="sendType" type="String" mode="IN" optional="true"/> + <attribute name="socketFactoryClass" type="String" mode="IN" optional="true"/> + <attribute name="socketFactoryPort" type="String" mode="IN" optional="true"/> + <attribute name="socketFactoryFallback" type="String" mode="IN" optional="true"/> <attribute name="sendFailureNotification" mode="IN" type="Boolean" optional="true"/> <attribute name="sendPartial" mode="IN" type="Boolean" optional="true"/> <attribute name="subject" type="String" mode="INOUT" optional="true" allow-html="safe"/> Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 3 11:03:43 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1028265 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1030401 Modified: ofbiz/branches/jquery/framework/images/webapp/images/htmledit/whizzywig.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/htmledit/whizzywig.js?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/images/webapp/images/htmledit/whizzywig.js (original) +++ ofbiz/branches/jquery/framework/images/webapp/images/htmledit/whizzywig.js Wed Nov 3 11:03:43 2010 @@ -374,7 +374,7 @@ function tidyH(d){ //attempt valid xhtml .replace(/<[^>]+=[^>]+>/g,qa) //quote all atts .replace(/[â]/g,'-') //long â .replace(/[ââ]/g, "'") //single smartquotes ââ - .replace(/[ââ?]/g, '"') //double smartquotes ââ? + .replace(/[ââ]/g, '"') //double smartquotes ââ .replace(/<(TABLE|TD|TH|COL)(.*)(WIDTH|HEIGHT)=["'0-9A-Z]*/gi, "<$1$2") //no fixed size tables (%OK) [^A-Za-z>] .replace(/<([^>]+)>\s*<\/\1>/gi, "") //empty tag .replace(/>(<\/?[C-Z])/gi,">\n$1") //newline adjacent tags Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) +++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Wed Nov 3 11:03:43 2010 @@ -900,7 +900,8 @@ public class RequestHandler { * @return */ public String makeQueryString(HttpServletRequest request, ConfigXMLReader.RequestResponse requestResponse) { - if (requestResponse == null || requestResponse.redirectParameterMap.size() == 0) { + if (requestResponse == null || + (requestResponse.redirectParameterMap.size() == 0 && requestResponse.redirectParameterValueMap.size() == 0)) { Map<String, Object> urlParams = UtilHttp.getUrlOnlyParameterMap(request); String queryString = UtilHttp.urlEncodeArgs(urlParams, false); if(UtilValidate.isEmpty(queryString)) { Modified: ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml (original) +++ ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml Wed Nov 3 11:03:43 2010 @@ -865,7 +865,7 @@ <value xml:lang="de">Defintion: Dateiname oder URL</value> <value xml:lang="en">Definition Filename or URL</value> <value xml:lang="fr">Définition : nom de fichier ou URL</value> - <value xml:lang="it">Definizione: nome file o URL</value> + <value xml:lang="it">Nome o URL del file definizioni formato dati</value> <value xml:lang="th">à¸à¸³à¸à¸à¸´à¸à¸²à¸¢à¸à¸§à¸²à¸¡à¸«à¸¡à¸²à¸¢à¸à¸à¸à¸à¸·à¹à¸à¹à¸à¸¥à¹à¸«à¸£à¸·à¸ URL</value> <value xml:lang="zh">å®ä¹æ件åæç½å</value> </property> @@ -873,7 +873,7 @@ <value xml:lang="de">Defintion des Datendatei-Namens</value> <value xml:lang="en">Data File Definition Name</value> <value xml:lang="fr">Définition du nom du fichier de données</value> - <value xml:lang="it">Definizione nome file di dati</value> + <value xml:lang="it">Nome definizione formato dati</value> <value xml:lang="th">à¸à¸³à¸«à¸à¸à¸à¸·à¹à¸à¹à¸à¸¥à¹à¸à¹à¸à¸¡à¸¹à¸¥</value> <value xml:lang="zh">æ°æ®æ件å®ä¹å称</value> </property> Modified: ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original) +++ ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Wed Nov 3 11:03:43 2010 @@ -50,15 +50,15 @@ function ShowTab(lname) { <h2>${uiLabelMap.WebtoolsWithPk}: ${findByPk}</h2> <br /> <div class="button-bar"> - <a href='<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>' class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a> + <a href='<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>' class="buttontext">${uiLabelMap.WebtoolsBackToFindScreen}</a> <#if enableEdit = "false"> <#if hasCreatePermission> - <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}&enableEdit=true</@ofbizUrl>' class="smallSubmit">${uiLabelMap.CommonCreateNew}</a> - <a href="<@ofbizUrl>ViewGeneric?${curFindString}&enableEdit=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonEdit}</a> + <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}&enableEdit=true</@ofbizUrl>' class="buttontext create">${uiLabelMap.CommonCreateNew}</a> + <a href="<@ofbizUrl>ViewGeneric?${curFindString}&enableEdit=true</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> </#if> <#if value?has_content> <#if hasDeletePermission> - <a href='<@ofbizUrl>UpdateGeneric?UPDATE_MODE=DELETE&${curFindString}</@ofbizUrl>' class="smallSubmit">${uiLabelMap.WebtoolsDeleteThisValue}</a> + <a href='<@ofbizUrl>UpdateGeneric?UPDATE_MODE=DELETE&${curFindString}</@ofbizUrl>' class="buttontext delete">${uiLabelMap.WebtoolsDeleteThisValue}</a> </#if> </#if> </#if> Modified: ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml (original) +++ ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml Wed Nov 3 11:03:43 2010 @@ -172,7 +172,7 @@ under the License. <link target="ViewRelations" text="${uiLabelMap.WebtoolsViewRelations}" style="buttontext"> <parameter param-name="entityName" from-field="entityName"/> </link> - <link target="ViewGeneric" text="${uiLabelMap.CommonCreateNew}" style="buttontext"> + <link target="ViewGeneric" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"> <parameter param-name="entityName" from-field="entityName"/> <parameter param-name="enableEdit" value="true"/> </link> Modified: ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml (original) +++ ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml Wed Nov 3 11:03:43 2010 @@ -23,14 +23,14 @@ <value xml:lang="de">Vermögensverwaltungsanwendung</value> <value xml:lang="en">Asset Maintenance Application</value> <value xml:lang="fr">Application de maintenance des biens</value> - <value xml:lang="it">Applicazione gestione cespiti</value> + <value xml:lang="it">Applicazione manutenzione cespiti</value> <value xml:lang="th">à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²à¹à¸à¸£à¹à¸à¸£à¸¡</value> <value xml:lang="zh">èµäº§ç»´æ¤åºç¨ç¨åº</value> </property> <property key="AssetMaintCompanyName"> <value xml:lang="en">OFBiz: Asset Maintenance</value> <value xml:lang="fr">OFBiz : maintenance des biens</value> - <value xml:lang="it">OFBiz: Gestione cespiti</value> + <value xml:lang="it">OFBiz: Manutenzione cespiti</value> <value xml:lang="th">OFBiz: à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²</value> <value xml:lang="zh">OFBizï¼èµäº§ç»´æ¤</value> </property> @@ -66,7 +66,7 @@ <value xml:lang="de">Vermögensverwaltungsanwendung</value> <value xml:lang="en">Asset Maintenance</value> <value xml:lang="fr">Application de maintenance des biens</value> - <value xml:lang="it">Gestione cespiti</value> + <value xml:lang="it">Manutenzione cespiti</value> <value xml:lang="th">à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²à¹à¸à¸£à¹à¸à¸£à¸¡</value> <value xml:lang="zh">èµäº§ç»´æ¤åºç¨ç¨åº</value> </property> Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 3 11:03:43 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1028265 +/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1030401 Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Wed Nov 3 11:03:43 2010 @@ -262,7 +262,7 @@ <value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸à¸à¸§à¸²à¸¡</value> <value xml:lang="zh">æç« ä¿¡æ¯</value> </property> - <property key="EcommerceArticleInformation"> + <property key="EcommerceArticleName"> <value xml:lang="en">Article Name</value> <value xml:lang="th">à¸à¸·à¹à¸à¸à¸à¸à¸§à¸²à¸¡</value> </property> @@ -313,6 +313,10 @@ <value xml:lang="pt_BR">Você deve registrar-se para adicionar uma resposta</value> <value xml:lang="zh">ä½ å¿ é¡»ç»å½æè½æ·»å ä¸ä¸ªåçã</value> </property> + <property key="EcommerceBlogAddCommentPermissionError"> + <value xml:lang="en">You do not have permission to add comment.</value> + <value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¸¡à¸µà¸ªà¸´à¸à¸à¸´à¹à¹à¸à¸à¸²à¸£à¹à¸ªà¸à¸à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value> + </property> <property key="EcommerceBlogAddThread"> <value xml:lang="da">Tilføj en trÃ¥d</value> <value xml:lang="en">Add a thread:</value> Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/login.ftl?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/login.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/login.ftl Wed Nov 3 11:03:43 2010 @@ -19,8 +19,9 @@ under the License. <h1>${uiLabelMap.CommonLogin}</h1> <div class="screenlet"> - <h3>${uiLabelMap.CommonRegistered}</h3> - <form method="post" action="<@ofbizUrl>login</@ofbizUrl>" name="loginform"> + <div class="screenlet-title-bar"><h3>${uiLabelMap.CommonRegistered}</h3></div> + <div class="screenlet-body"> + <form method="post" action="<@ofbizUrl>login</@ofbizUrl>" name="loginform" class="horizontal"> <fieldset> <div> <label for="userName">${uiLabelMap.CommonUsername}</label> @@ -42,11 +43,13 @@ under the License. </div> </fieldset> </form> + </div> </div> <div class="screenlet"> - <h3>${uiLabelMap.CommonForgotYourPassword}?</h3> - <form method="post" action="<@ofbizUrl>forgotpassword</@ofbizUrl>"> + <div class="screenlet-title-bar"><h3>${uiLabelMap.CommonForgotYourPassword}</h3></div> + <div class="screenlet-body"> + <form method="post" action="<@ofbizUrl>forgotpassword</@ofbizUrl>" class="horizontal"> <div> <label for="forgotpassword_userName">${uiLabelMap.CommonUsername}</label> <input type="text" id="forgotpassword_userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/> @@ -56,6 +59,7 @@ under the License. <input type="submit" class="button" name="EMAIL_PASSWORD" value="${uiLabelMap.CommonEmailPassword}"/> </div> </form> + </div> </div> <#-- <div class="screenlet"> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 3 11:03:43 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1028265 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1030401 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 3 11:03:43 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1028265 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1030401 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 3 11:03:43 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1028265 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1030401 Modified: ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css (original) +++ ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css Wed Nov 3 11:03:43 2010 @@ -1543,7 +1543,6 @@ border: #999999 solid 1px; textarea { background: #FFFFFF; font-size: 8pt; -background: white; border: #999999 solid 1px; margin: 2px; } @@ -1957,7 +1956,6 @@ border-left-width: thin .editInputBox { font-size: 8pt; background: #FFFFFF; -background: white; border: #999999 solid 1px; margin: 2px; } Modified: ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css (original) +++ ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css Wed Nov 3 11:03:43 2010 @@ -1451,46 +1451,46 @@ float: right; .button-bar ul a,.button-bar a { background-image:url(../images/tab_normal1.png); color:#000000; -padding:0.6em 1em 0.9em 1em; +padding: 6px 10px 6px; line-height:19px; white-space: nowrap; text-transform:uppercase; } .button-bar ul a.create,.button-bar a.create { -background: url(../images/ptrn_create.gif) no-repeat; +background: url(../images/button_sprite.png) no-repeat 0px 0px; padding:6px 10px 6px 30px; } .button-bar ul a.create:hover,.button-bar a.create:hover { -background: url(../images/ptrn_hot_create.gif) no-repeat; +background: url(../images/button_sprite.png) no-repeat 0px -26px; } .button-bar ul a.delete,.button-bar a.delete { -background: url(../images/ptrn_delete.jpg) no-repeat; +background: url(../images/button_sprite.png) no-repeat 0px -52px; padding:6px 10px 6px 30px; } .button-bar ul a.delete:hover,.button-bar a.delete:hover { -background: url(../images/ptrn_hot_delete.jpg) no-repeat; +background: url(../images/button_sprite.png) no-repeat 0px -78px; } .button-bar ul a.refresh,.button-bar a.refresh { -background: url(../images/ptrn_refresh.png) no-repeat; +background: url(../images/button_sprite.png) no-repeat 0px -156px; padding:6px 10px 6px 30px; } .button-bar ul a.refresh:hover,.button-bar a.refresh:hover { -background: url(../images/ptrn_hot_refresh.png) no-repeat; +background: url(../images/button_sprite.png) no-repeat 0px -182px; } .button-bar ul a.search,.button-bar a.search { -background: url(../images/ptrn_search.png) no-repeat; +background: url(../images/button_sprite.png) no-repeat 0px -104px; padding:6px 10px 6px 30px; } .button-bar ul a.search:hover,.button-bar a.search:hover { -background: url(../images/ptrn_hot_search.png) no-repeat; +background: url(../images/button_sprite.png) no-repeat 0px -130px; } .button-bar ul a:hover,.button-bar a:hover { Modified: ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/login_bkgd.jpg URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/login_bkgd.jpg?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== Binary files - no diff available.
