svn commit: r1128865 [3/27] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1128865 [3/27] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy Sun May 29 11:02:09 2011 @@ -19,6 +19,7 @@ import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilProperties; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityOperator; @@ -30,6 +31,8 @@ import java.sql.Timestamp; import javolution.util.FastList; +uiLabelMap = UtilProperties.getResourceBundleMap("AccountingUiLabels", locale); + if (!thruDate) { thruDate = UtilDateTime.nowTimestamp(); } @@ -193,7 +196,7 @@ accountBalanceList.each { accountBalance balanceTotal = balanceTotal + accountBalance.balance; } context.assetAccountBalanceList = accountBalanceList; -context.assetAccountBalanceList.add(UtilMisc.toMap("accountName", "TOTAL ASSETS", "balance", balanceTotal)); +context.assetAccountBalanceList.add(UtilMisc.toMap("accountName", uiLabelMap.AccountingTotalAssets, "balance", balanceTotal)); context.assetBalanceTotal = balanceTotal; // CURRENT ASSETS @@ -301,7 +304,7 @@ accountBalanceList.each { accountBalance } //context.contraAssetAccountBalanceList = accountBalanceList; context.assetAccountBalanceList.addAll(accountBalanceList); -context.assetAccountBalanceList.add(UtilMisc.toMap("accountName", "TOTAL ACCUMULATED DEPRECIATION", "balance", balanceTotal)); +context.assetAccountBalanceList.add(UtilMisc.toMap("accountName", uiLabelMap.AccountingTotalAccumulatedDepreciation, "balance", balanceTotal)); context.contraAssetBalanceTotal = balanceTotal; //balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingLongTermAssetsAtCost", "balance", (context.longtermAssetBalanceTotal - context.contraAssetBalanceTotal))); balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalAccumulatedDepreciation", "balance", balanceTotal)); @@ -340,7 +343,7 @@ accountBalanceList.each { accountBalance balanceTotal = balanceTotal + accountBalance.balance; } context.liabilityAccountBalanceList = accountBalanceList; -context.liabilityAccountBalanceList.add(UtilMisc.toMap("accountName", "TOTAL LIABILITIES", "balance", balanceTotal)); +context.liabilityAccountBalanceList.add(UtilMisc.toMap("accountName", uiLabelMap.AccountingTotalLiabilities, "balance", balanceTotal)); context.liabilityBalanceTotal = balanceTotal; // CURRENT LIABILITY @@ -419,7 +422,7 @@ accountBalanceList.each { accountBalance balanceTotal = balanceTotal + accountBalance.balance; } context.equityAccountBalanceList = accountBalanceList; -context.equityAccountBalanceList.add(UtilMisc.toMap("accountName", "TOTAL EQUITIES", "balance", balanceTotal)); +context.equityAccountBalanceList.add(UtilMisc.toMap("accountName", uiLabelMap.AccountingTotalEquities, "balance", balanceTotal)); context.equityBalanceTotal = balanceTotal; context.liabilityEquityBalanceTotal = context.liabilityBalanceTotal + context.equityBalanceTotal Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/AccountingMenus.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/AccountingMenus.xml Sun May 29 11:02:09 2011 @@ -312,7 +312,7 @@ under the License. <parameter param-name="statusId" value="INVOICE_CANCELLED"/> </link> </menu-item> - <menu-item name="saveInvoiceAsTemplate" title="${uiLabelMap.ProjectMgrSaveAsTemplate}"> + <menu-item name="saveInvoiceAsTemplate" title="${uiLabelMap.AccountingInvoiceSaveAsTemplate}"> <condition> <and> <not><if-empty field="invoice.invoiceId"/></not> Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/InvoiceScreens.xml Sun May 29 11:02:09 2011 @@ -26,7 +26,7 @@ under the License. <screen name="CommonInvoiceDecorator"> <section> <actions> - <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="headerItem" value="invoices"/> </actions> Modified: ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml Sun May 29 11:02:09 2011 @@ -55,6 +55,9 @@ <value xml:lang="zh">åç</value> <value xml:lang="zh_TW">åç</value> </property> + <property key="ContentAnyAssocType"> + <value xml:lang="en">Any Assoc Type</value> + </property> <property key="ContentAssoc"> <value xml:lang="ar">ارتباط اÙÙ ØتÙÙ</value> <value xml:lang="da">Associeret indhold</value> @@ -1253,6 +1256,9 @@ <value xml:lang="zh">å¾å</value> <value xml:lang="zh_TW">åå</value> </property> + <property key="ContentIncludeAllSubContents"> + <value xml:lang="en">Include all Sub-Contents</value> + </property> <property key="ContentIndex"> <value xml:lang="ar">اÙدÙÙÙ</value> <value xml:lang="da">Indeks</value> @@ -1301,10 +1307,78 @@ <value xml:lang="fr">JPG</value> <value xml:lang="it">JPEG</value> </property> + <property key="ContentKeyword"> + <value xml:lang="de">Schlüsselwörter</value> + <value xml:lang="en">Keyword</value> + <value xml:lang="fr">Mot-clé</value> + <value xml:lang="it">Chiave</value> + <value xml:lang="th">à¸à¸µà¸¢à¹à¹à¸§à¸´à¸£à¹à¸</value> + <value xml:lang="zh">å ³é®å</value> + <value xml:lang="zh_TW">ééµå</value> + </property> + <property key="ContentKeywordAnyWordMatches"> + <value xml:lang="de">Beliebiges Wort muss übereinstimmen</value> + <value xml:lang="en">any word matches</value> + <value xml:lang="es">cualquier palabra coincide</value> + <value xml:lang="fr">Au moins un des mots égal</value> + <value xml:lang="it">qualsiasi parola uguale</value> + <value xml:lang="ro">orice cuvant egal</value> + <value xml:lang="ru">ÑооÑвеÑÑÑвие лÑÐ±Ð¾Ð¼Ñ ÑловÑ</value> + <value xml:lang="th">à¸à¸²à¸à¸à¸³à¸à¸µà¹à¸à¸£à¸à¸à¸±à¸</value> + <value xml:lang="zh">ä»»ä¸åå¹é </value> + <value xml:lang="zh_TW">ä»»ä¸åå¹é </value> + </property> + <property key="ContentKeywordRelevancy"> + <value xml:lang="cs">Shoda klÃÄového slova</value> + <value xml:lang="de">Stichwortrelevanz</value> + <value xml:lang="en">Keyword Relevancy</value> + <value xml:lang="es">Relevancia de palabra clave</value> + <value xml:lang="fr">Pertinence du mot-clé</value> + <value xml:lang="it">Rilevanza chiave</value> + <value xml:lang="ja">Keyword Relevancy</value> + <value xml:lang="nl">Sleutelwoord relevantie</value> + <value xml:lang="ro">Relevare Cheie</value> + <value xml:lang="ru">Keyword Relevancy</value> + <value xml:lang="th">à¸à¸³à¸«à¸¥à¸±à¸à¸à¸±à¹à¸à¸«à¸¡à¸</value> + <value xml:lang="zh">å ³é®åå ³è</value> + <value xml:lang="zh_TW">ééµåéè¯</value> + </property> + <property key="ContentKeywordWhere"> + <value xml:lang="de">wo</value> + <value xml:lang="en">where</value> + <value xml:lang="es">donde</value> + <value xml:lang="fr">où</value> + <value xml:lang="it">dove</value> + <value xml:lang="ro">Unde</value> + <value xml:lang="ru">где</value> + <value xml:lang="th">à¸à¸¶à¹à¸</value> + <value xml:lang="zh">åªé</value> + <value xml:lang="zh_TW">åªé</value> + </property> + <property key="ContentKeywords"> + <value xml:lang="cs">KlÃÄová slova</value> + <value xml:lang="de">Stichwörter</value> + <value xml:lang="en">Keywords</value> + <value xml:lang="es">Palabras clave</value> + <value xml:lang="fr">Mots-clés</value> + <value xml:lang="hi_IN">मà¥à¤à¥à¤¯ शबà¥à¤¦</value> + <value xml:lang="it">Chiavi</value> + <value xml:lang="ja">Keywords</value> + <value xml:lang="nl">Sleutelwoorden</value> + <value xml:lang="pt_PT">Palavras-Chave</value> + <value xml:lang="ro">Chei</value> + <value xml:lang="ru">ÐлÑÑевÑе Ñлова</value> + <value xml:lang="th">à¸à¸³à¸«à¸¥à¸±à¸</value> + <value xml:lang="zh">å ³é®å</value> + <value xml:lang="zh_TW">ééµå</value> + </property> <property key="ContentLastModifiedDateInvalidFormat"> <value xml:lang="en">Last Modified Date is not a valid Timestamp input format.</value> <value xml:lang="it">Data modifica non è nel formato valido.</value> </property> + <property key="ContentLastUpdatedDateFilter"> + <value xml:lang="en">Last Updated Date Filter</value> + </property> <property key="ContentLatest"> <value xml:lang="da">Senest</value> <value xml:lang="en">Latest</value> @@ -1737,6 +1811,9 @@ <value xml:lang="zh">æ ¹</value> <value xml:lang="zh_TW">æ ¹</value> </property> + <property key="ContentSearchContents"> + <value xml:lang="en">Search Contents</value> + </property> <property key="ContentSecurityCreatePermission"> <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission</value> <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso CONTENTMGR_CREATE o CONTENTMGR_ADMIN</value> @@ -4366,6 +4443,9 @@ <value xml:lang="zh">æ°å»ºå 容</value> <value xml:lang="zh_TW">æ°å»ºå §å®¹</value> </property> + <property key="PageTitleAddContentKeyword"> + <value xml:lang="en">Add Content Keyword</value> + </property> <property key="PageTitleAddDataResource"> <value xml:lang="ar">إضاÙØ© Ù Ùرد ٠عÙÙ٠ات</value> <value xml:lang="da">Tilføj dataressource</value> @@ -4689,6 +4769,9 @@ <value xml:lang="zh">ç¼è¾å 容å±æ§</value> <value xml:lang="zh_TW">ç·¨è¼¯å §å®¹å±¬æ§</value> </property> + <property key="PageTitleEditContentKeywords"> + <value xml:lang="en">Edit Content Keywords</value> + </property> <property key="PageTitleEditContentMetadata"> <value xml:lang="ar">تعرÙر Ù Ùتا ٠عÙÙ٠ات Ù ØتÙÙ</value> <value xml:lang="da">Ret indhold metadata</value> Modified: ofbiz/branches/jackrabbit20100709/applications/content/entitydef/eecas.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/entitydef/eecas.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/entitydef/eecas.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/entitydef/eecas.xml Sun May 29 11:02:09 2011 @@ -26,4 +26,36 @@ under the License. <action service="clearAssociatedRenderCache" mode="sync" /> </eca> + <!-- Content Keyword Indexing ECAs --> + <eca entity="Content" operation="create" event="return"> + <action service="indexContentKeywords" mode="sync" value-attr="contentInstance"/> + </eca> + <eca entity="Content" operation="store" event="return"> + <action service="indexContentKeywords" mode="sync"/> + </eca> + <eca entity="ContentAttribute" operation="create-store" event="return"> + <action service="indexContentKeywords" mode="sync"/> + </eca> + <eca entity="ContentMetaData" operation="create-store" event="return"> + <action service="indexContentKeywords" mode="sync"/> + </eca> + <eca entity="ContentRole" operation="create-store" event="return"> + <action service="indexContentKeywords" mode="sync"/> + </eca> + <eca entity="ProductContent" operation="create-store" event="return"> + <action service="indexContentKeywords" mode="sync"/> + </eca> + <eca entity="ProductCategoryContent" operation="create-store" event="return"> + <action service="indexContentKeywords" mode="sync"/> + </eca> + <eca entity="PartyContent" operation="create-store" event="return"> + <action service="indexContentKeywords" mode="sync"/> + </eca> + <eca entity="WebSiteContent " operation="create-store" event="return"> + <action service="indexContentKeywords" mode="sync"/> + </eca> + <eca entity="WorkEffortContent " operation="create-store" event="return"> + <action service="indexContentKeywords" mode="sync"/> + </eca> + </entity-eca> Modified: ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml Sun May 29 11:02:09 2011 @@ -1645,4 +1645,52 @@ under the License. <key-map field-name="helpContentId" rel-field-name="contentId"/> </relation> </extend-entity> + + <entity entity-name="ContentKeyword" package-name="org.ofbiz.content.content" title="Content Keyword Entity" never-cache="true"> + <field name="contentId" type="id-ne"></field> + <field name="keyword" type="short-varchar"></field> + <field name="relevancyWeight" type="numeric"></field> + <prim-key field="contentId"/> + <prim-key field="keyword"/> + <relation type="one" fk-name="CNT_KWD_CNT" rel-entity-name="Content"> + <key-map field-name="contentId"/> + </relation> + <index name="CNT_KWD_KWD"> + <index-field name="keyword"/> + </index> + </entity> + <entity entity-name="ContentSearchConstraint" package-name="org.ofbiz.content.content" never-cache="true" title="Content Search Result Constraint Entity"> + <field name="contentSearchResultId" type="id-ne"></field> + <field name="constraintSeqId" type="id-ne"></field> + <field name="constraintName" type="long-varchar"></field> + <field name="infoString" type="long-varchar"></field> + <field name="includeSubCategories" type="indicator"></field> + <field name="isAnd" type="indicator"></field> + <field name="anyPrefix" type="indicator"></field> + <field name="anySuffix" type="indicator"></field> + <field name="removeStems" type="indicator"></field> + <field name="lowValue" type="short-varchar"></field> + <field name="highValue" type="short-varchar"></field> + <prim-key field="contentSearchResultId"/> + <prim-key field="constraintSeqId"/> + <relation type="one" fk-name="CNT_SCHRSI_RES" rel-entity-name="ContentSearchResult"> + <key-map field-name="contentSearchResultId"/> + </relation> + </entity> + <entity entity-name="ContentSearchResult" + package-name="org.ofbiz.content.content" + never-cache="true" + title="Content Search Result Entity"> + <field name="contentSearchResultId" type="id-ne"></field> + <field name="visitId" type="id"></field> + <field name="orderByName" type="long-varchar"></field> + <field name="isAscending" type="indicator"></field> + <field name="numResults" type="numeric"></field> + <field name="secondsTotal" type="floating-point"></field> + <field name="searchDate" type="date-time"></field> + <prim-key field="contentSearchResultId"/> + <relation type="one" fk-name="CNT_SCHRES_VST" rel-entity-name="Visit"> + <key-map field-name="visitId"/> + </relation> + </entity> </entitymodel> Modified: ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/script/org/ofbiz/content/content/ContentServices.xml Sun May 29 11:02:09 2011 @@ -1229,4 +1229,52 @@ <field-to-result field="subContentList" result-name="subContentList"/> <field-to-result field="contentViewList" result-name="subSubContentList"/> </simple-method> + + <!-- Content Keyword Services --> + <simple-method method-name="createContentKeyword" short-description="create a ContentKeyword"> + <make-value entity-name="ContentKeyword" value-field="newEntity"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <create-value value-field="newEntity"/> + </simple-method> + + <simple-method method-name="updateContentKeyword" short-description="update a ContentKeyword"> + <entity-one entity-name="ContentKeyword" value-field="lookedUpValue"/> + <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> + <store-value value-field="lookedUpValue"/> + </simple-method> + + <simple-method method-name="deleteContentKeyword" short-description="delete a ContentKeyword"> + <entity-one entity-name="ContentKeyword" value-field="lookedUpValue"/> + <remove-value value-field="lookedUpValue"/> + </simple-method> + + <simple-method method-name="forceIndexContentKeywords" short-description="induce all the keywords of a content"> + <entity-one entity-name="Content" value-field="content"/> + <call-class-method class-name="org.ofbiz.content.content.ContentKeywordIndex" method-name="forceIndexKeywords"> + <field field="content" type="org.ofbiz.entity.GenericValue"/> + </call-class-method> + </simple-method> + + <simple-method method-name="deleteContentKeywords" short-description="delete all the keywords of a content"> + <entity-one entity-name="Content" value-field="content"/> + <remove-related value-field="content" relation-name="ContentKeyword"/> + </simple-method> + + <simple-method method-name="indexContentKeywords" short-description="Index the Keywords for a Content" login-required="false"> + <!-- this service is meant to be called from an entity ECA for entities that include a contentId --> + <!-- if it is the Content entity itself triggering this action, then a [contentInstance] parameter + will be passed and we can save a few cycles looking that up --> + <set from-field="parameters.contentInstance" field="contentInstance"/> + <if-empty field="contentInstance"> + <set from-field="parameters.contentId" field="findContentMap.contentId"/> + <find-by-primary-key entity-name="Content" map="findContentMap" value-field="contentInstance"/> + </if-empty> + + <!-- induce keywords--> + <call-class-method class-name="org.ofbiz.content.content.ContentKeywordIndex" method-name="indexKeywords"> + <field field="contentInstance" type="org.ofbiz.entity.GenericValue"/> + </call-class-method> + </simple-method> + </simple-methods> Modified: ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/servicedef/services.xml Sun May 29 11:02:09 2011 @@ -1152,4 +1152,49 @@ <implements service="permissionInterface"/> <attribute name="dataResourceId" type="String" mode="IN" optional="true"/> </service> + + <!-- Content Keyword Services --> + <service name="createContentKeyword" default-entity-name="ContentKeyword" engine="simple" + location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentKeyword" auth="true"> + <description>Create a ContentKeyword</description> + <permission-service service-name="genericContentPermission" main-action="CREATE"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + + <service name="updateContentKeyword" default-entity-name="ContentKeyword" engine="simple" + location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="updateContentKeyword" auth="true"> + <description>Update a ContentKeyword</description> + <permission-service service-name="genericContentPermission" main-action="UPDATE"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> + </service> + + <service name="deleteContentKeyword" default-entity-name="ContentKeyword" engine="simple" + location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="deleteContentKeyword" auth="true"> + <description>Delete a ContentKeyword</description> + <permission-service service-name="genericContentPermission" main-action="DELETE"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + </service> + + <service name="deleteContentKeywords" engine="simple" + location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="deleteContentKeywords" auth="true"> + <description>Delete all the keywords of a content</description> + <permission-service service-name="genericContentPermission" main-action="DELETE"/> + <attribute name="contentId" type="String" mode="IN" optional="false"/> + </service> + + <service name="indexContentKeywords" engine="simple" + location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="indexContentKeywords" auth="false"> + <description>Index the Keywords for a Content</description> + <attribute name="contentId" type="String" mode="IN" optional="false"/> + <attribute name="contentInstance" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> + </service> + + <service name="forceIndexContentKeywords" engine="simple" + location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="forceIndexContentKeywords" auth="true"> + <description>Induce all the keywords of a content, ignoring the flag in the Content.</description> + <permission-service service-name="genericContentPermission" main-action="CREATE"/> + <attribute name="contentId" type="String" mode="IN" optional="false"/> + </service> </services> Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementServices.java Sun May 29 11:02:09 2011 @@ -222,6 +222,10 @@ public class ContentManagementServices { dataResource.setPKFields(context); dataResource.setNonPKFields(context); dataResource.setAllFields(context, false, "dr", null); + String isPublic = (String) context.get("isPublic"); + if(UtilValidate.isEmpty(isPublic)){ + dataResource.set("isPublic", "N"); + } context.putAll(dataResource); String dataResourceId = (String) dataResource.get("dataResourceId"); String dataResourceTypeId = (String) dataResource.get("dataResourceTypeId"); Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java Sun May 29 11:02:09 2011 @@ -67,13 +67,12 @@ public class CompDocServices { /** * - * @param request - * @param response - * @return - * * Creates the topmost Content entity of a Composite Document tree. * Also creates an "empty" Composite Document Instance Content entity. * Creates ContentRevision/Item records for each, as well. + * @param dctx the dispatch context + * @param context the context + * @return Creates the topmost Content entity of a Composite Document tree */ public static Map<String, Object> persistRootCompDoc(DispatchContext dctx, Map<String, ? extends Object> context) { Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentWorker.java Sun May 29 11:02:09 2011 @@ -1337,8 +1337,8 @@ public class ContentWorker implements or /** * Checks to see if there is a purpose string (delimited by pipes) and * turns it into a list and concants to any existing purpose list. - * @param context - * @return + * @param context the context + * @return the list of content purpose */ public static List<String> prepContentPurposeList(Map<String, Object> context) { List<String> contentPurposeList = UtilGenerics.checkList(context.get("contentPurposeList")); Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Sun May 29 11:02:09 2011 @@ -51,12 +51,6 @@ import org.apache.commons.fileupload.Fil import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.tika.Tika; -import org.apache.tika.exception.TikaException; -import org.apache.tika.io.TikaInputStream; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.parser.AutoDetectParser; -import org.apache.tika.parser.ParseContext; -import org.apache.tika.parser.Parser; import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.FileUtil; @@ -84,9 +78,7 @@ import org.ofbiz.widget.screen.ScreenFac import org.ofbiz.widget.screen.ScreenRenderer; import org.ofbiz.widget.screen.ScreenStringRenderer; import org.w3c.dom.Document; -import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; import freemarker.template.Template; import freemarker.template.TemplateException; Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/data/DataServices.java Sun May 29 11:02:09 2011 @@ -344,9 +344,9 @@ public class DataServices { /** * Because sometimes a DataResource will exist, but no ElectronicText has been created, * this method will create an ElectronicText if it does not exist. - * @param dctx - * @param context - * @return + * @param dctx the dispatch context + * @param context the context + * @return update the ElectronicText */ public static Map<String, Object> updateElectronicTextMethod(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java Sun May 29 11:02:09 2011 @@ -164,7 +164,8 @@ public class SurveyWrapper { /** * Renders the Survey - * @return Writer object from the parsed Freemarker Template + * @param templateUrl the template URL + * @param writer the write * @throws SurveyWrapperException */ public void render(URL templateUrl, Writer writer) throws SurveyWrapperException { Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml Sun May 29 11:02:09 2011 @@ -1786,6 +1786,7 @@ under the License. </request-map> <!-- lookup other components --> + <request-map uri="LookupUserLoginAndPartyDetails"><security https="true" auth="true"/><response name="success" type="view" value="LookupUserLoginAndPartyDetails"/></request-map> <request-map uri="LookupPerson"><security auth="true" https="true"/><response name="success" type="view" value="LookupPerson"/></request-map> <request-map uri="LookupPartyAndUserLoginAndPerson"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyAndUserLoginAndPerson"/></request-map> <request-map uri="LookupProductFeature"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductFeature"/></request-map> @@ -1824,6 +1825,46 @@ under the License. <response name="success" type="view" value="showContentPdf"/> </request-map> + <!-- ================ Content keyword Search Requests ================= --> + <request-map uri="ContentSearchOptions"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ContentSearchOptions"/> + </request-map> + <request-map uri="ContentSearchResults"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ContentSearchResults"/> + </request-map> + + <!-- Content Keyword --> + <request-map uri="EditContentKeywords"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditContentKeywords"/> + </request-map> + <request-map uri="createContentKeyword"> + <security https="true" auth="true"/> + <event type="service" invoke="createContentKeyword"/> + <response name="success" type="view" value="EditContentKeywords"/> + <response name="error" type="view" value="EditContentKeywords"/> + </request-map> + <request-map uri="deleteContentKeyword"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteContentKeyword"/> + <response name="success" type="view" value="EditContentKeywords"/> + <response name="error" type="view" value="EditContentKeywords"/> + </request-map> + <request-map uri="createContentKeywords"> + <security https="true" auth="true"/> + <event type="service" invoke="createContentKeywords"/> + <response name="success" type="view" value="EditContentKeywords"/> + <response name="error" type="view" value="EditContentKeywords"/> + </request-map> + <request-map uri="deleteContentKeywords"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteContentKeywords"/> + <response name="success" type="view" value="EditContentKeywords"/> + <response name="error" type="view" value="EditContentKeywords"/> + </request-map> + <!-- View Mappings --> <view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/> <view-map name="fonts.fo" type="screenfop" page="component://content/widget/CommonScreens.xml#fonts.fo" content-type="application/pdf" encoding="none"/> @@ -1880,6 +1921,7 @@ under the License. <view-map name="EditContentOperation" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentOperation" type="screen"/> <view-map name="EditContentPurposeOperation" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentPurposeOperation" type="screen"/> <view-map name="EditContentWorkEfforts" page="component://content/widget/content/ContentScreens.xml#EditContentWorkEfforts" type="screen"/> + <view-map name="EditContentKeywords" type="screen" page="component://content/widget/content/ContentScreens.xml#EditContentKeywords"/> <view-map name="FindDataResource" page="component://content/widget/content/DataResourceScreens.xml#FindDataResource" type="screen"/> <view-map name="findDataResourceSearchResults" page="component://content/widget/content/DataResourceScreens.xml#findDataResourceSearchResults" type="screen"/> @@ -1981,6 +2023,7 @@ under the License. <view-map name="LookupListLayout" page="component://content/widget/LookupScreens.xml#LookupListLayout" type="screen"/> <view-map name="LookupSubContent" page="component://content/widget/LookupScreens.xml#LookupSubContent" type="screen"/> <!-- lookup other components --> + <view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/> <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/> <view-map name="LookupPartyAndUserLoginAndPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson" type="screen"/> <view-map name="LookupProductFeature" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature" type="screen"/> @@ -1997,5 +2040,9 @@ under the License. <view-map name="showContent" type="screen" page="component://content/widget/content/ContentScreens.xml#ShowContent"/> <view-map name="showContentPdf" type="screen" page="component://content/widget/content/ContentScreens.xml#ShowContent" content-type="application/pdf" encoding="none"/> - <!-- end of view mappings --> + <!-- content keyword search view --> + <view-map name="ContentSearchOptions" type="screen" page="component://content/widget/content/ContentScreens.xml#ContentSearchOptions"/> + <view-map name="ContentSearchResults" type="screen" page="component://content/widget/content/ContentScreens.xml#ContentSearchResults"/> + + <!-- end of view mappings --> </site-conf> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentForms.xml Sun May 29 11:02:09 2011 @@ -56,14 +56,17 @@ under the License. </entity-options> </drop-down> </field> - <field name="createdByUserLogin" position="2"><lookup target-form-name="LookupPerson"/></field> + <field name="createdByUserLogin" position="2"><lookup target-form-name="LookupUserLoginAndPartyDetails"/></field> <field name="localeString"> + <lookup target-form-name="LookupLocale"></lookup> + </field> + <!--<field name="localeString"> <drop-down allow-empty="true"> <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"> <entity-order-by field-name="countryName"/> </entity-options> </drop-down> - </field> + </field>--> <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -107,6 +110,7 @@ under the License. </sub-hyperlink> </display-entity> </field> + <field name="createdByUserLogin" sort-field="true"><display/></field> <on-event-update-area event-type="paginate" area-id="search-results" area-target="findContentSearchResults"/> </form> @@ -190,7 +194,10 @@ under the License. </sub-hyperlink> </lookup> </field> - <field name="mimeTypeId"> + <field name="localeString"> + <lookup target-form-name="LookupLocale"></lookup> + </field> + <field name="mimeTypeId" encode-output="false"> <drop-down allow-empty="true"> <entity-options description="${mimeTypeId} - ${description}" entity-name="MimeType" key-field-name="mimeTypeId"> <entity-order-by field-name="mimeTypeId"/> @@ -659,4 +666,24 @@ under the License. </field> <field name="saveButton"><submit/></field> </form> + + <!-- Content Keyword Forms --> + <form name="AddContentKeyword" target="createContentKeyword" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-service service-name="createContentKeyword"/> + <field name="contentId"><hidden value="${parameters.contentId}"/></field> + <field name="keyword" title="${uiLabelMap.ContentKeyword}*"><text size="10"/></field> + <field name="relevancyWeight" title="${uiLabelMap.ProductWeight}"><text size="5"/></field> + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListContentKeywords" type="list" target="deleteContentKeyword" odd-row-style="alternate-row" default-table-style="basic-table"> + <actions> + <entity-and entity-name="ContentKeyword" use-cache="true"> + <field-map from-field="contentId" field-name="contentId"/> + </entity-and> + </actions> + <auto-fields-entity entity-name="ContentKeyword" default-field-type="display"/> + <field name="contentId"><hidden/></field> + <field name="submitButton" title="${uiLabelMap.CommonDelete}"><submit button-type="button"/></field> + </form> </forms> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml Sun May 29 11:02:09 2011 @@ -110,8 +110,17 @@ under the License. <parameter param-name="contentId" from-field="parameters.contentId"/> </link> </menu-item> - + + <menu-item name="keywords" title="${uiLabelMap.ContentKeywords}" > + <condition> + <not><if-empty field="currentValue.contentId"/></not> + </condition> + <link target="EditContentKeywords"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> + </menu-item> </menu> + <menu name="contentSub" menu-container-style="button-bar button-style-2" default-menu-item-name="content" default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN" default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple"> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml Sun May 29 11:02:09 2011 @@ -42,7 +42,10 @@ under the License. <widgets> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> - <container style="button-bar"><link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/></container> + <container style="button-bar"> + <link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/> + <link text="${uiLabelMap.CommonAdvancedSearch}" target="ContentSearchOptions" style="buttontext"/> + </container> </decorator-section> <decorator-section name="search-options"> <include-form name="FindContent" location="component://content/widget/content/ContentForms.xml"/> @@ -82,7 +85,7 @@ under the License. <screen name="navigateContent"> <section> <actions> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/> <set field="titleProperty" value="PageTitleNavigateContent"/> <set field="tabButtonItem" value="navigateContent"/> <set field="labelTitleProperty" value="PageTitleNavigateContent"/> @@ -594,4 +597,66 @@ under the License. </widgets> </section> </screen> + + <screen name="ContentSearchOptions"> + <section> + <actions> + <set field="titleProperty" value="PageTitleSearchResults"/> + <script location="component://content/webapp/content/WEB-INF/actions/content/ContentSearchOptions.groovy"/> + </actions> + <widgets> + <decorator-screen name="contentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://content/webapp/content/content/ContentSearchOptions.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="ContentSearchResults"> + <section> + <actions> + <set field="titleProperty" value="PageTitleSearchResults"/> + <script location="component://content/webapp/content/WEB-INF/actions/content/ContentSearchResults.groovy"/> + </actions> + <widgets> + <decorator-screen name="contentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://content/webapp/content/content/ContentSearchResults.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="EditContentKeywords"> + <section> + <actions> + <script location="component://content/widget/GetMenuContext.groovy"/> + <set field="titleProperty" value="PageTitleEditContentKeywords"/> + <set field="tabButtonItem" value="keywords"/> + <set field="contentId" from-field="parameters.contentId"/> + <entity-one entity-name="Content" value-field="currentValue"> + <field-map field-name="contentId" from-field="parameters.contentId"/> + </entity-one> + </actions> + <widgets> + <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet id="AddContentKeywordsPanel" title="${uiLabelMap.PageTitleAddContentKeyword}" collapsible="true"> + <include-form name="AddContentKeyword" location="component://content/widget/content/ContentForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleEditContentKeywords}"> + <include-form name="ListContentKeywords" location="component://content/widget/content/ContentForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/DataResourceForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/DataResourceForms.xml Sun May 29 11:02:09 2011 @@ -35,8 +35,8 @@ under the License. </field> <field name="mimeTypeId" position="2"> <drop-down allow-empty="true"> - <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"> - <entity-order-by field-name="description"/> + <entity-options description="${mimeTypeId} - ${description}" entity-name="MimeType" key-field-name="mimeTypeId"> + <entity-order-by field-name="mimeTypeId"/> </entity-options> </drop-down> </field> @@ -49,12 +49,15 @@ under the License. </drop-down> </field> <field name="localeString" position="2"> + <lookup target-form-name="LookupLocale"></lookup> + </field> + <!--<field name="localeString" position="2"> <drop-down allow-empty="true"> <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"> <entity-order-by field-name="countryName"/> </entity-options> </drop-down> - </field> + </field>--> <field name="createdByUserLogin" position="1"><lookup target-form-name="LookupPerson"/></field> <field name="dataCategoryId" position="2"> <drop-down allow-empty="true"> @@ -190,7 +193,10 @@ under the License. <list-options list-name="dataCategoryList" key-name="dataCategoryId" description="${categoryName}"/> </drop-down> </field> - <field name="mimeTypeId"> + <field name="localeString"> + <lookup target-form-name="LookupLocale"></lookup> + </field> + <field name="mimeTypeId" encode-output="false"> <drop-down allow-empty="true"> <entity-options description="${mimeTypeId} - ${description}" entity-name="MimeType" key-field-name="mimeTypeId"> <entity-order-by field-name="mimeTypeId"/> @@ -256,7 +262,10 @@ under the License. <list-options list-name="dataCategoryList" key-name="dataCategoryId" description="${categoryName}"/> </drop-down> </field> - <field name="mimeTypeId"> + <field name="localeString"> + <lookup target-form-name="LookupLocale"></lookup> + </field> + <field name="mimeTypeId" encode-output="false"> <drop-down allow-empty="true"> <entity-options description="${mimeTypeId} - ${description}" entity-name="MimeType" key-field-name="mimeTypeId"> <entity-order-by field-name="mimeTypeId"/> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml Sun May 29 11:02:09 2011 @@ -29,7 +29,6 @@ under the License. <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.HumanResCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.HumanResCompanySubtitle" global="true"/> <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set, @@ -392,8 +391,7 @@ under the License. <screen name="CommonTrainingDecorator"> <section> <actions> - <!-- <property-map resource="WebPosUiLabels" map-name="uiLabelMap" global="true"/> --> - <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> <set field="headerItem" value="Training"/> </actions> <widgets> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/PersonTrainingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/PersonTrainingForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/PersonTrainingForms.xml Sun May 29 11:02:09 2011 @@ -73,7 +73,7 @@ under the License. </service> </actions> <auto-fields-entity entity-name="PersonTraining" default-field-type="hidden"/> - <field name="partyId" title="${uiLabelMap.WebPosEmployee} ${uiLabelMap.CommonId}" widget-style="buttontext"> + <field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}" widget-style="buttontext"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext"> <parameter param-name="partyId" from-field="partyId"/> @@ -109,7 +109,7 @@ under the License. </service> </actions> <auto-fields-entity entity-name="PersonTraining" default-field-type="display"/> - <field name="partyId" title="${uiLabelMap.WebPosEmployee} ${uiLabelMap.CommonId}" widget-style="buttontext"> + <field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}" widget-style="buttontext"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext"> <parameter param-name="partyId" from-field="partyId"/> @@ -136,7 +136,7 @@ under the License. </form> <form name="EditTrainingApprovals" type="single" target="updateTrainingStatus" default-map-name="personTraining"> <auto-fields-service service-name="updateTrainingStatus" default-field-type="display"/> - <field name="partyId" title="${uiLabelMap.WebPosEmployee} ${uiLabelMap.CommonId}"/> + <field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}"/> <field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}"/> <field name="approvalStatus"> <drop-down allow-empty="false"> @@ -177,7 +177,7 @@ under the License. </service> </actions> <auto-fields-entity entity-name="PersonTraining" default-field-type="display"/> - <field name="partyId" title="${uiLabelMap.WebPosEmployee} ${uiLabelMap.CommonId}" widget-style="buttontext"> + <field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}" widget-style="buttontext"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> <sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyId}" link-style="buttontext"> <parameter param-name="partyId" from-field="partyId"/> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java Sun May 29 11:02:09 2011 @@ -649,7 +649,7 @@ public class BOMNode { /** * A part is considered manufactured if it has child nodes AND unless ignoreSupplierProducts is set, if it also has no unexpired SupplierProducts defined * @param ignoreSupplierProducts - * @return + * @return return if a part is considered manufactured */ public boolean isManufactured(boolean ignoreSupplierProducts) { List<GenericValue> supplierProducts = null; @@ -664,7 +664,7 @@ public class BOMNode { /** * By default, a part is manufactured if it has child nodes and it has NO SupplierProducts defined - * @return + * @return return if a part is manufactured */ public boolean isManufactured() { return isManufactured(false); Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java Sun May 29 11:02:09 2011 @@ -58,9 +58,9 @@ public class BOMServices { * in which the productId can be found in any of the * bills of materials of bomType type. * If the bomType input field is not passed then the depth is searched for all the bom types and the lowest depth is returned. - * @param dctx - * @param context - * @return + * @param dctx the dispatch context + * @param context the context + * @return returns the product's low level code (llc) i.e. the maximum depth */ public static Map<String, Object> getMaxDepth(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); @@ -118,10 +118,10 @@ public class BOMServices { * Given a product id, computes and updates the product's low level code (field billOfMaterialLevel in Product entity). * It also updates the llc of all the product's descendants. * For the llc only the manufacturing bom ("MANUF_COMPONENT") is considered. - * @param dctx - * @param context - * @return - */ + * @param dctx the distach context + * @param context the context + * @return the results of the updates the product's low level code + */ public static Map<String, Object> updateLowLevelCode(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); Delegator delegator = dctx.getDelegator(); @@ -207,10 +207,10 @@ public class BOMServices { /** Updates the product's low level code (llc) for all the products in the Product entity. * For the llc only the manufacturing bom ("MANUF_COMPONENT") is considered. - * @param dctx - * @param context - * @return - */ + * @param dctx the distach context + * @param context the context + * @return the results of the updates the product's low level code + */ public static Map<String, Object> initLowLevelCode(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); Delegator delegator = dctx.getDelegator(); @@ -252,9 +252,9 @@ public class BOMServices { * ancestor if present, null otherwise. * Useful to avoid loops when adding new assocs (components) * to a bill of materials. - * @param dctx - * @param context - * @return + * @param dctx the distach context + * @param context the context + * @return returns the ProductAssoc generic value for a duplicate productIdKey ancestor if present */ public static Map<String, Object> searchDuplicatedAncestor(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); @@ -285,9 +285,9 @@ public class BOMServices { * and {@link BOMNode}) that represents a * configured bill of material tree. * Useful for tree traversal (breakdown, explosion, implosion). - * @param dctx - * @param context - * @return + * @param dctx the distach context + * @param context the context + * @return return the bill of material tree */ public static Map<String, Object> getBOMTree(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); @@ -336,9 +336,9 @@ public class BOMServices { /** It reads the product's bill of materials, * if necessary configures it, and it returns its (possibly configured) components in * a List of {@link BOMNode}). - * @param dctx - * @param context - * @return + * @param dctx the distach context + * @param context the context + * @return return the list of manufacturing components */ public static Map<String, Object> getManufacturingComponents(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); @@ -742,9 +742,9 @@ public class BOMServices { /** It reads the product's bill of materials, * if necessary configures it, and it returns its (possibly configured) components in * a List of {@link BOMNode}). - * @param dctx - * @param context - * @return + * @param dctx the distach context + * @param context the context + * @return returns the list of products in packages */ public static Map<String, Object> getProductsInPackages(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java Sun May 29 11:02:09 2011 @@ -316,9 +316,17 @@ public class BOMTree { /** It visits the in-memory tree that represents a bill of materials * and it creates a manufacturing order for each of the nodes that needs * to be manufactured. - * @param orderId The (sales) order id for which the manufacturing orders are created. If specified (together with orderItemSeqId) a link between the two order lines is created. If null, no link is created. - * @param orderItemSeqId - * @param delegator The delegator used. + * @param facilityId the facility id + * @param date the context date + * @param workEffortName the work effort name + * @param description the description + * @param routingId the routing id + * @param orderId the order id + * @param orderItemSeqId the order item id + * @param shipGroupSeqId the shipment group item id + * @param shipmentId the shipment id delegator used + * @param userLogin the GenericValue object of userLogin + * @return returns the work effort id * @throws GenericEntityException If a db problem occurs. */ public String createManufacturingOrders(String facilityId, Date date, String workEffortName, String description, String routingId, String orderId, String orderItemSeqId, String shipGroupSeqId, String shipmentId, GenericValue userLogin) throws GenericEntityException { Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Sun May 29 11:02:09 2011 @@ -192,7 +192,7 @@ public class ProductionRun { } /** * set the quantity property and recalculated the productComponent quantity. - * @return + * @param newQuantity the new quantity to be set **/ public void setQuantity(BigDecimal newQuantity) { if (quantity == null) getProductProduced(); @@ -216,7 +216,7 @@ public class ProductionRun { } /** * set the estimatedStartDate property. - * @return + * @param estimatedStartDate set the estimatedStartDate property **/ public void setEstimatedStartDate(Timestamp estimatedStartDate) { this.estimatedStartDate = estimatedStartDate; @@ -238,7 +238,7 @@ public class ProductionRun { /** * set the estimatedCompletionDate property without any control or calculation. * usage productionRun.setEstimatedCompletionDate(productionRun.recalculateEstimatedCompletionDate(priority); - * @return + * @param estimatedCompletionDate set the estimatedCompletionDate property **/ public void setEstimatedCompletionDate(Timestamp estimatedCompletionDate) { this.estimatedCompletionDate = estimatedCompletionDate; @@ -383,7 +383,6 @@ public class ProductionRun { /** * clear list of all the productionRunRoutingTasks to force re-reading at the next need. * This methode is used when the routingTasks ordering is changed. - * @return **/ public void clearRoutingTasksList() { this.productionRunRoutingTasks = null; Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java Sun May 29 11:02:09 2011 @@ -46,8 +46,8 @@ public class ProductionRunHelper { /** * Get a Production Run. * <li> check if routing - product link exist - * @param ctx The DispatchContext that this service is operating in. - * @param context Map containing the input parameters, productionRunId + * @param delegator the delegator + * @param productionRunId the production run id * @return Map with the result of the service, the output parameters are * <li> the productionRun * <li> the productionRunProduct Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java Sun May 29 11:02:09 2011 @@ -42,9 +42,9 @@ public class InventoryEventPlannedServic * Create an MrpEvent. * Make an update if a record exist with same key, (adding the event quantity to the exiting record) * - * @param ctx - * @param context: a map containing the parameters used to create an MrpEvent - * @return result: a map with service status + * @param ctx the dispatch context + * @param context a map containing the parameters used to create an MrpEvent + * @return result a map with service status */ public static Map<String, Object> createMrpEvent(DispatchContext ctx, Map<String, ? extends Object> context) { Delegator delegator = ctx.getDelegator(); Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Sun May 29 11:02:09 2011 @@ -550,13 +550,13 @@ public class MrpServices { /** * Process the bill of material (bom) of the product to insert components in the MrpEvent table. - * Before inserting in the entity, test if there is the record already existing to add quantity rather to create a new one. - * - * @param product + * Before inserting in the entity, test if there is the record already existing to add quantity rather to create a new one. + * @param mrpId the mrp id + * @param product GenericValue oject of the product * @param eventQuantity the product quantity needed - * @param startDate the startDate of the productionRun which will used to produce the product - * @param routingTaskStartDate Map with all the routingTask as keys and startDate of each of them - * @return None + * @param startDate the startDate of the productionRun which will used to produce the product + * @param routingTaskStartDate Map with all the routingTask as keys and startDate of each of them + * @param listComponent a List with all the components */ public static void processBomComponent(String mrpId, GenericValue product, BigDecimal eventQuantity, Timestamp startDate, Map<String, Object> routingTaskStartDate, List<BOMNode> listComponent) { Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java Sun May 29 11:02:09 2011 @@ -59,9 +59,9 @@ public class TechDataServices { * * Used to retrieve some RoutingTasks (WorkEffort) selected by Name or MachineGroup ordered by Name * - * @param ctx - * @param context: a map containing workEffortName (routingTaskName) and fixedAssetId (MachineGroup or ANY) - * @return result: a map containing lookupResult (list of RoutingTask <=> workEffortId with currentStatusId = "ROU_ACTIVE" and workEffortTypeId = "ROU_TASK" + * @param ctx the dispatch context + * @param context a map containing workEffortName (routingTaskName) and fixedAssetId (MachineGroup or ANY) + * @return result a map containing lookupResult (list of RoutingTask <=> workEffortId with currentStatusId = "ROU_ACTIVE" and workEffortTypeId = "ROU_TASK" */ public static Map<String, Object> lookupRoutingTask(DispatchContext ctx, Map<String, ? extends Object> context) { Delegator delegator = ctx.getDelegator(); Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml Sun May 29 11:02:09 2011 @@ -8602,6 +8602,10 @@ <value xml:lang="zh">询价</value> <value xml:lang="zh_TW">å ±å¹</value> </property> + <property key="OrderQuoteEmpty"> + <value xml:lang="en">Empty for total quote</value> + <value xml:lang="it">Totale preventivo è vuoto</value> + </property> <property key="OrderQuotePricePermissionError"> <value xml:lang="en">Quote Price Permission Error</value> <value xml:lang="it">Errore permesso prezzo preventivo</value> @@ -8609,6 +8613,10 @@ <value xml:lang="zh">è¯¢ä»·ä»·æ ¼æéé误</value> <value xml:lang="zh_TW">å ±å¹å¹æ ¼æ¬éé¯èª¤</value> </property> + <property key="OrderQuoteTermDescription"> + <value xml:lang="en">Term Description</value> + <value xml:lang="it">Descrizione termini preventivo</value> + </property> <property key="OrderRanking"> <value xml:lang="cs">PoÅadÃ</value> <value xml:lang="de">Rangfolge</value> @@ -10064,6 +10072,10 @@ <value xml:lang="zh">éå®è®¢åæ¥æ¾å¤±è´¥</value> <value xml:lang="zh_TW">é·å®è¨å®æ¥è©¢å¤±æ</value> </property> + <property key="OrderSalesReps"> + <value xml:lang="en">Sales Reps</value> + <value xml:lang="it">Venditori</value> + </property> <property key="OrderSalesTax"> <value xml:lang="cs">DPH</value> <value xml:lang="de">Mehrwertsteuer</value> @@ -12763,43 +12775,4 @@ <value xml:lang="zh">æµè§è¯·æ±</value> <value xml:lang="zh_TW">ç覽è¦æ±</value> </property> - <property key="ProjectMgrActualHours"> - <value xml:lang="de">Ist-Stunden</value> - <value xml:lang="en">Actual Hours</value> - <value xml:lang="fr">Heures réelles</value> - <value xml:lang="it">Ore attuali</value> - <value xml:lang="nl">Werk. uren</value> - <value xml:lang="pt_BR">Horas efetivas</value> - <value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸£à¸´à¸</value> - <value xml:lang="zh">å®é å·¥æ¶</value> - <value xml:lang="zh_TW">實éå·¥æ</value> - </property> - <property key="ProjectMgrPlannedHours"> - <value xml:lang="de">Geplante Stunden</value> - <value xml:lang="en">Planned Hours</value> - <value xml:lang="fr">Heures planifiées</value> - <value xml:lang="it">Ore pianificate</value> - <value xml:lang="nl">Gepl. uren</value> - <value xml:lang="pt_BR">Horas planejadas</value> - <value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸µà¹à¸§à¸²à¸à¹à¸à¸</value> - <value xml:lang="zh">已计åå·¥æ¶</value> - <value xml:lang="zh_TW">å·²è¨åå·¥æ</value> - </property> - <property key="ProjectMgrProjectName"> - <value xml:lang="de">Projektname</value> - <value xml:lang="en">Project Name</value> - <value xml:lang="fr">Nom du projet</value> - <value xml:lang="it">Nome progetto</value> - <value xml:lang="nl">Naam</value> - <value xml:lang="pt_BR">Nome do projeto</value> - <value xml:lang="th">à¸à¸·à¹à¸à¹à¸à¸£à¹à¸à¸</value> - <value xml:lang="zh">项ç®å称</value> - <value xml:lang="zh_TW">å°æ¡å稱</value> - </property> - <property key="QuoteEmpty"> - <value xml:lang="en">Empty for total quote</value> - </property> - <property key="QuoteTermDescription"> - <value xml:lang="en">Term Description</value> - </property> </resource> Propchange: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 29 11:02:09 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957 /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1096699 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1128853 Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java Sun May 29 11:02:09 2011 @@ -71,12 +71,12 @@ public class FinAccountHelper { /** * A convenience method which adds transactions.get(0).get(fieldName) to initialValue, all done in BigDecimal to decimals and rounding - * @param initialValue - * @param transactions - * @param fieldName - * @param decimals - * @param rounding - * @return + * @param initialValue the initial value + * @param transactions a List of GenericValue objects of transactions + * @param fieldName the field name to get the value from the transaction + * @param decimals number of decimals + * @param rounding how to rounding + * @return the new value in a BigDecimal field * @throws GenericEntityException */ public static BigDecimal addFirstEntryAmount(BigDecimal initialValue, List<GenericValue> transactions, String fieldName, int decimals, int rounding) throws GenericEntityException { @@ -96,8 +96,8 @@ public class FinAccountHelper { /** * Returns a unique randomly generated account code for FinAccount.finAccountCode composed of uppercase letters and numbers * @param codeLength length of code in number of characters - * @param delegator - * @return + * @param delegator the delegator + * @return returns a unique randomly generated account code for FinAccount.finAccountCode composed of uppercase letters and numbers * @throws GenericEntityException */ public static String getNewFinAccountCode(int codeLength, Delegator delegator) throws GenericEntityException { @@ -130,9 +130,9 @@ public class FinAccountHelper { /** * Gets the first (and should be only) FinAccount based on finAccountCode, which will be cleaned up to be only uppercase and alphanumeric - * @param finAccountCode - * @param delegator - * @return + * @param finAccountCode the financial account code + * @param delegator the delegator + * @return gets the first financial account by code * @throws GenericEntityException */ public static GenericValue getFinAccountFromCode(String finAccountCode, Delegator delegator) throws GenericEntityException { @@ -170,10 +170,10 @@ public class FinAccountHelper { /** * Sum of all DEPOSIT and ADJUSTMENT transactions minus all WITHDRAWAL transactions whose transactionDate is before asOfDateTime - * @param finAccountId - * @param asOfDateTime - * @param delegator - * @return + * @param finAccountId the financial account id + * @param asOfDateTime the validity date + * @param delegator the delegator + * @return returns the sum of all DEPOSIT and ADJUSTMENT transactions minus all WITHDRAWAL transactions * @throws GenericEntityException */ public static BigDecimal getBalance(String finAccountId, Timestamp asOfDateTime, Delegator delegator) throws GenericEntityException { @@ -209,10 +209,10 @@ public class FinAccountHelper { /** * Returns the net balance (see above) minus the sum of all authorization amounts which are not expired and were authorized by the as of date - * @param finAccountId - * @param asOfDateTime - * @param delegator - * @return + * @param finAccountId the financial account id + * @param asOfDateTime the validity date + * @param delegator the delegator + * @return returns the net balance (see above) minus the sum of all authorization amounts which are not expired * @throws GenericEntityException */ public static BigDecimal getAvailableBalance(String finAccountId, Timestamp asOfDateTime, Delegator delegator) throws GenericEntityException { @@ -241,9 +241,9 @@ public class FinAccountHelper { /** * Validates a FinAccount's PIN number - * @param delegator - * @param finAccountId - * @param pinNumber + * @param delegator the delegator + * @param finAccountId the financial account id + * @param pinNumber a pin number * @return true if the bin is valid */ public static boolean validatePin(Delegator delegator, String finAccountId, String pinNumber) { @@ -267,11 +267,11 @@ public class FinAccountHelper { } /** - * - * @param delegator + * Generate a random financial number + * @param delegator the delegator * @param length length of the number to generate (up to 19 digits) * @param isId to be used as an ID (will check the DB to make sure it doesn't already exist) - * @return String generated number + * @return Generated number * @throws GenericEntityException */ public static String generateRandomFinNumber(Delegator delegator, int length, boolean isId) throws GenericEntityException { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |