Author: jleroux
Date: Wed Oct 11 06:50:58 2006
New Revision: 462806
URL: http://svn.apache.org/viewvc?view=rev&rev=462806
Log:
This close a problem around http://issues.apache.org/jira/browse/OFBIZ-147
(namely show TVA in price but VAT tax geo id or/and VAT tax party empties).
If VAT tax geo id or/and VAT tax party are wrong there is still a problem
(little probability : lookup)
Modified:
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties
incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_fr.properties
Modified:
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?view=diff&rev=462806&r1=462805&r2=462806
==============================================================================
---
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
(original)
+++
incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
Wed Oct 11 06:50:58 2006
@@ -21,6 +21,17 @@
<simple-method method-name="createProductStore" short-description="Create
a Product Store">
<check-permission permission="CATALOG" action="_CREATE"><fail-message
message="Security Error: to run createProductStore you must have the
CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
+
+ <if-compare field-name="parameters.showPricesWithVatTax"
operator="equals" value="Y">
+ <if-empty field-name="parameters.vatTaxAuthGeoId" >
+ <add-error><fail-property property="VatTaxAuthGeoNotSet"
resource="CommonUiLabels"/></add-error>
+ <check-errors/>
+ </if-empty>
+ <if-empty field-name="parameters.vatTaxAuthPartyId" >
+ <add-error><fail-property property="VatTaxAuthPartyNotSet"
resource="CommonUiLabels"/></add-error>
+ <check-errors/>
+ </if-empty>
+ </if-compare>
<make-value value-name="newEntity" entity-name="ProductStore"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -46,6 +57,17 @@
<check-permission permission="CATALOG" action="_UPDATE"><fail-message
message="Security Error: to run updateProductStore you must have the
CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
<check-errors/>
+ <if-compare field-name="parameters.showPricesWithVatTax"
operator="equals" value="Y">
+ <if-empty field-name="parameters.vatTaxAuthGeoId" >
+ <add-error><fail-property property="VatTaxAuthGeoNotSet"
resource="CommonUiLabels"/></add-error>
+ <check-errors/>
+ </if-empty>
+ <if-empty field-name="parameters.vatTaxAuthPartyId" >
+ <add-error><fail-property property="VatTaxAuthPartyNotSet"
resource="CommonUiLabels"/></add-error>
+ <check-errors/>
+ </if-empty>
+ </if-compare>
+
<set from-field="parameters.productStoreId"
field="lookupPKMap.productStoreId"/>
<find-by-primary-key entity-name="ProductStore" map-name="lookupPKMap"
value-name="store"/>
<set from-field="store.inventoryFacilityId" field="oldFacilityId"/>
Modified:
incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties?view=diff&rev=462806&r1=462805&r2=462806
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties
(original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties Wed
Oct 11 06:50:58 2006
@@ -46,8 +46,8 @@
CommonAnyStore=Any Store
CommonAnyWebSite=Any Web Site
CommonApply=Apply
-CommonApril=April
CommonApproved=Approved
+CommonApril=April
CommonArea=Area
CommonAreaCode=Area Code
CommonAssociate=Associate
@@ -62,13 +62,14 @@
CommonBackTo=Back to
CommonBackToList=Back To List
CommonBackToOptions=Back to Options
+CommonBankAccntNrAbbr=AccntNr
CommonBenefit=Benefit
CommonBut=but
CommonBy=By
CommonCancel=Cancel
-CommonCancelled=Cancelled
CommonCancelAll=Cancel All
CommonCancelDone=Cancel/Done
+CommonCancelled=Cancelled
CommonChange=Change
CommonChart=Charts
CommonChecked=Checked
@@ -131,8 +132,8 @@
CommonEnabled=Enabled
CommonEndDate=End date
CommonEndDateTime=End Date/Time
-CommonEntry=Entry
CommonEntries=Entries
+CommonEntry=Entry
CommonEventDate=EventDate
CommonExpectation=Expectation
CommonExpire=Expire
@@ -144,6 +145,7 @@
CommonFebruary=February
CommonFemale=Female
CommonFieldsMarkedAreRequired=Fields marked with (*) are required.
+CommonFinBankName=Bank
CommonFind=Find
CommonFindAll=Find All
CommonFinishDate=Finish Date/Time
@@ -200,8 +202,8 @@
CommonLoginHere=log in here
CommonLogout=Logout
CommonLookup=Lookup
-CommonMale=Male
CommonMain=Main
+CommonMale=Male
CommonManager=Manager
CommonMany=Many
CommonMarch=March
@@ -248,8 +250,8 @@
CommonOn=On
CommonOnly=Only
CommonOpenNewWindow=Open in New Window
-CommonOpenPageNewWindow=open page in new window
CommonOpenPageNewW=open the page in new window
+CommonOpenPageNewWindow=open page in new window
CommonOpenTab=+
CommonOptions=Options
CommonOr=OR
@@ -277,6 +279,7 @@
CommonProvince=Province
CommonPublish=Publish
CommonPurpose=Purpose
+CommonQty=Qty
CommonQualifier=Qualifier
CommonQuantity=Quantity
CommonQuarter=Quarter
@@ -303,6 +306,7 @@
CommonReturn=Return
CommonReturnStatus=Return Status
CommonReview=Review
+CommonRouting=Routing
CommonRun=Run
CommonSaturday=Saturday
CommonSave=Save
@@ -321,10 +325,10 @@
CommonSendEmail=send email
CommonSendPerEmail=Send per Email
CommonSendReportByMail=Send Report By Mail
+CommonSent=Sent
CommonSeptember=September
CommonSequence=Sequence
CommonSequenceNum=Sequence Num
-CommonSent=Sent
CommonSet=Set
CommonSetNowEmpty=(Will be set to now if empty)
CommonShow=Show
@@ -334,8 +338,8 @@
CommonSince=Since
CommonSmall=Small
CommonSorryYouCannotSend=Sorry, you cannot send this page to a friend. Select
rather from a category or an item
-CommonSortedBy=Sorted By
CommonSortOrder=Sort Order
+CommonSortedBy=Sorted By
CommonSpecified=Specified
CommonStartDate=Start Date
CommonStartDateTime=Start Date/Time
@@ -353,6 +357,7 @@
CommonSwitchAllTableViewOff=Simple vue
CommonSwitchAllTableViewOn=Large vue
CommonTally=Tally
+CommonTelephoneAbbr=Tel
CommonTellAFriend=Tell-A-Friend
CommonTest=Test
CommonText=Text
@@ -381,9 +386,9 @@
CommonUnitPrice=Unit Price
CommonUntil=Until
CommonUom=UOM
-CommonUomUomId=UOM ID
CommonUomAbbreviation=Abbreviation
CommonUomDescription=Description
+CommonUomUomId=UOM ID
CommonUpdate=Update
CommonUpdateLink=Update link
CommonUpdated=Updated
@@ -403,6 +408,7 @@
CommonViewCalendar=View Calendar
CommonViewRequest=View Request
CommonVolume=Volum
+CommonWebsite=Website
CommonWednesday=Wednesday
CommonWeek=Week
CommonWeight=Weight
@@ -417,13 +423,6 @@
CommonYouremail=Your email
CommonZipPostalCode=Zip/Postal Code
Content=Content
-CommonTelephoneAbbr=Tel
-CommonWebsite=Website
-CommonFinBankName=Bank
-CommonRouting=Routing
-CommonBankAccntNrAbbr=AccntNr
-CommonQty=Qty
-
DataSource=Data Source
DataSourceCreate=Create Data Source
DataSourceDataSourceDescription=Description
@@ -437,6 +436,29 @@
Facility=Facility
Factoids=Did you know?
Financials=Financials
+FormFieldTitle_addButton=Add
+FormFieldTitle_amount=Amount
+FormFieldTitle_comments=Comments
+FormFieldTitle_createButton=Create
+FormFieldTitle_currencyUomId=Currency
+FormFieldTitle_deleteButton=Delete
+FormFieldTitle_deleteSelectedButton=Delete Selected
+FormFieldTitle_description=Description
+FormFieldTitle_effectiveDate=Effective Date
+FormFieldTitle_fromDate=From Date
+FormFieldTitle_lineTotal=Line Total
+FormFieldTitle_price=Price
+FormFieldTitle_quantity=Quantity
+FormFieldTitle_removeButton=Remove
+FormFieldTitle_searchButton=Search
+FormFieldTitle_sequenceNum=Sequence Num
+FormFieldTitle_statusId=Status ID
+FormFieldTitle_submitButton=Submit
+FormFieldTitle_taxAuthGeoId=Tax Auth Geo ID
+FormFieldTitle_thruDate=Thru Date
+FormFieldTitle_total=Total
+FormFieldTitle_uomId=Valuta
+FormFieldTitle_updateButton=Update
Manufacturing=Manufacturing
Marketing=Marketing
MostRecentlyViewed=Recently Viewed
@@ -454,6 +476,8 @@
PartyContactPurpose=Contact Purpose
PartyPartyID=Party ID
Shark=Shark
+VatTaxAuthGeoNotSet=Vat Tax Authority Geo not set.
+VatTaxAuthPartyNotSet=Vat Tax Auth Party not set.
WebTools=WebTools
WorkEffort=WorkEffort
bu=Bulgarian
@@ -464,33 +488,9 @@
es=Spanish
fr=French
gr=Greek
+it=Italian
+nl=Nederlands
pt=Portuguese
pt_BR=Portuguese Brazil
pt_PT=Portuguese Portugal
zh=Chinese
-nl=Nederlands
-it=Italian
-
-FormFieldTitle_addButton=Add
-FormFieldTitle_amount=Amount
-FormFieldTitle_currencyUomId=Currency
-FormFieldTitle_comments=Comments
-FormFieldTitle_createButton=Create
-FormFieldTitle_deleteButton=Delete
-FormFieldTitle_deleteSelectedButton=Delete Selected
-FormFieldTitle_effectiveDate=Effective Date
-FormFieldTitle_description=Description
-FormFieldTitle_lineTotal=Line Total
-FormFieldTitle_quantity=Quantity
-FormFieldTitle_removeButton=Remove
-FormFieldTitle_searchButton=Search
-FormFieldTitle_statusId=Status ID
-FormFieldTitle_submitButton=Submit
-FormFieldTitle_taxAuthGeoId=Tax Auth Geo ID
-FormFieldTitle_total=Total
-FormFieldTitle_uomId=Valuta
-FormFieldTitle_updateButton=Update
-FormFieldTitle_fromDate=From Date
-FormFieldTitle_thruDate=Thru Date
-FormFieldTitle_price=Price
-FormFieldTitle_sequenceNum=Sequence Num
Modified:
incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_fr.properties
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_fr.properties?view=diff&rev=462806&r1=462805&r2=462806
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_fr.properties
(original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_fr.properties
Wed Oct 11 06:50:58 2006
@@ -480,6 +480,8 @@
PartyPartyID=R\u00E9f. d'acteur
ServiceManagement=Service
Shark=Work-Flow
+VatTaxAuthGeoNotSet=La r\u00E9f. de zone de TVA manque
+VatTaxAuthPartyNotSet=La r\u00E9f. de centre de TVA manque
WebTools=Adm. Sys.
WorkEffort=T\u00E2che
bu=bulgare
