It seems to me that this is not complete.
Pierre Smits *ORRTIZ.COM <http://www.orrtiz.com>* Services & Solutions for Cloud- Based Manufacturing, Professional Services and Retail & Trade http://www.orrtiz.com On Tue, Mar 4, 2014 at 7:32 AM, <[hidden email]> wrote: > Author: hansbak > Date: Tue Mar 4 06:32:14 2014 > New Revision: 1573884 > > URL: http://svn.apache.org/r1573884 > Log: > adding budget services, screens and forms > > Modified: > ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml > ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml > ofbiz/trunk/applications/accounting/ofbiz-component.xml > > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml > ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml > ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml > ofbiz/trunk/applications/accounting/widget/LookupScreens.xml > > Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1573884&r1=1573883&r2=1573884&view=diff > > ============================================================================== > --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml > (original) > +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue > Mar 4 06:32:14 2014 > @@ -2392,6 +2392,51 @@ > <value xml:lang="zh">å ‘ç¥¨ç¼–å ·ï¼ˆInvoiceId)和账å > •è´¦æˆ·ç¼–å ·ï¼ˆBillingAccountId)都是空的</value> > <value > xml:lang="zh_TW">發票編號(InvoiceId)和賬單賬戶編號(BillingAccountId)都是空的</value> > </property> > + <property key="AccountingBudgetFind"> > + <value xml:lang="en">Find</value> > + </property> > + <property key="AccountingBudgetHeader"> > + <value xml:lang="en">Header</value> > + </property> > + <property key="AccountingBudgetItems"> > + <value xml:lang="en">Items</value> > + </property> > + <property key="AccountingBudgetItemsAdd"> > + <value xml:lang="en">Add a new budget Item</value> > + </property> > + <property key="AccountingBudgetOverview"> > + <value xml:lang="en">Overview</value> > + </property> > + <property key="AccountingBudgetReviewAdd"> > + <value xml:lang="en">Add a new Budget Review</value> > + </property> > + <property key="AccountingBudgetReviewResult"> > + <value xml:lang="en">Budget Review Result</value> > + </property> > + <property key="AccountingBudgetReviews"> > + <value xml:lang="en">Reviews</value> > + </property> > + <property key="AccountingBudgetRoles"> > + <value xml:lang="en">Roles</value> > + </property> > + <property key="AccountingBudgets"> > + <value xml:lang="en">Budgets</value> > + </property> > + <property key="AccountingBudgetStatus"> > + <value xml:lang="en">Status</value> > + </property> > + <property key="AccountingBudgetStatusToApproved"> > + <value xml:lang="en">Status To 'Approved'</value> > + </property> > + <property key="AccountingBudgetStatusToReviewed"> > + <value xml:lang="en">Status To 'Reviewed'</value> > + </property> > + <property key="AccountingBudgetStatusToRejected"> > + <value xml:lang="en">Status To 'Rejected'</value> > + </property> > + <property key="AccountingBudgetType"> > + <value xml:lang="en">Budget Type</value> > + </property> > <property key="AccountingByAccount"> > <value xml:lang="de">Nach Konto</value> > <value xml:lang="en">By Account</value> > @@ -4482,6 +4527,9 @@ > <value xml:lang="zh">编辑账户对账</value> > <value xml:lang="zh_TW">修改帳戶調節</value> > </property> > + <property key="AccountingEditBudget"> > + <value xml:lang="en">Edit Budget</value> > + </property> > <property key="AccountingEditCreditCard"> > <value xml:lang="cs">Zpracovat kreditnà kartu</value> > <value xml:lang="de">Kreditkarte bearbeiten</value> > @@ -5310,6 +5358,9 @@ > <value xml:lang="zh">查找应收支付</value> > <value xml:lang="zh_TW">找尋應收支付</value> > </property> > + <property key="AccountingFindBudgets"> > + <value xml:lang="en">Find Budgets</value> > + </property> > <property key="AccountingFindDepositSlip"> > <value xml:lang="de">Finde Einzahlungsscheine für Finanzkonto : > ${finAccount.finAccountName} [${finAccountId}]</value> > <value xml:lang="en">Find Deposit Slips for Financial Account : > ${finAccount.finAccountName} [${finAccountId}]</value> > @@ -8958,6 +9009,9 @@ > <value xml:lang="zh">æ–°å»ºå ˆå Œæ ¡ä»¶</value> > <value xml:lang="zh_TW">æ–°å»ºå ˆå Œæ¢ ä»¶</value> > </property> > + <property key="AccountingNewBudget"> > + <value xml:lang="en">Create New Budget</value> > + </property> > <property key="AccountingNewCompany"> > <value xml:lang="en">Create new accounting company</value> > </property> > @@ -19870,6 +19924,9 @@ > <value xml:lang="zh">æ‰¹é‡ æ”¯ä»˜</value> > <value xml:lang="zh_TW">批次付款</value> > </property> > + <property key="PageTitleBudgetOverview"> > + <value xml:lang="en">Budget Overview</value> > + </property> > <property key="PageTitleCopyAgreement"> > <value xml:lang="en">Copy Agreement</value> > <value xml:lang="fr">Copie d'accords commerciaux</value> > @@ -20133,6 +20190,9 @@ > <value xml:lang="zh">ç¼–è¾‘è´¦å •è´¦æˆ·æ ¡ä»¶</value> > <value xml:lang="zh_TW">ç·¨è¼¯è³¬å–®è³¬æˆ¶æ¢ ä»¶</value> > </property> > + <property key="PageTitleEditBudget"> > + <value xml:lang="en">Edit Budget</value> > + </property> > <property key="PageTitleEditFinAccount"> > <value xml:lang="en">Edit Financial Account</value> > <value xml:lang="fr">Modifier un compte financier</value> > @@ -20966,6 +21026,15 @@ > <value xml:lang="zh">å ˆå Œæ ¡ä»¶åˆ—è¡¨</value> > <value xml:lang="zh_TW">å ˆå Œæ¢ ä»¶åˆ—è¡¨</value> > </property> > + <property key="PageTitleListBudget"> > + <value xml:lang="en">List Budget</value> > + </property> > + <property key="PageTitleListBudgetReviews"> > + <value xml:lang="en">List Budget Reviews</value> > + </property> > + <property key="PageTitleListBudgetRoles"> > + <value xml:lang="en">List Budget Roles</value> > + </property> > <property key="PageTitleListEditInvoiceApplications"> > <value xml:lang="en">List Edit Invoice Applications</value> > <value xml:lang="es">Lista Editar Aplicaciones de Factura</value> > @@ -21256,6 +21325,9 @@ > <value xml:lang="zh">按å ç§°æŸ¥æ‰¾è´¦å •è´¦æˆ·</value> > <value xml:lang="zh_TW">按å 稱查找賬單賬戶</value> > </property> > + <property key="PageTitleLookupCustomTimePeriod"> > + <value xml:lang="en">Lookup Custom Time Period</value> > + </property> > <property key="PageTitleLookupFixedAsset"> > <value xml:lang="en">Lookup Fixed Asset</value> > <value xml:lang="es">Buscar Activo Fijo</value> > > Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=1573884&r1=1573883&r2=1573884&view=diff > > ============================================================================== > --- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml > (original) > +++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Tue > Mar 4 06:32:14 2014 > @@ -1090,4 +1090,20 @@ under the License. > <!-- invoice export replacement Id types --> > <GoodIdentificationType description="replacement value for partyId in > the invoice export function in accounting" > goodIdentificationTypeId="INVOICE_EXPORT"/> > <PartyIdentificationType description="replacement value for partyId > in the invoice export function in accounting" > partyIdentificationTypeId="INVOICE_EXPORT"/> > + > + <!-- Budget Type Data --> > + <StatusItem description="Created" sequenceId="00" > statusCode="CREATED" statusId="BG_CREATED" statusTypeId="BUDGET_STATUS"/> > + <StatusItem description="Reviewed" sequenceId="01" > statusCode="REVIEWED" statusId="BG_REVIEWED" statusTypeId="BUDGET_STATUS"/> > + <StatusItem description="Approved" sequenceId="02" > statusCode="APPROVED" statusId="BG_APPROVED" statusTypeId="BUDGET_STATUS"/> > + <StatusItem description="Rejected" sequenceId="03" > statusCode="REJECTED" statusId="BG_REJECTED" statusTypeId="BUDGET_STATUS"/> > + <StatusValidChange condition="" statusId="BG_CREATED" > statusIdTo="BG_REVIEWED" transitionName="Review Budget"/> > + <StatusValidChange condition="" statusId="BG_CREATED" > statusIdTo="BG_APPROVED" transitionName="Submit Budget"/> > + <StatusValidChange condition="" statusId="BG_CREATED" > statusIdTo="BG_REJECTED" transitionName="Reject Budget"/> > + <StatusValidChange condition="" statusId="BG_REVIEWED" > statusIdTo="BG_APPROVED" transitionName="Approved Budget"/> > + <StatusValidChange condition="" statusId="BG_REVIEWED" > statusIdTo="BG_REJECTED" transitionName="Reject Budget"/> > + <StatusValidChange condition="" statusId="BG_APPROVED" > statusIdTo="BG_CREATED" transitionName="Accept Budget"/> > + <StatusValidChange condition="" statusId="BG_APPROVED" > statusIdTo="BG_REJECTED" transitionName="Reject Budget"/> > + > + <BudgetReviewResultType description="Accepted" > budgetReviewResultTypeId="BGR_ACCEPTED"/> > + <BudgetReviewResultType description="Rejected" > budgetReviewResultTypeId="BGR_REJECTED"/> > </entity-engine-xml> > > Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=1573884&r1=1573883&r2=1573884&view=diff > > ============================================================================== > --- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original) > +++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Tue Mar 4 > 06:32:14 2014 > @@ -53,11 +53,13 @@ under the License. > <entity-resource type="data" reader-name="demo" loader="main" > location="data/DemoPaymentsInvoices.xml"/> > <entity-resource type="data" reader-name="demo" loader="main" > location="data/DemoAccountingUserData.xml"/> > <entity-resource type="data" reader-name="demo" loader="main" > location="data/DemoAssetMaintData.xml"/> > + <entity-resource type="data" reader-name="demo" loader="main" > location="data/DemoBudgetData.xml"/> > > <!-- General Payment Service Definitions --> > <service-resource type="model" loader="main" > location="servicedef/services_agreement.xml"/> > <service-resource type="model" loader="main" > location="servicedef/services_admin.xml"/> > <service-resource type="model" loader="main" > location="servicedef/services_billing.xml"/> > + <service-resource type="model" loader="main" > location="servicedef/services_budget.xml"/> > <service-resource type="model" loader="main" > location="servicedef/services_finaccount.xml"/> > <service-resource type="model" loader="main" > location="servicedef/services_fixedasset.xml"/> > <service-resource type="model" loader="main" > location="servicedef/services_invoice.xml"/> > > Modified: > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1573884&r1=1573883&r2=1573884&view=diff > > ============================================================================== > --- > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml > (original) > +++ > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml > Tue Mar 4 06:32:14 2014 > @@ -1140,7 +1140,76 @@ under the License. > <response name="success" type="view" > value="EditFixedAssetMaintOrders"/> > <response name="error" type="view" > value="EditFixedAssetMaintOrders"/> > </request-map> > - > + > + <!-- =============== Budget mapping =================--> > + <request-map uri="ListBudgets"><security https="true" > auth="true"/><response name="success" type="view" > value="ListBudgets"/></request-map> > + <request-map uri="BudgetSearchResults"><security https="true" > auth="false"/><response name="success" type="view" > value="BudgetSearchResults"/></request-map> > + <request-map uri="EditBudget"><security https="true" > auth="true"/><response name="success" type="view" > value="EditBudget"/></request-map> > + <request-map uri="BudgetOverview"><security https="true" > auth="true"/><response name="success" type="view" > value="BudgetOverview"/></request-map> > + <request-map uri="EditBudgetItems"><security https="true" > auth="true"/><response name="success" type="view" > value="EditBudgetItems"/></request-map> > + <request-map uri="BudgetRoles"><security https="true" > auth="true"/><response name="success" type="view" > value="BudgetRoles"/></request-map> > + <request-map uri="BudgetReviews"><security https="true" > auth="true"/><response name="success" type="view" > value="BudgetReviews"/></request-map> > + <request-map uri="createBudget"> > + <security https="true" auth="true"/> > + <event type="service" invoke="createBudget"/> > + <response name="success" type="view" value="EditBudget"/> > + <response name="error" type="view" value="EditBudget"/> > + </request-map> > + <request-map uri="updateBudget"> > + <security https="true" auth="true"/> > + <event type="service" invoke="updateBudget"/> > + <response name="success" type="view" value="EditBudget"/> > + <response name="error" type="view" value="EditBudget"/> > + </request-map> > + <request-map uri="updateBudgetStatus"> > + <security https="true" auth="true"/> > + <event type="service" invoke="updateBudgetStatus"/> > + <response name="success" type="view" value="BudgetOverview"/> > + <response name="error" type="view" value="BudgetOverview"/> > + </request-map> > + <request-map uri="createBudgetItem"> > + <security https="true" auth="true"/> > + <event type="service" invoke="createBudgetItem"/> > + <response name="success" type="view" value="EditBudgetItems"/> > + <response name="error" type="view" value="EditBudgetItems"/> > + </request-map> > + <request-map uri="updateBudgetItem"> > + <security https="true" auth="true"/> > + <event type="service-multi" invoke="updateBudgetItem"/> > + <response name="success" type="request-redirect" > value="EditBudgetItems"/> > + <response name="error" type="view" value="EditBudgetItems"/> > + </request-map> > + <request-map uri="removeBudgetItem"> > + <security https="true" auth="true"/> > + <event type="service" invoke="removeBudgetItem"/> > + <response name="success" type="view" value="EditBudgetItems"/> > + <response name="error" type="view" value="EditBudgetItems"/> > + </request-map> > + <request-map uri="createBudgetRole"> > + <security https="true" auth="true"/> > + <event type="service" invoke="createBudgetRole"/> > + <response name="success" type="view" value="BudgetRoles"/> > + <response name="error" type="view" value="BudgetRoles"/> > + </request-map> > + <request-map uri="removeBudgetRole"> > + <security https="true" auth="true"/> > + <event type="service" invoke="removeBudgetRole"/> > + <response name="success" type="view" value="BudgetRoles"/> > + <response name="error" type="view" value="BudgetRoles"/> > + </request-map> > + <request-map uri="createBudgetReview"> > + <security https="true" auth="true"/> > + <event type="service" invoke="createBudgetReview"/> > + <response name="success" type="view" value="BudgetReviews"/> > + <response name="error" type="view" value="BudgetReviews"/> > + </request-map> > + <request-map uri="removeBudgetReview"> > + <security https="true" auth="true"/> > + <event type="service" invoke="removeBudgetReview"/> > + <response name="success" type="view" value="BudgetReviews"/> > + <response name="error" type="view" value="BudgetReviews"/> > + </request-map> > + > <!-- =============== Agreement mapping =================--> > <request-map uri="FindAgreement"><security https="true" > auth="true"/><response name="success" type="view" > value="FindAgreement"/></request-map> > <request-map uri="cancelAgreement"> > @@ -2237,7 +2306,7 @@ under the License. > <request-map uri="LookupAgreementItem"><security auth="true" > https="true"/><response name="success" type="view" > value="LookupAgreementItem"/></request-map> > <request-map uri="LookupPaymentGroupMember"><security auth="true" > https="true"/><response name="success" type="view" > value="LookupPaymentGroupMember"/></request-map> > <request-map uri="LookupGlReconciliation"><security auth="true" > https="true"/><response name="success" type="view" > value="LookupGlReconciliation"/></request-map> > - > + <request-map uri="LookupCustomTimePeriod"><security auth="true" > https="true"/><response name="success" type="view" > value="LookupCustomTimePeriod"/></request-map> > > <request-map uri="viewprofile"><security https="true" > auth="true"/><response name="success" type="view" > value="viewprofile"/></request-map> > > @@ -2698,6 +2767,15 @@ under the License. > <view-map name="EditFixedAsset" type="screen" > page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAsset"/> > <view-map name="ListFixedAssetProducts" type="screen" > page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetProducts"/> > > + <!-- Budget --> > + <view-map name="ListBudgets" type="screen" > page="component://accounting/widget/BudgetScreens.xml#ListBudgets"/> > + <view-map name="BudgetSearchResults" type="screen" > page="component://accounting/widget/BudgetScreens.xml#BudgetSearchResults"/> > + <view-map name="EditBudget" type="screen" > page="component://accounting/widget/BudgetScreens.xml#EditBudget"/> > + <view-map name="BudgetOverview" type="screen" > page="component://accounting/widget/BudgetScreens.xml#BudgetOverview"/> > + <view-map name="EditBudgetItems" type="screen" > page="component://accounting/widget/BudgetScreens.xml#EditBudgetItems"/> > + <view-map name="BudgetRoles" type="screen" > page="component://accounting/widget/BudgetScreens.xml#BudgetRoles"/> > + <view-map name="BudgetReviews" type="screen" > page="component://accounting/widget/BudgetScreens.xml#BudgetReviews"/> > + > <!-- TO BE REMOVED > <view-map name="addFixedAssetProduct" type="screen" > page="component://accounting/widget/FixedAssetScreens.xml#addFixedAssetProduct"/> > <view-map name="updateFixedAssetProduct" type="screen" > page="component://accounting/widget/FixedAssetScreens.xml#updateFixedAssetProduct"/> > @@ -2822,6 +2900,7 @@ under the License. > <view-map name="LookupBillingAccount" > page="component://accounting/widget/LookupScreens.xml#LookupBillingAccount" > type="screen"/> > <view-map name="LookupPayment" > page="component://accounting/widget/LookupScreens.xml#LookupPayment" > type="screen"/> > <view-map name="LookupInvoice" > page="component://accounting/widget/LookupScreens.xml#LookupInvoice" > type="screen"/> > + <view-map name="LookupCustomTimePeriod" type="screen" > page="component://accounting/widget/LookupScreens.xml#LookupCustomTimePeriod"/> > > <view-map name="LookupWorkEffort" type="screen" > page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> > <view-map name="LookupOrderHeader" type="screen" > page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> > > Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1573884&r1=1573883&r2=1573884&view=diff > > ============================================================================== > --- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml > (original) > +++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Tue Mar > 4 06:32:14 2014 > @@ -48,6 +48,7 @@ under the License. > <menu-item name="TaxAuthorities" > title="${uiLabelMap.AccountingTaxAuthorities}"><link > target="FindTaxAuthority"/></menu-item> > <menu-item name="agreements" > title="${uiLabelMap.AccountingAgreements}"><link > target="FindAgreement"/></menu-item> > <menu-item name="ListFixedAssets" > title="${uiLabelMap.AccountingFixedAssets}"><link > target="ListFixedAssets"/></menu-item> > + <menu-item name="ListBudgets" > title="${uiLabelMap.AccountingBudgets}"><link > target="ListBudgets"/></menu-item> > <menu-item name="GlobalGLSettings" > title="${uiLabelMap.AccountingGlobalGLSettings}"><link > target="globalGLSettings"/></menu-item> > <menu-item name="companies" > title="${uiLabelMap.AccountingOrgGlSettings}"><link > target="ListCompanies"/></menu-item> > </menu> > @@ -672,6 +673,117 @@ under the License. > </menu-item> > </menu> > > + <menu name="BudgetTabBar" extends="CommonTabBarMenu" > extends-resource="component://common/widget/CommonMenus.xml" > + default-menu-item-name="EditBudget"> > + <menu-item name="ListBudgets" > title="${uiLabelMap.AccountingBudgetFind}"> > + <link target="ListBudgets"/> > + </menu-item> > + <menu-item name="BudgetOverview" > title="${uiLabelMap.AccountingBudgetOverview}"> > + <link target="BudgetOverview"> > + <parameter param-name="budgetId"/> > + </link> > + </menu-item> > + <menu-item name="EditBudget" > title="${uiLabelMap.AccountingBudgetHeader}"> > + <condition> > + <and> > + <not><if-empty field="budgetId"/></not> > + <or> > + <if-compare field="statusId" operator="equals" > value="BG_CREATED"/> > + <if-compare field="statusId" operator="equals" > value="BG_REVIEWED"/> > + </or> > + </and> > + </condition> > + <link target="EditBudget"> > + <parameter param-name="budgetId"/> > + </link> > + </menu-item> > + <menu-item name="BudgetItem" > title="${uiLabelMap.AccountingBudgetItems}"> > + <condition> > + <and> > + <not><if-empty field="budgetId"/></not> > + <or> > + <if-compare field="statusId" operator="equals" > value="BG_CREATED"/> > + <if-compare field="statusId" operator="equals" > value="BG_REVIEWED"/> > + </or> > + </and> > + </condition> > + <link target="EditBudgetItems"> > + <parameter param-name="budgetId"/> > + </link> > + </menu-item> > + <menu-item name="BudgetRoles" > title="${uiLabelMap.AccountingBudgetRoles}"> > + <condition> > + <and> > + <not><if-empty field="budgetId"/></not> > + <or> > + <if-compare field="statusId" operator="equals" > value="BG_CREATED"/> > + <if-compare field="statusId" operator="equals" > value="BG_REVIEWED"/> > + </or> > + </and> > + </condition> > + <link target="BudgetRoles"> > + <parameter param-name="budgetId"/> > + </link> > + </menu-item> > + <menu-item name="BudgetReviews" > title="${uiLabelMap.AccountingBudgetReviews}"> > + <condition> > + <and> > + <not><if-empty field="budgetId"/></not> > + <if-compare field="statusId" operator="not-equals" > value="BG_REJECTED"/> > + </and> > + </condition> > + <link target="BudgetReviews"> > + <parameter param-name="budgetId"/> > + </link> > + </menu-item> > + </menu> > + > + <menu name="BudgetSubTabBar" menu-container-style="button-bar > button-style-2" default-selected-style="selected"> > + <menu-item name="statusToApproved" > title="${uiLabelMap.AccountingBudgetStatusToApproved}"> > + <condition> > + <and> > + <not><if-empty field="budgetId"/></not> > + <or> > + <if-compare field="statusId" operator="equals" > value="BG_CREATED"/> > + <if-compare field="statusId" operator="equals" > value="BG_REVIEWED"/> > + </or> > + </and> > + </condition> > + <link target="updateBudgetStatus"> > + <parameter param-name="budgetId" from-field="budgetId"/> > + <parameter param-name="statusId" value="BG_APPROVED"/> > + </link> > + </menu-item> > + <menu-item name="statusToReview" > title="${uiLabelMap.AccountingBudgetStatusToReviewed}"> > + <condition> > + <and> > + <not><if-empty field="budgetId"/></not> > + <if-compare field="statusId" operator="equals" > value="BG_CREATED"/> > + </and> > + </condition> > + <link target="updateBudgetStatus"> > + <parameter param-name="budgetId" from-field="budgetId"/> > + <parameter param-name="statusId" value="BG_REVIEWED"/> > + </link> > + </menu-item> > + <menu-item name="statusToReject" > title="${uiLabelMap.AccountingBudgetStatusToRejected}"> > + <condition> > + <and> > + <not><if-empty field="budgetId"/></not> > + <or> > + <if-compare field="statusId" operator="equals" > value="BG_CREATED"/> > + <if-compare field="statusId" operator="equals" > value="BG_REVIEWED"/> > + <if-compare field="statusId" operator="equals" > value="BG_APPROVED"/> > + </or> > + </and> > + </condition> > + <link target="updateBudgetStatus"> > + <parameter param-name="budgetId" from-field="budgetId"/> > + <parameter param-name="statusId" value="BG_REJECTED"/> > + </link> > + </menu-item> > + </menu> > + > <menu name="PartyGlShortCuts"> > <menu-item name="CreateSalesAcctgTrans"> > <link target="CreateAcctgTransAndEntries" > text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"> > > Modified: ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=1573884&r1=1573883&r2=1573884&view=diff > > ============================================================================== > --- ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml > (original) > +++ ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml Tue > Mar 4 06:32:14 2014 > @@ -52,6 +52,38 @@ under the License. > <field name="fixedAssetName" > title="${uiLabelMap.CommonName}"><display/></field> > <field name="fixedAssetTypeId" > title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity > entity-name="FixedAssetType"/></field> > </form> > + <form name="lookupBudget" target="LookupBudget" title="" type="single" > + header-row-style="header-row" default-table-style="basic-table"> > + <auto-fields-entity entity-name="Budget" > default-field-type="hidden"/> > + <field name="budgetId"><text-find/></field> > + <field name="budgetTypeId" > title="${uiLabelMap.AccountingBudgetType}"> > + <drop-down allow-empty="true"> > + <entity-options entity-name="BudgetType" > description="${description}"> > + <entity-order-by field-name="description"/> > + </entity-options> > + </drop-down> > + </field> > + <field name="customTimePeriodId"><text-find/></field> > + <field name="comments"><text-find/></field> > + <field name="noConditionFind"><hidden value="Y"/><!-- if this > isn't there then with all fields empty no query will be done --></field> > + <field name="submitButton" title="${uiLabelMap.CommonFind}" > widget-style="smallSubmit"><submit button-type="button"/></field> > + </form> > + <form name="listLookupBudget" list-name="listIt" title="" type="list" > paginate-target="LookupBudget" > + odd-row-style="alternate-row" default-table-style="basic-table > hover-bar"> > + <actions> > + <service service-name="performFind" result-map="result" > result-map-list="listIt"> > + <field-map field-name="inputFields" > from-field="parameters"/> > + <field-map field-name="entityName" value="FixedAsset"/> > + <field-map field-name="viewIndex" from-field="viewIndex"/> > + <field-map field-name="viewSize" from-field="viewSize"/> > + </service> > + </actions> > + <field name="fixedAssetId" widget-style="buttontext"> > + <hyperlink also-hidden="false" target-type="plain" > description="${fixedAssetId}" > target="javascript:set_value('${fixedAssetId}')"/> > + </field> > + <field name="fixedAssetName" > title="${uiLabelMap.CommonName}"><display/></field> > + <field name="fixedAssetTypeId" > title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity > entity-name="FixedAssetType"/></field> > + </form> > <form name="lookupBillingAccount" target="LookupBillingAccount" > title="" type="single" > header-row-style="header-row" default-table-style="basic-table"> > <auto-fields-entity entity-name="BillingAccount" > default-field-type="hidden"/> > @@ -308,4 +340,51 @@ under the License. > <field name="organizationPartyId"><display-entity > entity-name="PartyNameView" key-field-name="partyId" > description="${groupName}${firstName} ${lastName}[${partyId}]"/></field> > <field name="description" > title="${uiLabelMap.CommonDescription}"><display/></field> > </form> > + > + <form name="lookupCustomTimePeriod" target="LookupCustomTimePeriod" > title="" type="single" > + header-row-style="header-row" default-table-style="basic-table"> > + <auto-fields-entity entity-name="CustomTimePeriod" > default-field-type="hidden"/> > + <field name="customTimePeriodId"><text-find/></field> > + <field name="parentPeriodId"><text-find/></field> > + <field name="periodTypeId"> > + <drop-down allow-empty="true"> > + <entity-options entity-name="PeriodType" > description="${description}"> > + <entity-order-by field-name="description"/> > + </entity-options> > + </drop-down> > + </field> > + <field name="periodNum"><text-find/></field> > + <field name="periodName"><text-find/></field> > + <field name="fromDate"><date-time/></field> > + <field name="thruDate"><date-time/></field> > + <field name="isClosed"> > + <drop-down allow-empty="true"> > + <option key="Y" description="${uiLabelMap.CommonY}"/> > + <option key="N" description="${uiLabelMap.CommonN}"/> > + </drop-down> > + </field> > + <field name="noConditionFind"><hidden value="Y"/><!-- if this > isn't there then with all fields empty no query will be done --></field> > + <field name="submitButton" title="${uiLabelMap.CommonFind}" > widget-style="smallSubmit"><submit button-type="button"/></field> > + </form> > + <form name="listLookupCustomTimePeriod" list-name="listIt" title="" > type="list" paginate-target="LookupCustomTimePeriod" > + odd-row-style="alternate-row" default-table-style="basic-table > hover-bar"> > + <actions> > + <service service-name="performFind" result-map="result" > result-map-list="listIt"> > + <field-map field-name="inputFields" > from-field="parameters"/> > + <field-map field-name="entityName" > value="CustomTimePeriod"/> > + <field-map field-name="viewIndex" from-field="viewIndex"/> > + <field-map field-name="viewSize" from-field="viewSize"/> > + </service> > + </actions> > + <field name="customTimePeriodId" widget-style="buttontext"> > + <hyperlink also-hidden="false" target-type="plain" > description="${customTimePeriodId}" > target="javascript:set_value('${customTimePeriodId}')"/> > + </field> > + <field name="parentPeriodId"><display/></field> > + <field name="periodTypeId"><display-entity > entity-name="PeriodType"/></field> > + <field name="periodNum"><display/></field> > + <field name="periodName"><display/></field> > + <field name="fromDate"><display/></field> > + <field name="thruDate"><display/></field> > + <field name="isClosed"><display/></field> > + </form> > </forms> > > Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=1573884&r1=1573883&r2=1573884&view=diff > > ============================================================================== > --- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original) > +++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Tue Mar > 4 06:32:14 2014 > @@ -268,4 +268,29 @@ under the License. > </widgets> > </section> > </screen> > + > + <screen name="LookupCustomTimePeriod"> > + <section> > + <actions> > + <property-map resource="AccountingUiLabels" > map-name="uiLabelMap" global="true"/> > + <set field="title" > value="${uiLabelMap.PageTitleLookupCustomTimePeriod}"/> > + <set field="queryString" from-field="result.queryString"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer" default-value="0"/> > + <property-to-field resource="widget" > property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="${viewSizeDefaultValue}"/> > + <set field="entityName" value="CustomTimePeriod"/> > + <set field="searchFields" value="[customTimePeriodId, > periodName]"/> > + </actions> > + <widgets> > + <decorator-screen name="LookupDecorator" > location="component://common/widget/CommonScreens.xml"> > + <decorator-section name="search-options"> > + <include-form name="lookupCustomTimePeriod" > location="component://accounting/widget/FieldLookupForms.xml"/> > + </decorator-section> > + <decorator-section name="search-results"> > + <include-form name="listLookupCustomTimePeriod" > location="component://accounting/widget/FieldLookupForms.xml"/> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > </screens> > > > |
Administrator
|
Yes, were is services_budget.xml ?
Jacques Le 04/03/2014 09:53, Pierre Smits a écrit : > It seems to me that this is not complete. > > Pierre Smits > > *ORRTIZ.COM <http://www.orrtiz.com>* > Services & Solutions for Cloud- > Based Manufacturing, Professional > Services and Retail & Trade > http://www.orrtiz.com > > > On Tue, Mar 4, 2014 at 7:32 AM, <[hidden email]> wrote: > >> Author: hansbak >> Date: Tue Mar 4 06:32:14 2014 >> New Revision: 1573884 >> >> URL: http://svn.apache.org/r1573884 >> Log: >> adding budget services, screens and forms >> >> Modified: >> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >> ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml >> ofbiz/trunk/applications/accounting/ofbiz-component.xml >> >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml >> ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml >> ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml >> ofbiz/trunk/applications/accounting/widget/LookupScreens.xml >> >> Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >> (original) >> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue >> Mar 4 06:32:14 2014 >> @@ -2392,6 +2392,51 @@ >> <value xml:lang="zh">å ‘ç¥¨ç¼–å ·ï¼ˆInvoiceId)和账å >> •è´¦æˆ·ç¼–å ·ï¼ˆBillingAccountId)都是空的</value> >> <value >> xml:lang="zh_TW">發票編號(InvoiceId)和賬單賬戶編號(BillingAccountId)都是空的</value> >> </property> >> + <property key="AccountingBudgetFind"> >> + <value xml:lang="en">Find</value> >> + </property> >> + <property key="AccountingBudgetHeader"> >> + <value xml:lang="en">Header</value> >> + </property> >> + <property key="AccountingBudgetItems"> >> + <value xml:lang="en">Items</value> >> + </property> >> + <property key="AccountingBudgetItemsAdd"> >> + <value xml:lang="en">Add a new budget Item</value> >> + </property> >> + <property key="AccountingBudgetOverview"> >> + <value xml:lang="en">Overview</value> >> + </property> >> + <property key="AccountingBudgetReviewAdd"> >> + <value xml:lang="en">Add a new Budget Review</value> >> + </property> >> + <property key="AccountingBudgetReviewResult"> >> + <value xml:lang="en">Budget Review Result</value> >> + </property> >> + <property key="AccountingBudgetReviews"> >> + <value xml:lang="en">Reviews</value> >> + </property> >> + <property key="AccountingBudgetRoles"> >> + <value xml:lang="en">Roles</value> >> + </property> >> + <property key="AccountingBudgets"> >> + <value xml:lang="en">Budgets</value> >> + </property> >> + <property key="AccountingBudgetStatus"> >> + <value xml:lang="en">Status</value> >> + </property> >> + <property key="AccountingBudgetStatusToApproved"> >> + <value xml:lang="en">Status To 'Approved'</value> >> + </property> >> + <property key="AccountingBudgetStatusToReviewed"> >> + <value xml:lang="en">Status To 'Reviewed'</value> >> + </property> >> + <property key="AccountingBudgetStatusToRejected"> >> + <value xml:lang="en">Status To 'Rejected'</value> >> + </property> >> + <property key="AccountingBudgetType"> >> + <value xml:lang="en">Budget Type</value> >> + </property> >> <property key="AccountingByAccount"> >> <value xml:lang="de">Nach Konto</value> >> <value xml:lang="en">By Account</value> >> @@ -4482,6 +4527,9 @@ >> <value xml:lang="zh">编辑账户对账</value> >> <value xml:lang="zh_TW">修改帳戶調節</value> >> </property> >> + <property key="AccountingEditBudget"> >> + <value xml:lang="en">Edit Budget</value> >> + </property> >> <property key="AccountingEditCreditCard"> >> <value xml:lang="cs">Zpracovat kreditnà kartu</value> >> <value xml:lang="de">Kreditkarte bearbeiten</value> >> @@ -5310,6 +5358,9 @@ >> <value xml:lang="zh">查找应收支付</value> >> <value xml:lang="zh_TW">找尋應收支付</value> >> </property> >> + <property key="AccountingFindBudgets"> >> + <value xml:lang="en">Find Budgets</value> >> + </property> >> <property key="AccountingFindDepositSlip"> >> <value xml:lang="de">Finde Einzahlungsscheine für Finanzkonto : >> ${finAccount.finAccountName} [${finAccountId}]</value> >> <value xml:lang="en">Find Deposit Slips for Financial Account : >> ${finAccount.finAccountName} [${finAccountId}]</value> >> @@ -8958,6 +9009,9 @@ >> <value xml:lang="zh">æ–°å»ºå ˆå Œæ ¡ä»¶</value> >> <value xml:lang="zh_TW">æ–°å»ºå ˆå Œæ¢ ä»¶</value> >> </property> >> + <property key="AccountingNewBudget"> >> + <value xml:lang="en">Create New Budget</value> >> + </property> >> <property key="AccountingNewCompany"> >> <value xml:lang="en">Create new accounting company</value> >> </property> >> @@ -19870,6 +19924,9 @@ >> <value xml:lang="zh">æ‰¹é‡ æ”¯ä»˜</value> >> <value xml:lang="zh_TW">批次付款</value> >> </property> >> + <property key="PageTitleBudgetOverview"> >> + <value xml:lang="en">Budget Overview</value> >> + </property> >> <property key="PageTitleCopyAgreement"> >> <value xml:lang="en">Copy Agreement</value> >> <value xml:lang="fr">Copie d'accords commerciaux</value> >> @@ -20133,6 +20190,9 @@ >> <value xml:lang="zh">ç¼–è¾‘è´¦å •è´¦æˆ·æ ¡ä»¶</value> >> <value xml:lang="zh_TW">ç·¨è¼¯è³¬å–®è³¬æˆ¶æ¢ ä»¶</value> >> </property> >> + <property key="PageTitleEditBudget"> >> + <value xml:lang="en">Edit Budget</value> >> + </property> >> <property key="PageTitleEditFinAccount"> >> <value xml:lang="en">Edit Financial Account</value> >> <value xml:lang="fr">Modifier un compte financier</value> >> @@ -20966,6 +21026,15 @@ >> <value xml:lang="zh">å ˆå Œæ ¡ä»¶åˆ—è¡¨</value> >> <value xml:lang="zh_TW">å ˆå Œæ¢ ä»¶åˆ—è¡¨</value> >> </property> >> + <property key="PageTitleListBudget"> >> + <value xml:lang="en">List Budget</value> >> + </property> >> + <property key="PageTitleListBudgetReviews"> >> + <value xml:lang="en">List Budget Reviews</value> >> + </property> >> + <property key="PageTitleListBudgetRoles"> >> + <value xml:lang="en">List Budget Roles</value> >> + </property> >> <property key="PageTitleListEditInvoiceApplications"> >> <value xml:lang="en">List Edit Invoice Applications</value> >> <value xml:lang="es">Lista Editar Aplicaciones de Factura</value> >> @@ -21256,6 +21325,9 @@ >> <value xml:lang="zh">按å ç§°æŸ¥æ‰¾è´¦å •è´¦æˆ·</value> >> <value xml:lang="zh_TW">按å 稱查找賬單賬戶</value> >> </property> >> + <property key="PageTitleLookupCustomTimePeriod"> >> + <value xml:lang="en">Lookup Custom Time Period</value> >> + </property> >> <property key="PageTitleLookupFixedAsset"> >> <value xml:lang="en">Lookup Fixed Asset</value> >> <value xml:lang="es">Buscar Activo Fijo</value> >> >> Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml >> (original) >> +++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Tue >> Mar 4 06:32:14 2014 >> @@ -1090,4 +1090,20 @@ under the License. >> <!-- invoice export replacement Id types --> >> <GoodIdentificationType description="replacement value for partyId in >> the invoice export function in accounting" >> goodIdentificationTypeId="INVOICE_EXPORT"/> >> <PartyIdentificationType description="replacement value for partyId >> in the invoice export function in accounting" >> partyIdentificationTypeId="INVOICE_EXPORT"/> >> + >> + <!-- Budget Type Data --> >> + <StatusItem description="Created" sequenceId="00" >> statusCode="CREATED" statusId="BG_CREATED" statusTypeId="BUDGET_STATUS"/> >> + <StatusItem description="Reviewed" sequenceId="01" >> statusCode="REVIEWED" statusId="BG_REVIEWED" statusTypeId="BUDGET_STATUS"/> >> + <StatusItem description="Approved" sequenceId="02" >> statusCode="APPROVED" statusId="BG_APPROVED" statusTypeId="BUDGET_STATUS"/> >> + <StatusItem description="Rejected" sequenceId="03" >> statusCode="REJECTED" statusId="BG_REJECTED" statusTypeId="BUDGET_STATUS"/> >> + <StatusValidChange condition="" statusId="BG_CREATED" >> statusIdTo="BG_REVIEWED" transitionName="Review Budget"/> >> + <StatusValidChange condition="" statusId="BG_CREATED" >> statusIdTo="BG_APPROVED" transitionName="Submit Budget"/> >> + <StatusValidChange condition="" statusId="BG_CREATED" >> statusIdTo="BG_REJECTED" transitionName="Reject Budget"/> >> + <StatusValidChange condition="" statusId="BG_REVIEWED" >> statusIdTo="BG_APPROVED" transitionName="Approved Budget"/> >> + <StatusValidChange condition="" statusId="BG_REVIEWED" >> statusIdTo="BG_REJECTED" transitionName="Reject Budget"/> >> + <StatusValidChange condition="" statusId="BG_APPROVED" >> statusIdTo="BG_CREATED" transitionName="Accept Budget"/> >> + <StatusValidChange condition="" statusId="BG_APPROVED" >> statusIdTo="BG_REJECTED" transitionName="Reject Budget"/> >> + >> + <BudgetReviewResultType description="Accepted" >> budgetReviewResultTypeId="BGR_ACCEPTED"/> >> + <BudgetReviewResultType description="Rejected" >> budgetReviewResultTypeId="BGR_REJECTED"/> >> </entity-engine-xml> >> >> Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original) >> +++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Tue Mar 4 >> 06:32:14 2014 >> @@ -53,11 +53,13 @@ under the License. >> <entity-resource type="data" reader-name="demo" loader="main" >> location="data/DemoPaymentsInvoices.xml"/> >> <entity-resource type="data" reader-name="demo" loader="main" >> location="data/DemoAccountingUserData.xml"/> >> <entity-resource type="data" reader-name="demo" loader="main" >> location="data/DemoAssetMaintData.xml"/> >> + <entity-resource type="data" reader-name="demo" loader="main" >> location="data/DemoBudgetData.xml"/> >> >> <!-- General Payment Service Definitions --> >> <service-resource type="model" loader="main" >> location="servicedef/services_agreement.xml"/> >> <service-resource type="model" loader="main" >> location="servicedef/services_admin.xml"/> >> <service-resource type="model" loader="main" >> location="servicedef/services_billing.xml"/> >> + <service-resource type="model" loader="main" >> location="servicedef/services_budget.xml"/> >> <service-resource type="model" loader="main" >> location="servicedef/services_finaccount.xml"/> >> <service-resource type="model" loader="main" >> location="servicedef/services_fixedasset.xml"/> >> <service-resource type="model" loader="main" >> location="servicedef/services_invoice.xml"/> >> >> Modified: >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >> >> ============================================================================== >> --- >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml >> (original) >> +++ >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml >> Tue Mar 4 06:32:14 2014 >> @@ -1140,7 +1140,76 @@ under the License. >> <response name="success" type="view" >> value="EditFixedAssetMaintOrders"/> >> <response name="error" type="view" >> value="EditFixedAssetMaintOrders"/> >> </request-map> >> - >> + >> + <!-- =============== Budget mapping =================--> >> + <request-map uri="ListBudgets"><security https="true" >> auth="true"/><response name="success" type="view" >> value="ListBudgets"/></request-map> >> + <request-map uri="BudgetSearchResults"><security https="true" >> auth="false"/><response name="success" type="view" >> value="BudgetSearchResults"/></request-map> >> + <request-map uri="EditBudget"><security https="true" >> auth="true"/><response name="success" type="view" >> value="EditBudget"/></request-map> >> + <request-map uri="BudgetOverview"><security https="true" >> auth="true"/><response name="success" type="view" >> value="BudgetOverview"/></request-map> >> + <request-map uri="EditBudgetItems"><security https="true" >> auth="true"/><response name="success" type="view" >> value="EditBudgetItems"/></request-map> >> + <request-map uri="BudgetRoles"><security https="true" >> auth="true"/><response name="success" type="view" >> value="BudgetRoles"/></request-map> >> + <request-map uri="BudgetReviews"><security https="true" >> auth="true"/><response name="success" type="view" >> value="BudgetReviews"/></request-map> >> + <request-map uri="createBudget"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="createBudget"/> >> + <response name="success" type="view" value="EditBudget"/> >> + <response name="error" type="view" value="EditBudget"/> >> + </request-map> >> + <request-map uri="updateBudget"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="updateBudget"/> >> + <response name="success" type="view" value="EditBudget"/> >> + <response name="error" type="view" value="EditBudget"/> >> + </request-map> >> + <request-map uri="updateBudgetStatus"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="updateBudgetStatus"/> >> + <response name="success" type="view" value="BudgetOverview"/> >> + <response name="error" type="view" value="BudgetOverview"/> >> + </request-map> >> + <request-map uri="createBudgetItem"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="createBudgetItem"/> >> + <response name="success" type="view" value="EditBudgetItems"/> >> + <response name="error" type="view" value="EditBudgetItems"/> >> + </request-map> >> + <request-map uri="updateBudgetItem"> >> + <security https="true" auth="true"/> >> + <event type="service-multi" invoke="updateBudgetItem"/> >> + <response name="success" type="request-redirect" >> value="EditBudgetItems"/> >> + <response name="error" type="view" value="EditBudgetItems"/> >> + </request-map> >> + <request-map uri="removeBudgetItem"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="removeBudgetItem"/> >> + <response name="success" type="view" value="EditBudgetItems"/> >> + <response name="error" type="view" value="EditBudgetItems"/> >> + </request-map> >> + <request-map uri="createBudgetRole"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="createBudgetRole"/> >> + <response name="success" type="view" value="BudgetRoles"/> >> + <response name="error" type="view" value="BudgetRoles"/> >> + </request-map> >> + <request-map uri="removeBudgetRole"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="removeBudgetRole"/> >> + <response name="success" type="view" value="BudgetRoles"/> >> + <response name="error" type="view" value="BudgetRoles"/> >> + </request-map> >> + <request-map uri="createBudgetReview"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="createBudgetReview"/> >> + <response name="success" type="view" value="BudgetReviews"/> >> + <response name="error" type="view" value="BudgetReviews"/> >> + </request-map> >> + <request-map uri="removeBudgetReview"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="removeBudgetReview"/> >> + <response name="success" type="view" value="BudgetReviews"/> >> + <response name="error" type="view" value="BudgetReviews"/> >> + </request-map> >> + >> <!-- =============== Agreement mapping =================--> >> <request-map uri="FindAgreement"><security https="true" >> auth="true"/><response name="success" type="view" >> value="FindAgreement"/></request-map> >> <request-map uri="cancelAgreement"> >> @@ -2237,7 +2306,7 @@ under the License. >> <request-map uri="LookupAgreementItem"><security auth="true" >> https="true"/><response name="success" type="view" >> value="LookupAgreementItem"/></request-map> >> <request-map uri="LookupPaymentGroupMember"><security auth="true" >> https="true"/><response name="success" type="view" >> value="LookupPaymentGroupMember"/></request-map> >> <request-map uri="LookupGlReconciliation"><security auth="true" >> https="true"/><response name="success" type="view" >> value="LookupGlReconciliation"/></request-map> >> - >> + <request-map uri="LookupCustomTimePeriod"><security auth="true" >> https="true"/><response name="success" type="view" >> value="LookupCustomTimePeriod"/></request-map> >> >> <request-map uri="viewprofile"><security https="true" >> auth="true"/><response name="success" type="view" >> value="viewprofile"/></request-map> >> >> @@ -2698,6 +2767,15 @@ under the License. >> <view-map name="EditFixedAsset" type="screen" >> page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAsset"/> >> <view-map name="ListFixedAssetProducts" type="screen" >> page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetProducts"/> >> >> + <!-- Budget --> >> + <view-map name="ListBudgets" type="screen" >> page="component://accounting/widget/BudgetScreens.xml#ListBudgets"/> >> + <view-map name="BudgetSearchResults" type="screen" >> page="component://accounting/widget/BudgetScreens.xml#BudgetSearchResults"/> >> + <view-map name="EditBudget" type="screen" >> page="component://accounting/widget/BudgetScreens.xml#EditBudget"/> >> + <view-map name="BudgetOverview" type="screen" >> page="component://accounting/widget/BudgetScreens.xml#BudgetOverview"/> >> + <view-map name="EditBudgetItems" type="screen" >> page="component://accounting/widget/BudgetScreens.xml#EditBudgetItems"/> >> + <view-map name="BudgetRoles" type="screen" >> page="component://accounting/widget/BudgetScreens.xml#BudgetRoles"/> >> + <view-map name="BudgetReviews" type="screen" >> page="component://accounting/widget/BudgetScreens.xml#BudgetReviews"/> >> + >> <!-- TO BE REMOVED >> <view-map name="addFixedAssetProduct" type="screen" >> page="component://accounting/widget/FixedAssetScreens.xml#addFixedAssetProduct"/> >> <view-map name="updateFixedAssetProduct" type="screen" >> page="component://accounting/widget/FixedAssetScreens.xml#updateFixedAssetProduct"/> >> @@ -2822,6 +2900,7 @@ under the License. >> <view-map name="LookupBillingAccount" >> page="component://accounting/widget/LookupScreens.xml#LookupBillingAccount" >> type="screen"/> >> <view-map name="LookupPayment" >> page="component://accounting/widget/LookupScreens.xml#LookupPayment" >> type="screen"/> >> <view-map name="LookupInvoice" >> page="component://accounting/widget/LookupScreens.xml#LookupInvoice" >> type="screen"/> >> + <view-map name="LookupCustomTimePeriod" type="screen" >> page="component://accounting/widget/LookupScreens.xml#LookupCustomTimePeriod"/> >> >> <view-map name="LookupWorkEffort" type="screen" >> page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> >> <view-map name="LookupOrderHeader" type="screen" >> page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> >> >> Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml >> (original) >> +++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Tue Mar >> 4 06:32:14 2014 >> @@ -48,6 +48,7 @@ under the License. >> <menu-item name="TaxAuthorities" >> title="${uiLabelMap.AccountingTaxAuthorities}"><link >> target="FindTaxAuthority"/></menu-item> >> <menu-item name="agreements" >> title="${uiLabelMap.AccountingAgreements}"><link >> target="FindAgreement"/></menu-item> >> <menu-item name="ListFixedAssets" >> title="${uiLabelMap.AccountingFixedAssets}"><link >> target="ListFixedAssets"/></menu-item> >> + <menu-item name="ListBudgets" >> title="${uiLabelMap.AccountingBudgets}"><link >> target="ListBudgets"/></menu-item> >> <menu-item name="GlobalGLSettings" >> title="${uiLabelMap.AccountingGlobalGLSettings}"><link >> target="globalGLSettings"/></menu-item> >> <menu-item name="companies" >> title="${uiLabelMap.AccountingOrgGlSettings}"><link >> target="ListCompanies"/></menu-item> >> </menu> >> @@ -672,6 +673,117 @@ under the License. >> </menu-item> >> </menu> >> >> + <menu name="BudgetTabBar" extends="CommonTabBarMenu" >> extends-resource="component://common/widget/CommonMenus.xml" >> + default-menu-item-name="EditBudget"> >> + <menu-item name="ListBudgets" >> title="${uiLabelMap.AccountingBudgetFind}"> >> + <link target="ListBudgets"/> >> + </menu-item> >> + <menu-item name="BudgetOverview" >> title="${uiLabelMap.AccountingBudgetOverview}"> >> + <link target="BudgetOverview"> >> + <parameter param-name="budgetId"/> >> + </link> >> + </menu-item> >> + <menu-item name="EditBudget" >> title="${uiLabelMap.AccountingBudgetHeader}"> >> + <condition> >> + <and> >> + <not><if-empty field="budgetId"/></not> >> + <or> >> + <if-compare field="statusId" operator="equals" >> value="BG_CREATED"/> >> + <if-compare field="statusId" operator="equals" >> value="BG_REVIEWED"/> >> + </or> >> + </and> >> + </condition> >> + <link target="EditBudget"> >> + <parameter param-name="budgetId"/> >> + </link> >> + </menu-item> >> + <menu-item name="BudgetItem" >> title="${uiLabelMap.AccountingBudgetItems}"> >> + <condition> >> + <and> >> + <not><if-empty field="budgetId"/></not> >> + <or> >> + <if-compare field="statusId" operator="equals" >> value="BG_CREATED"/> >> + <if-compare field="statusId" operator="equals" >> value="BG_REVIEWED"/> >> + </or> >> + </and> >> + </condition> >> + <link target="EditBudgetItems"> >> + <parameter param-name="budgetId"/> >> + </link> >> + </menu-item> >> + <menu-item name="BudgetRoles" >> title="${uiLabelMap.AccountingBudgetRoles}"> >> + <condition> >> + <and> >> + <not><if-empty field="budgetId"/></not> >> + <or> >> + <if-compare field="statusId" operator="equals" >> value="BG_CREATED"/> >> + <if-compare field="statusId" operator="equals" >> value="BG_REVIEWED"/> >> + </or> >> + </and> >> + </condition> >> + <link target="BudgetRoles"> >> + <parameter param-name="budgetId"/> >> + </link> >> + </menu-item> >> + <menu-item name="BudgetReviews" >> title="${uiLabelMap.AccountingBudgetReviews}"> >> + <condition> >> + <and> >> + <not><if-empty field="budgetId"/></not> >> + <if-compare field="statusId" operator="not-equals" >> value="BG_REJECTED"/> >> + </and> >> + </condition> >> + <link target="BudgetReviews"> >> + <parameter param-name="budgetId"/> >> + </link> >> + </menu-item> >> + </menu> >> + >> + <menu name="BudgetSubTabBar" menu-container-style="button-bar >> button-style-2" default-selected-style="selected"> >> + <menu-item name="statusToApproved" >> title="${uiLabelMap.AccountingBudgetStatusToApproved}"> >> + <condition> >> + <and> >> + <not><if-empty field="budgetId"/></not> >> + <or> >> + <if-compare field="statusId" operator="equals" >> value="BG_CREATED"/> >> + <if-compare field="statusId" operator="equals" >> value="BG_REVIEWED"/> >> + </or> >> + </and> >> + </condition> >> + <link target="updateBudgetStatus"> >> + <parameter param-name="budgetId" from-field="budgetId"/> >> + <parameter param-name="statusId" value="BG_APPROVED"/> >> + </link> >> + </menu-item> >> + <menu-item name="statusToReview" >> title="${uiLabelMap.AccountingBudgetStatusToReviewed}"> >> + <condition> >> + <and> >> + <not><if-empty field="budgetId"/></not> >> + <if-compare field="statusId" operator="equals" >> value="BG_CREATED"/> >> + </and> >> + </condition> >> + <link target="updateBudgetStatus"> >> + <parameter param-name="budgetId" from-field="budgetId"/> >> + <parameter param-name="statusId" value="BG_REVIEWED"/> >> + </link> >> + </menu-item> >> + <menu-item name="statusToReject" >> title="${uiLabelMap.AccountingBudgetStatusToRejected}"> >> + <condition> >> + <and> >> + <not><if-empty field="budgetId"/></not> >> + <or> >> + <if-compare field="statusId" operator="equals" >> value="BG_CREATED"/> >> + <if-compare field="statusId" operator="equals" >> value="BG_REVIEWED"/> >> + <if-compare field="statusId" operator="equals" >> value="BG_APPROVED"/> >> + </or> >> + </and> >> + </condition> >> + <link target="updateBudgetStatus"> >> + <parameter param-name="budgetId" from-field="budgetId"/> >> + <parameter param-name="statusId" value="BG_REJECTED"/> >> + </link> >> + </menu-item> >> + </menu> >> + >> <menu name="PartyGlShortCuts"> >> <menu-item name="CreateSalesAcctgTrans"> >> <link target="CreateAcctgTransAndEntries" >> text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"> >> >> Modified: ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml >> (original) >> +++ ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml Tue >> Mar 4 06:32:14 2014 >> @@ -52,6 +52,38 @@ under the License. >> <field name="fixedAssetName" >> title="${uiLabelMap.CommonName}"><display/></field> >> <field name="fixedAssetTypeId" >> title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity >> entity-name="FixedAssetType"/></field> >> </form> >> + <form name="lookupBudget" target="LookupBudget" title="" type="single" >> + header-row-style="header-row" default-table-style="basic-table"> >> + <auto-fields-entity entity-name="Budget" >> default-field-type="hidden"/> >> + <field name="budgetId"><text-find/></field> >> + <field name="budgetTypeId" >> title="${uiLabelMap.AccountingBudgetType}"> >> + <drop-down allow-empty="true"> >> + <entity-options entity-name="BudgetType" >> description="${description}"> >> + <entity-order-by field-name="description"/> >> + </entity-options> >> + </drop-down> >> + </field> >> + <field name="customTimePeriodId"><text-find/></field> >> + <field name="comments"><text-find/></field> >> + <field name="noConditionFind"><hidden value="Y"/><!-- if this >> isn't there then with all fields empty no query will be done --></field> >> + <field name="submitButton" title="${uiLabelMap.CommonFind}" >> widget-style="smallSubmit"><submit button-type="button"/></field> >> + </form> >> + <form name="listLookupBudget" list-name="listIt" title="" type="list" >> paginate-target="LookupBudget" >> + odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + <actions> >> + <service service-name="performFind" result-map="result" >> result-map-list="listIt"> >> + <field-map field-name="inputFields" >> from-field="parameters"/> >> + <field-map field-name="entityName" value="FixedAsset"/> >> + <field-map field-name="viewIndex" from-field="viewIndex"/> >> + <field-map field-name="viewSize" from-field="viewSize"/> >> + </service> >> + </actions> >> + <field name="fixedAssetId" widget-style="buttontext"> >> + <hyperlink also-hidden="false" target-type="plain" >> description="${fixedAssetId}" >> target="javascript:set_value('${fixedAssetId}')"/> >> + </field> >> + <field name="fixedAssetName" >> title="${uiLabelMap.CommonName}"><display/></field> >> + <field name="fixedAssetTypeId" >> title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity >> entity-name="FixedAssetType"/></field> >> + </form> >> <form name="lookupBillingAccount" target="LookupBillingAccount" >> title="" type="single" >> header-row-style="header-row" default-table-style="basic-table"> >> <auto-fields-entity entity-name="BillingAccount" >> default-field-type="hidden"/> >> @@ -308,4 +340,51 @@ under the License. >> <field name="organizationPartyId"><display-entity >> entity-name="PartyNameView" key-field-name="partyId" >> description="${groupName}${firstName} ${lastName}[${partyId}]"/></field> >> <field name="description" >> title="${uiLabelMap.CommonDescription}"><display/></field> >> </form> >> + >> + <form name="lookupCustomTimePeriod" target="LookupCustomTimePeriod" >> title="" type="single" >> + header-row-style="header-row" default-table-style="basic-table"> >> + <auto-fields-entity entity-name="CustomTimePeriod" >> default-field-type="hidden"/> >> + <field name="customTimePeriodId"><text-find/></field> >> + <field name="parentPeriodId"><text-find/></field> >> + <field name="periodTypeId"> >> + <drop-down allow-empty="true"> >> + <entity-options entity-name="PeriodType" >> description="${description}"> >> + <entity-order-by field-name="description"/> >> + </entity-options> >> + </drop-down> >> + </field> >> + <field name="periodNum"><text-find/></field> >> + <field name="periodName"><text-find/></field> >> + <field name="fromDate"><date-time/></field> >> + <field name="thruDate"><date-time/></field> >> + <field name="isClosed"> >> + <drop-down allow-empty="true"> >> + <option key="Y" description="${uiLabelMap.CommonY}"/> >> + <option key="N" description="${uiLabelMap.CommonN}"/> >> + </drop-down> >> + </field> >> + <field name="noConditionFind"><hidden value="Y"/><!-- if this >> isn't there then with all fields empty no query will be done --></field> >> + <field name="submitButton" title="${uiLabelMap.CommonFind}" >> widget-style="smallSubmit"><submit button-type="button"/></field> >> + </form> >> + <form name="listLookupCustomTimePeriod" list-name="listIt" title="" >> type="list" paginate-target="LookupCustomTimePeriod" >> + odd-row-style="alternate-row" default-table-style="basic-table >> hover-bar"> >> + <actions> >> + <service service-name="performFind" result-map="result" >> result-map-list="listIt"> >> + <field-map field-name="inputFields" >> from-field="parameters"/> >> + <field-map field-name="entityName" >> value="CustomTimePeriod"/> >> + <field-map field-name="viewIndex" from-field="viewIndex"/> >> + <field-map field-name="viewSize" from-field="viewSize"/> >> + </service> >> + </actions> >> + <field name="customTimePeriodId" widget-style="buttontext"> >> + <hyperlink also-hidden="false" target-type="plain" >> description="${customTimePeriodId}" >> target="javascript:set_value('${customTimePeriodId}')"/> >> + </field> >> + <field name="parentPeriodId"><display/></field> >> + <field name="periodTypeId"><display-entity >> entity-name="PeriodType"/></field> >> + <field name="periodNum"><display/></field> >> + <field name="periodName"><display/></field> >> + <field name="fromDate"><display/></field> >> + <field name="thruDate"><display/></field> >> + <field name="isClosed"><display/></field> >> + </form> >> </forms> >> >> Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >> >> ============================================================================== >> --- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original) >> +++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Tue Mar >> 4 06:32:14 2014 >> @@ -268,4 +268,29 @@ under the License. >> </widgets> >> </section> >> </screen> >> + >> + <screen name="LookupCustomTimePeriod"> >> + <section> >> + <actions> >> + <property-map resource="AccountingUiLabels" >> map-name="uiLabelMap" global="true"/> >> + <set field="title" >> value="${uiLabelMap.PageTitleLookupCustomTimePeriod}"/> >> + <set field="queryString" from-field="result.queryString"/> >> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" >> type="Integer" default-value="0"/> >> + <property-to-field resource="widget" >> property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> >> + <set field="viewSize" from-field="parameters.VIEW_SIZE" >> type="Integer" default-value="${viewSizeDefaultValue}"/> >> + <set field="entityName" value="CustomTimePeriod"/> >> + <set field="searchFields" value="[customTimePeriodId, >> periodName]"/> >> + </actions> >> + <widgets> >> + <decorator-screen name="LookupDecorator" >> location="component://common/widget/CommonScreens.xml"> >> + <decorator-section name="search-options"> >> + <include-form name="lookupCustomTimePeriod" >> location="component://accounting/widget/FieldLookupForms.xml"/> >> + </decorator-section> >> + <decorator-section name="search-results"> >> + <include-form name="listLookupCustomTimePeriod" >> location="component://accounting/widget/FieldLookupForms.xml"/> >> + </decorator-section> >> + </decorator-screen> >> + </widgets> >> + </section> >> + </screen> >> </screens> >> >> >> |
Yes sorry....just added it.....
Regards, Hans On 05/03/14 16:07, Jacques Le Roux wrote: > Yes, were is services_budget.xml ? > > Jacques > > Le 04/03/2014 09:53, Pierre Smits a écrit : >> It seems to me that this is not complete. >> >> Pierre Smits >> >> *ORRTIZ.COM <http://www.orrtiz.com>* >> Services & Solutions for Cloud- >> Based Manufacturing, Professional >> Services and Retail & Trade >> http://www.orrtiz.com >> >> >> On Tue, Mar 4, 2014 at 7:32 AM, <[hidden email]> wrote: >> >>> Author: hansbak >>> Date: Tue Mar 4 06:32:14 2014 >>> New Revision: 1573884 >>> >>> URL: http://svn.apache.org/r1573884 >>> Log: >>> adding budget services, screens and forms >>> >>> Modified: >>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >>> ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml >>> ofbiz/trunk/applications/accounting/ofbiz-component.xml >>> >>> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml >>> >>> ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml >>> ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml >>> ofbiz/trunk/applications/accounting/widget/LookupScreens.xml >>> >>> Modified: >>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >>> >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >>> (original) >>> +++ >>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue >>> Mar 4 06:32:14 2014 >>> @@ -2392,6 +2392,51 @@ >>> <value xml:lang="zh">å ‘ç¥¨ç¼–å ·ï¼ˆInvoiceId)和账å >>> •è´¦æˆ·ç¼–å ·ï¼ˆBillingAccountId)都是空的</value> >>> <value >>> xml:lang="zh_TW">發票編號(InvoiceId)和賬單賬戶編號(BillingAccountId)都是空的</value> >>> >>> </property> >>> + <property key="AccountingBudgetFind"> >>> + <value xml:lang="en">Find</value> >>> + </property> >>> + <property key="AccountingBudgetHeader"> >>> + <value xml:lang="en">Header</value> >>> + </property> >>> + <property key="AccountingBudgetItems"> >>> + <value xml:lang="en">Items</value> >>> + </property> >>> + <property key="AccountingBudgetItemsAdd"> >>> + <value xml:lang="en">Add a new budget Item</value> >>> + </property> >>> + <property key="AccountingBudgetOverview"> >>> + <value xml:lang="en">Overview</value> >>> + </property> >>> + <property key="AccountingBudgetReviewAdd"> >>> + <value xml:lang="en">Add a new Budget Review</value> >>> + </property> >>> + <property key="AccountingBudgetReviewResult"> >>> + <value xml:lang="en">Budget Review Result</value> >>> + </property> >>> + <property key="AccountingBudgetReviews"> >>> + <value xml:lang="en">Reviews</value> >>> + </property> >>> + <property key="AccountingBudgetRoles"> >>> + <value xml:lang="en">Roles</value> >>> + </property> >>> + <property key="AccountingBudgets"> >>> + <value xml:lang="en">Budgets</value> >>> + </property> >>> + <property key="AccountingBudgetStatus"> >>> + <value xml:lang="en">Status</value> >>> + </property> >>> + <property key="AccountingBudgetStatusToApproved"> >>> + <value xml:lang="en">Status To 'Approved'</value> >>> + </property> >>> + <property key="AccountingBudgetStatusToReviewed"> >>> + <value xml:lang="en">Status To 'Reviewed'</value> >>> + </property> >>> + <property key="AccountingBudgetStatusToRejected"> >>> + <value xml:lang="en">Status To 'Rejected'</value> >>> + </property> >>> + <property key="AccountingBudgetType"> >>> + <value xml:lang="en">Budget Type</value> >>> + </property> >>> <property key="AccountingByAccount"> >>> <value xml:lang="de">Nach Konto</value> >>> <value xml:lang="en">By Account</value> >>> @@ -4482,6 +4527,9 @@ >>> <value xml:lang="zh">编辑账户对账</value> >>> <value xml:lang="zh_TW">修改帳戶調節</value> >>> </property> >>> + <property key="AccountingEditBudget"> >>> + <value xml:lang="en">Edit Budget</value> >>> + </property> >>> <property key="AccountingEditCreditCard"> >>> <value xml:lang="cs">Zpracovat kreditnà kartu</value> >>> <value xml:lang="de">Kreditkarte bearbeiten</value> >>> @@ -5310,6 +5358,9 @@ >>> <value xml:lang="zh">查找应收支付</value> >>> <value xml:lang="zh_TW">找尋應收支付</value> >>> </property> >>> + <property key="AccountingFindBudgets"> >>> + <value xml:lang="en">Find Budgets</value> >>> + </property> >>> <property key="AccountingFindDepositSlip"> >>> <value xml:lang="de">Finde Einzahlungsscheine für >>> Finanzkonto : >>> ${finAccount.finAccountName} [${finAccountId}]</value> >>> <value xml:lang="en">Find Deposit Slips for Financial >>> Account : >>> ${finAccount.finAccountName} [${finAccountId}]</value> >>> @@ -8958,6 +9009,9 @@ >>> <value xml:lang="zh">æ–°å»ºå ˆå Œæ ¡ä»¶</value> >>> <value xml:lang="zh_TW">æ–°å»ºå ˆå Œæ¢ ä»¶</value> >>> </property> >>> + <property key="AccountingNewBudget"> >>> + <value xml:lang="en">Create New Budget</value> >>> + </property> >>> <property key="AccountingNewCompany"> >>> <value xml:lang="en">Create new accounting company</value> >>> </property> >>> @@ -19870,6 +19924,9 @@ >>> <value xml:lang="zh">æ‰¹é‡ æ”¯ä»˜</value> >>> <value xml:lang="zh_TW">批次付款</value> >>> </property> >>> + <property key="PageTitleBudgetOverview"> >>> + <value xml:lang="en">Budget Overview</value> >>> + </property> >>> <property key="PageTitleCopyAgreement"> >>> <value xml:lang="en">Copy Agreement</value> >>> <value xml:lang="fr">Copie d'accords commerciaux</value> >>> @@ -20133,6 +20190,9 @@ >>> <value xml:lang="zh">ç¼–è¾‘è´¦å •è´¦æˆ·æ ¡ä»¶</value> >>> <value xml:lang="zh_TW">ç·¨è¼¯è³¬å–®è³¬æˆ¶æ¢ ä»¶</value> >>> </property> >>> + <property key="PageTitleEditBudget"> >>> + <value xml:lang="en">Edit Budget</value> >>> + </property> >>> <property key="PageTitleEditFinAccount"> >>> <value xml:lang="en">Edit Financial Account</value> >>> <value xml:lang="fr">Modifier un compte financier</value> >>> @@ -20966,6 +21026,15 @@ >>> <value xml:lang="zh">å ˆå Œæ ¡ä»¶åˆ—è¡¨</value> >>> <value xml:lang="zh_TW">å ˆå Œæ¢ ä»¶åˆ—è¡¨</value> >>> </property> >>> + <property key="PageTitleListBudget"> >>> + <value xml:lang="en">List Budget</value> >>> + </property> >>> + <property key="PageTitleListBudgetReviews"> >>> + <value xml:lang="en">List Budget Reviews</value> >>> + </property> >>> + <property key="PageTitleListBudgetRoles"> >>> + <value xml:lang="en">List Budget Roles</value> >>> + </property> >>> <property key="PageTitleListEditInvoiceApplications"> >>> <value xml:lang="en">List Edit Invoice Applications</value> >>> <value xml:lang="es">Lista Editar Aplicaciones de >>> Factura</value> >>> @@ -21256,6 +21325,9 @@ >>> <value xml:lang="zh">按å ç§°æŸ¥æ‰¾è´¦å •è´¦æˆ·</value> >>> <value xml:lang="zh_TW">按å 稱查找賬單賬戶</value> >>> </property> >>> + <property key="PageTitleLookupCustomTimePeriod"> >>> + <value xml:lang="en">Lookup Custom Time Period</value> >>> + </property> >>> <property key="PageTitleLookupFixedAsset"> >>> <value xml:lang="en">Lookup Fixed Asset</value> >>> <value xml:lang="es">Buscar Activo Fijo</value> >>> >>> Modified: >>> ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >>> >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml >>> (original) >>> +++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Tue >>> Mar 4 06:32:14 2014 >>> @@ -1090,4 +1090,20 @@ under the License. >>> <!-- invoice export replacement Id types --> >>> <GoodIdentificationType description="replacement value for >>> partyId in >>> the invoice export function in accounting" >>> goodIdentificationTypeId="INVOICE_EXPORT"/> >>> <PartyIdentificationType description="replacement value for >>> partyId >>> in the invoice export function in accounting" >>> partyIdentificationTypeId="INVOICE_EXPORT"/> >>> + >>> + <!-- Budget Type Data --> >>> + <StatusItem description="Created" sequenceId="00" >>> statusCode="CREATED" statusId="BG_CREATED" >>> statusTypeId="BUDGET_STATUS"/> >>> + <StatusItem description="Reviewed" sequenceId="01" >>> statusCode="REVIEWED" statusId="BG_REVIEWED" >>> statusTypeId="BUDGET_STATUS"/> >>> + <StatusItem description="Approved" sequenceId="02" >>> statusCode="APPROVED" statusId="BG_APPROVED" >>> statusTypeId="BUDGET_STATUS"/> >>> + <StatusItem description="Rejected" sequenceId="03" >>> statusCode="REJECTED" statusId="BG_REJECTED" >>> statusTypeId="BUDGET_STATUS"/> >>> + <StatusValidChange condition="" statusId="BG_CREATED" >>> statusIdTo="BG_REVIEWED" transitionName="Review Budget"/> >>> + <StatusValidChange condition="" statusId="BG_CREATED" >>> statusIdTo="BG_APPROVED" transitionName="Submit Budget"/> >>> + <StatusValidChange condition="" statusId="BG_CREATED" >>> statusIdTo="BG_REJECTED" transitionName="Reject Budget"/> >>> + <StatusValidChange condition="" statusId="BG_REVIEWED" >>> statusIdTo="BG_APPROVED" transitionName="Approved Budget"/> >>> + <StatusValidChange condition="" statusId="BG_REVIEWED" >>> statusIdTo="BG_REJECTED" transitionName="Reject Budget"/> >>> + <StatusValidChange condition="" statusId="BG_APPROVED" >>> statusIdTo="BG_CREATED" transitionName="Accept Budget"/> >>> + <StatusValidChange condition="" statusId="BG_APPROVED" >>> statusIdTo="BG_REJECTED" transitionName="Reject Budget"/> >>> + >>> + <BudgetReviewResultType description="Accepted" >>> budgetReviewResultTypeId="BGR_ACCEPTED"/> >>> + <BudgetReviewResultType description="Rejected" >>> budgetReviewResultTypeId="BGR_REJECTED"/> >>> </entity-engine-xml> >>> >>> Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >>> >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original) >>> +++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Tue Mar 4 >>> 06:32:14 2014 >>> @@ -53,11 +53,13 @@ under the License. >>> <entity-resource type="data" reader-name="demo" loader="main" >>> location="data/DemoPaymentsInvoices.xml"/> >>> <entity-resource type="data" reader-name="demo" loader="main" >>> location="data/DemoAccountingUserData.xml"/> >>> <entity-resource type="data" reader-name="demo" loader="main" >>> location="data/DemoAssetMaintData.xml"/> >>> + <entity-resource type="data" reader-name="demo" loader="main" >>> location="data/DemoBudgetData.xml"/> >>> >>> <!-- General Payment Service Definitions --> >>> <service-resource type="model" loader="main" >>> location="servicedef/services_agreement.xml"/> >>> <service-resource type="model" loader="main" >>> location="servicedef/services_admin.xml"/> >>> <service-resource type="model" loader="main" >>> location="servicedef/services_billing.xml"/> >>> + <service-resource type="model" loader="main" >>> location="servicedef/services_budget.xml"/> >>> <service-resource type="model" loader="main" >>> location="servicedef/services_finaccount.xml"/> >>> <service-resource type="model" loader="main" >>> location="servicedef/services_fixedasset.xml"/> >>> <service-resource type="model" loader="main" >>> location="servicedef/services_invoice.xml"/> >>> >>> Modified: >>> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml >>> >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >>> >>> >>> ============================================================================== >>> >>> --- >>> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml >>> >>> (original) >>> +++ >>> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml >>> >>> Tue Mar 4 06:32:14 2014 >>> @@ -1140,7 +1140,76 @@ under the License. >>> <response name="success" type="view" >>> value="EditFixedAssetMaintOrders"/> >>> <response name="error" type="view" >>> value="EditFixedAssetMaintOrders"/> >>> </request-map> >>> - >>> + >>> + <!-- =============== Budget mapping =================--> >>> + <request-map uri="ListBudgets"><security https="true" >>> auth="true"/><response name="success" type="view" >>> value="ListBudgets"/></request-map> >>> + <request-map uri="BudgetSearchResults"><security https="true" >>> auth="false"/><response name="success" type="view" >>> value="BudgetSearchResults"/></request-map> >>> + <request-map uri="EditBudget"><security https="true" >>> auth="true"/><response name="success" type="view" >>> value="EditBudget"/></request-map> >>> + <request-map uri="BudgetOverview"><security https="true" >>> auth="true"/><response name="success" type="view" >>> value="BudgetOverview"/></request-map> >>> + <request-map uri="EditBudgetItems"><security https="true" >>> auth="true"/><response name="success" type="view" >>> value="EditBudgetItems"/></request-map> >>> + <request-map uri="BudgetRoles"><security https="true" >>> auth="true"/><response name="success" type="view" >>> value="BudgetRoles"/></request-map> >>> + <request-map uri="BudgetReviews"><security https="true" >>> auth="true"/><response name="success" type="view" >>> value="BudgetReviews"/></request-map> >>> + <request-map uri="createBudget"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="createBudget"/> >>> + <response name="success" type="view" value="EditBudget"/> >>> + <response name="error" type="view" value="EditBudget"/> >>> + </request-map> >>> + <request-map uri="updateBudget"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="updateBudget"/> >>> + <response name="success" type="view" value="EditBudget"/> >>> + <response name="error" type="view" value="EditBudget"/> >>> + </request-map> >>> + <request-map uri="updateBudgetStatus"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="updateBudgetStatus"/> >>> + <response name="success" type="view" value="BudgetOverview"/> >>> + <response name="error" type="view" value="BudgetOverview"/> >>> + </request-map> >>> + <request-map uri="createBudgetItem"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="createBudgetItem"/> >>> + <response name="success" type="view" value="EditBudgetItems"/> >>> + <response name="error" type="view" value="EditBudgetItems"/> >>> + </request-map> >>> + <request-map uri="updateBudgetItem"> >>> + <security https="true" auth="true"/> >>> + <event type="service-multi" invoke="updateBudgetItem"/> >>> + <response name="success" type="request-redirect" >>> value="EditBudgetItems"/> >>> + <response name="error" type="view" value="EditBudgetItems"/> >>> + </request-map> >>> + <request-map uri="removeBudgetItem"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="removeBudgetItem"/> >>> + <response name="success" type="view" value="EditBudgetItems"/> >>> + <response name="error" type="view" value="EditBudgetItems"/> >>> + </request-map> >>> + <request-map uri="createBudgetRole"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="createBudgetRole"/> >>> + <response name="success" type="view" value="BudgetRoles"/> >>> + <response name="error" type="view" value="BudgetRoles"/> >>> + </request-map> >>> + <request-map uri="removeBudgetRole"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="removeBudgetRole"/> >>> + <response name="success" type="view" value="BudgetRoles"/> >>> + <response name="error" type="view" value="BudgetRoles"/> >>> + </request-map> >>> + <request-map uri="createBudgetReview"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="createBudgetReview"/> >>> + <response name="success" type="view" value="BudgetReviews"/> >>> + <response name="error" type="view" value="BudgetReviews"/> >>> + </request-map> >>> + <request-map uri="removeBudgetReview"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="removeBudgetReview"/> >>> + <response name="success" type="view" value="BudgetReviews"/> >>> + <response name="error" type="view" value="BudgetReviews"/> >>> + </request-map> >>> + >>> <!-- =============== Agreement mapping =================--> >>> <request-map uri="FindAgreement"><security https="true" >>> auth="true"/><response name="success" type="view" >>> value="FindAgreement"/></request-map> >>> <request-map uri="cancelAgreement"> >>> @@ -2237,7 +2306,7 @@ under the License. >>> <request-map uri="LookupAgreementItem"><security auth="true" >>> https="true"/><response name="success" type="view" >>> value="LookupAgreementItem"/></request-map> >>> <request-map uri="LookupPaymentGroupMember"><security auth="true" >>> https="true"/><response name="success" type="view" >>> value="LookupPaymentGroupMember"/></request-map> >>> <request-map uri="LookupGlReconciliation"><security auth="true" >>> https="true"/><response name="success" type="view" >>> value="LookupGlReconciliation"/></request-map> >>> - >>> + <request-map uri="LookupCustomTimePeriod"><security auth="true" >>> https="true"/><response name="success" type="view" >>> value="LookupCustomTimePeriod"/></request-map> >>> >>> <request-map uri="viewprofile"><security https="true" >>> auth="true"/><response name="success" type="view" >>> value="viewprofile"/></request-map> >>> >>> @@ -2698,6 +2767,15 @@ under the License. >>> <view-map name="EditFixedAsset" type="screen" >>> page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAsset"/> >>> >>> <view-map name="ListFixedAssetProducts" type="screen" >>> page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetProducts"/> >>> >>> >>> + <!-- Budget --> >>> + <view-map name="ListBudgets" type="screen" >>> page="component://accounting/widget/BudgetScreens.xml#ListBudgets"/> >>> + <view-map name="BudgetSearchResults" type="screen" >>> page="component://accounting/widget/BudgetScreens.xml#BudgetSearchResults"/> >>> >>> + <view-map name="EditBudget" type="screen" >>> page="component://accounting/widget/BudgetScreens.xml#EditBudget"/> >>> + <view-map name="BudgetOverview" type="screen" >>> page="component://accounting/widget/BudgetScreens.xml#BudgetOverview"/> >>> + <view-map name="EditBudgetItems" type="screen" >>> page="component://accounting/widget/BudgetScreens.xml#EditBudgetItems"/> >>> >>> + <view-map name="BudgetRoles" type="screen" >>> page="component://accounting/widget/BudgetScreens.xml#BudgetRoles"/> >>> + <view-map name="BudgetReviews" type="screen" >>> page="component://accounting/widget/BudgetScreens.xml#BudgetReviews"/> >>> + >>> <!-- TO BE REMOVED >>> <view-map name="addFixedAssetProduct" type="screen" >>> page="component://accounting/widget/FixedAssetScreens.xml#addFixedAssetProduct"/> >>> >>> <view-map name="updateFixedAssetProduct" type="screen" >>> page="component://accounting/widget/FixedAssetScreens.xml#updateFixedAssetProduct"/> >>> >>> @@ -2822,6 +2900,7 @@ under the License. >>> <view-map name="LookupBillingAccount" >>> page="component://accounting/widget/LookupScreens.xml#LookupBillingAccount" >>> >>> type="screen"/> >>> <view-map name="LookupPayment" >>> page="component://accounting/widget/LookupScreens.xml#LookupPayment" >>> type="screen"/> >>> <view-map name="LookupInvoice" >>> page="component://accounting/widget/LookupScreens.xml#LookupInvoice" >>> type="screen"/> >>> + <view-map name="LookupCustomTimePeriod" type="screen" >>> page="component://accounting/widget/LookupScreens.xml#LookupCustomTimePeriod"/> >>> >>> >>> <view-map name="LookupWorkEffort" type="screen" >>> page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> >>> >>> <view-map name="LookupOrderHeader" type="screen" >>> page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> >>> >>> >>> Modified: >>> ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >>> >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml >>> (original) >>> +++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml >>> Tue Mar >>> 4 06:32:14 2014 >>> @@ -48,6 +48,7 @@ under the License. >>> <menu-item name="TaxAuthorities" >>> title="${uiLabelMap.AccountingTaxAuthorities}"><link >>> target="FindTaxAuthority"/></menu-item> >>> <menu-item name="agreements" >>> title="${uiLabelMap.AccountingAgreements}"><link >>> target="FindAgreement"/></menu-item> >>> <menu-item name="ListFixedAssets" >>> title="${uiLabelMap.AccountingFixedAssets}"><link >>> target="ListFixedAssets"/></menu-item> >>> + <menu-item name="ListBudgets" >>> title="${uiLabelMap.AccountingBudgets}"><link >>> target="ListBudgets"/></menu-item> >>> <menu-item name="GlobalGLSettings" >>> title="${uiLabelMap.AccountingGlobalGLSettings}"><link >>> target="globalGLSettings"/></menu-item> >>> <menu-item name="companies" >>> title="${uiLabelMap.AccountingOrgGlSettings}"><link >>> target="ListCompanies"/></menu-item> >>> </menu> >>> @@ -672,6 +673,117 @@ under the License. >>> </menu-item> >>> </menu> >>> >>> + <menu name="BudgetTabBar" extends="CommonTabBarMenu" >>> extends-resource="component://common/widget/CommonMenus.xml" >>> + default-menu-item-name="EditBudget"> >>> + <menu-item name="ListBudgets" >>> title="${uiLabelMap.AccountingBudgetFind}"> >>> + <link target="ListBudgets"/> >>> + </menu-item> >>> + <menu-item name="BudgetOverview" >>> title="${uiLabelMap.AccountingBudgetOverview}"> >>> + <link target="BudgetOverview"> >>> + <parameter param-name="budgetId"/> >>> + </link> >>> + </menu-item> >>> + <menu-item name="EditBudget" >>> title="${uiLabelMap.AccountingBudgetHeader}"> >>> + <condition> >>> + <and> >>> + <not><if-empty field="budgetId"/></not> >>> + <or> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_CREATED"/> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_REVIEWED"/> >>> + </or> >>> + </and> >>> + </condition> >>> + <link target="EditBudget"> >>> + <parameter param-name="budgetId"/> >>> + </link> >>> + </menu-item> >>> + <menu-item name="BudgetItem" >>> title="${uiLabelMap.AccountingBudgetItems}"> >>> + <condition> >>> + <and> >>> + <not><if-empty field="budgetId"/></not> >>> + <or> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_CREATED"/> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_REVIEWED"/> >>> + </or> >>> + </and> >>> + </condition> >>> + <link target="EditBudgetItems"> >>> + <parameter param-name="budgetId"/> >>> + </link> >>> + </menu-item> >>> + <menu-item name="BudgetRoles" >>> title="${uiLabelMap.AccountingBudgetRoles}"> >>> + <condition> >>> + <and> >>> + <not><if-empty field="budgetId"/></not> >>> + <or> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_CREATED"/> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_REVIEWED"/> >>> + </or> >>> + </and> >>> + </condition> >>> + <link target="BudgetRoles"> >>> + <parameter param-name="budgetId"/> >>> + </link> >>> + </menu-item> >>> + <menu-item name="BudgetReviews" >>> title="${uiLabelMap.AccountingBudgetReviews}"> >>> + <condition> >>> + <and> >>> + <not><if-empty field="budgetId"/></not> >>> + <if-compare field="statusId" operator="not-equals" >>> value="BG_REJECTED"/> >>> + </and> >>> + </condition> >>> + <link target="BudgetReviews"> >>> + <parameter param-name="budgetId"/> >>> + </link> >>> + </menu-item> >>> + </menu> >>> + >>> + <menu name="BudgetSubTabBar" menu-container-style="button-bar >>> button-style-2" default-selected-style="selected"> >>> + <menu-item name="statusToApproved" >>> title="${uiLabelMap.AccountingBudgetStatusToApproved}"> >>> + <condition> >>> + <and> >>> + <not><if-empty field="budgetId"/></not> >>> + <or> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_CREATED"/> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_REVIEWED"/> >>> + </or> >>> + </and> >>> + </condition> >>> + <link target="updateBudgetStatus"> >>> + <parameter param-name="budgetId" >>> from-field="budgetId"/> >>> + <parameter param-name="statusId" value="BG_APPROVED"/> >>> + </link> >>> + </menu-item> >>> + <menu-item name="statusToReview" >>> title="${uiLabelMap.AccountingBudgetStatusToReviewed}"> >>> + <condition> >>> + <and> >>> + <not><if-empty field="budgetId"/></not> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_CREATED"/> >>> + </and> >>> + </condition> >>> + <link target="updateBudgetStatus"> >>> + <parameter param-name="budgetId" >>> from-field="budgetId"/> >>> + <parameter param-name="statusId" value="BG_REVIEWED"/> >>> + </link> >>> + </menu-item> >>> + <menu-item name="statusToReject" >>> title="${uiLabelMap.AccountingBudgetStatusToRejected}"> >>> + <condition> >>> + <and> >>> + <not><if-empty field="budgetId"/></not> >>> + <or> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_CREATED"/> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_REVIEWED"/> >>> + <if-compare field="statusId" operator="equals" >>> value="BG_APPROVED"/> >>> + </or> >>> + </and> >>> + </condition> >>> + <link target="updateBudgetStatus"> >>> + <parameter param-name="budgetId" >>> from-field="budgetId"/> >>> + <parameter param-name="statusId" value="BG_REJECTED"/> >>> + </link> >>> + </menu-item> >>> + </menu> >>> + >>> <menu name="PartyGlShortCuts"> >>> <menu-item name="CreateSalesAcctgTrans"> >>> <link target="CreateAcctgTransAndEntries" >>> text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" >>> style="buttontext"> >>> >>> Modified: >>> ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >>> >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml >>> (original) >>> +++ ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml Tue >>> Mar 4 06:32:14 2014 >>> @@ -52,6 +52,38 @@ under the License. >>> <field name="fixedAssetName" >>> title="${uiLabelMap.CommonName}"><display/></field> >>> <field name="fixedAssetTypeId" >>> title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity >>> entity-name="FixedAssetType"/></field> >>> </form> >>> + <form name="lookupBudget" target="LookupBudget" title="" >>> type="single" >>> + header-row-style="header-row" >>> default-table-style="basic-table"> >>> + <auto-fields-entity entity-name="Budget" >>> default-field-type="hidden"/> >>> + <field name="budgetId"><text-find/></field> >>> + <field name="budgetTypeId" >>> title="${uiLabelMap.AccountingBudgetType}"> >>> + <drop-down allow-empty="true"> >>> + <entity-options entity-name="BudgetType" >>> description="${description}"> >>> + <entity-order-by field-name="description"/> >>> + </entity-options> >>> + </drop-down> >>> + </field> >>> + <field name="customTimePeriodId"><text-find/></field> >>> + <field name="comments"><text-find/></field> >>> + <field name="noConditionFind"><hidden value="Y"/><!-- if this >>> isn't there then with all fields empty no query will be done >>> --></field> >>> + <field name="submitButton" title="${uiLabelMap.CommonFind}" >>> widget-style="smallSubmit"><submit button-type="button"/></field> >>> + </form> >>> + <form name="listLookupBudget" list-name="listIt" title="" >>> type="list" >>> paginate-target="LookupBudget" >>> + odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + <actions> >>> + <service service-name="performFind" result-map="result" >>> result-map-list="listIt"> >>> + <field-map field-name="inputFields" >>> from-field="parameters"/> >>> + <field-map field-name="entityName" >>> value="FixedAsset"/> >>> + <field-map field-name="viewIndex" >>> from-field="viewIndex"/> >>> + <field-map field-name="viewSize" >>> from-field="viewSize"/> >>> + </service> >>> + </actions> >>> + <field name="fixedAssetId" widget-style="buttontext"> >>> + <hyperlink also-hidden="false" target-type="plain" >>> description="${fixedAssetId}" >>> target="javascript:set_value('${fixedAssetId}')"/> >>> + </field> >>> + <field name="fixedAssetName" >>> title="${uiLabelMap.CommonName}"><display/></field> >>> + <field name="fixedAssetTypeId" >>> title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity >>> entity-name="FixedAssetType"/></field> >>> + </form> >>> <form name="lookupBillingAccount" target="LookupBillingAccount" >>> title="" type="single" >>> header-row-style="header-row" >>> default-table-style="basic-table"> >>> <auto-fields-entity entity-name="BillingAccount" >>> default-field-type="hidden"/> >>> @@ -308,4 +340,51 @@ under the License. >>> <field name="organizationPartyId"><display-entity >>> entity-name="PartyNameView" key-field-name="partyId" >>> description="${groupName}${firstName} >>> ${lastName}[${partyId}]"/></field> >>> <field name="description" >>> title="${uiLabelMap.CommonDescription}"><display/></field> >>> </form> >>> + >>> + <form name="lookupCustomTimePeriod" >>> target="LookupCustomTimePeriod" >>> title="" type="single" >>> + header-row-style="header-row" >>> default-table-style="basic-table"> >>> + <auto-fields-entity entity-name="CustomTimePeriod" >>> default-field-type="hidden"/> >>> + <field name="customTimePeriodId"><text-find/></field> >>> + <field name="parentPeriodId"><text-find/></field> >>> + <field name="periodTypeId"> >>> + <drop-down allow-empty="true"> >>> + <entity-options entity-name="PeriodType" >>> description="${description}"> >>> + <entity-order-by field-name="description"/> >>> + </entity-options> >>> + </drop-down> >>> + </field> >>> + <field name="periodNum"><text-find/></field> >>> + <field name="periodName"><text-find/></field> >>> + <field name="fromDate"><date-time/></field> >>> + <field name="thruDate"><date-time/></field> >>> + <field name="isClosed"> >>> + <drop-down allow-empty="true"> >>> + <option key="Y" description="${uiLabelMap.CommonY}"/> >>> + <option key="N" description="${uiLabelMap.CommonN}"/> >>> + </drop-down> >>> + </field> >>> + <field name="noConditionFind"><hidden value="Y"/><!-- if this >>> isn't there then with all fields empty no query will be done >>> --></field> >>> + <field name="submitButton" title="${uiLabelMap.CommonFind}" >>> widget-style="smallSubmit"><submit button-type="button"/></field> >>> + </form> >>> + <form name="listLookupCustomTimePeriod" list-name="listIt" >>> title="" >>> type="list" paginate-target="LookupCustomTimePeriod" >>> + odd-row-style="alternate-row" default-table-style="basic-table >>> hover-bar"> >>> + <actions> >>> + <service service-name="performFind" result-map="result" >>> result-map-list="listIt"> >>> + <field-map field-name="inputFields" >>> from-field="parameters"/> >>> + <field-map field-name="entityName" >>> value="CustomTimePeriod"/> >>> + <field-map field-name="viewIndex" >>> from-field="viewIndex"/> >>> + <field-map field-name="viewSize" >>> from-field="viewSize"/> >>> + </service> >>> + </actions> >>> + <field name="customTimePeriodId" widget-style="buttontext"> >>> + <hyperlink also-hidden="false" target-type="plain" >>> description="${customTimePeriodId}" >>> target="javascript:set_value('${customTimePeriodId}')"/> >>> + </field> >>> + <field name="parentPeriodId"><display/></field> >>> + <field name="periodTypeId"><display-entity >>> entity-name="PeriodType"/></field> >>> + <field name="periodNum"><display/></field> >>> + <field name="periodName"><display/></field> >>> + <field name="fromDate"><display/></field> >>> + <field name="thruDate"><display/></field> >>> + <field name="isClosed"><display/></field> >>> + </form> >>> </forms> >>> >>> Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml >>> URL: >>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=1573884&r1=1573883&r2=1573884&view=diff >>> >>> >>> ============================================================================== >>> >>> --- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml >>> (original) >>> +++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Tue >>> Mar >>> 4 06:32:14 2014 >>> @@ -268,4 +268,29 @@ under the License. >>> </widgets> >>> </section> >>> </screen> >>> + >>> + <screen name="LookupCustomTimePeriod"> >>> + <section> >>> + <actions> >>> + <property-map resource="AccountingUiLabels" >>> map-name="uiLabelMap" global="true"/> >>> + <set field="title" >>> value="${uiLabelMap.PageTitleLookupCustomTimePeriod}"/> >>> + <set field="queryString" >>> from-field="result.queryString"/> >>> + <set field="viewIndex" >>> from-field="parameters.VIEW_INDEX" >>> type="Integer" default-value="0"/> >>> + <property-to-field resource="widget" >>> property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> >>> + <set field="viewSize" >>> from-field="parameters.VIEW_SIZE" >>> type="Integer" default-value="${viewSizeDefaultValue}"/> >>> + <set field="entityName" value="CustomTimePeriod"/> >>> + <set field="searchFields" value="[customTimePeriodId, >>> periodName]"/> >>> + </actions> >>> + <widgets> >>> + <decorator-screen name="LookupDecorator" >>> location="component://common/widget/CommonScreens.xml"> >>> + <decorator-section name="search-options"> >>> + <include-form name="lookupCustomTimePeriod" >>> location="component://accounting/widget/FieldLookupForms.xml"/> >>> + </decorator-section> >>> + <decorator-section name="search-results"> >>> + <include-form >>> name="listLookupCustomTimePeriod" >>> location="component://accounting/widget/FieldLookupForms.xml"/> >>> + </decorator-section> >>> + </decorator-screen> >>> + </widgets> >>> + </section> >>> + </screen> >>> </screens> >>> >>> >>> |
Free forum by Nabble | Edit this page |