Author: lektran
Date: Sat Jun 7 02:45:26 2008 New Revision: 664307 URL: http://svn.apache.org/viewvc?rev=664307&view=rev Log: Capitalized the accounting script's names also switched a couple of screens to use the screenlet widget Added: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/FilterOutReceipts.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlJournalEntry.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/editGlJournalEntry.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/createApplicationList.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/getInvoiceItemTypes.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/orderListInvoiceItem.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/order/billingAccountOrders.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedInvoices.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedPayments.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/printChecks.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/authorizeTransaction.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/captureTransaction.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy - copied unchanged from r664251, ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/viewGatewayResponse.groovy Removed: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/editGlJournalEntry.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/createApplicationList.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/getInvoiceItemTypes.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/listNotAppliedPayments.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/orderListInvoiceItem.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/order/billingAccountOrders.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedInvoices.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedPayments.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/printChecks.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/authorizeTransaction.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/captureTransaction.groovy ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/viewGatewayResponse.groovy Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml ofbiz/trunk/applications/accounting/widget/GlScreens.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml?rev=664307&r1=664306&r2=664307&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml Sat Jun 7 02:45:26 2008 @@ -32,7 +32,7 @@ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="Invoice"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy"/> </actions> <widgets> <decorator-screen name="FoReportDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=664307&r1=664306&r2=664307&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Sat Jun 7 02:45:26 2008 @@ -67,21 +67,10 @@ <entity-condition entity-name="BillingAccount" list-name="billingAccounts"/> </actions> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindBillingAccount}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link target="EditBillingAccount" text="${uiLabelMap.CommonNew}" style="buttontext"/></container> - <include-form name="ListBillingAccounts" location="component://accounting/widget/BillingAccountForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleFindBillingAccount}"> + <link target="EditBillingAccount" text="${uiLabelMap.CommonNew}" style="buttontext"/> + <include-form name="ListBillingAccounts" location="component://accounting/widget/BillingAccountForms.xml"/> + </screenlet> </widgets> </section> </widgets> @@ -93,21 +82,10 @@ </entity-condition> </actions> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindBillingAccount}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link target="EditBillingAccount?partyId=${parameters.partyId}&roleTypeId=BILL_TO_CUSTOMER" text="${uiLabelMap.CommonNew} " style="buttontext"/></container> - <include-form name="ListBillingAccountsByParty" location="component://accounting/widget/BillingAccountForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleFindBillingAccount}"> + <link target="EditBillingAccount?partyId=${parameters.partyId}&roleTypeId=BILL_TO_CUSTOMER" text="${uiLabelMap.CommonNew} " style="buttontext"/> + <include-form name="ListBillingAccountsByParty" location="component://accounting/widget/BillingAccountForms.xml"/> + </screenlet> </widgets> </section> </fail-widgets> @@ -132,20 +110,9 @@ <widgets> <decorator-screen name="CommonBillingAccountDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditBillingAccount}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditBillingAccount" location="component://accounting/widget/BillingAccountForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditBillingAccount}"> + <include-form name="EditBillingAccount" location="component://accounting/widget/BillingAccountForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -164,34 +131,12 @@ <widgets> <decorator-screen name="CommonBillingAccountDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditBillingAccountRoles}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListBillingAccountRoles" location="component://accounting/widget/BillingAccountForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddBillingAccountRoles}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddBillingAccountRole" location="component://accounting/widget/BillingAccountForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditBillingAccountRoles}"> + <include-form name="ListBillingAccountRoles" location="component://accounting/widget/BillingAccountForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleAddBillingAccountRoles}"> + <include-form name="AddBillingAccountRole" location="component://accounting/widget/BillingAccountForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -326,7 +271,7 @@ <set field="billingAccountId" from-field="parameters.billingAccountId"/> <entity-one entity-name="BillingAccount" value-name="billingAccount"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/order/billingAccountOrders.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/order/OrderListInvoiceItem.groovy"/> </actions> <widgets> <decorator-screen name="CommonBillingAccountDecorator"> Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=664307&r1=664306&r2=664307&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Sat Jun 7 02:45:26 2008 @@ -216,7 +216,7 @@ <set field="tabButtonItem" value="FindAcctgTrans"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/> <set field="acctgTransId" from-field="parameters.acctgTransId"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/editGlJournalEntry.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlJournalEntry.groovy"/> <entity-one entity-name="AcctgTrans" value-name="acctgTrans"/> <entity-one entity-name="AcctgTransEntry" value-name="acctgTransEntry"> @@ -388,7 +388,7 @@ </condition-list> <order-by field-name="effectiveDate"/> </entity-condition> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/FilterOutReceipts.groovy"/> </actions> <widgets> <decorator-screen name="CommonAdminChecksDecorator" location="${parameters.mainDecoratorLocation}"> @@ -437,7 +437,7 @@ </condition-list> <order-by field-name="effectiveDate"/> </entity-condition> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/filterOutReceipts.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/FilterOutReceipts.groovy"/> </actions> <widgets> <decorator-screen name="CommonAdminChecksDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=664307&r1=664306&r2=664307&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sat Jun 7 02:45:26 2008 @@ -381,7 +381,7 @@ <form name="ListSalInvoiceItemTypeGlAssignments" type="list" list-name="invoiceItemTypes" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy"/> </actions> <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="invoiceItemTypeId"><hidden/></field> @@ -427,7 +427,7 @@ odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="invItemTypePrefix" value="PINV"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy"/> </actions> <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field> <field name="invoiceItemTypeId"><hidden/></field> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=664307&r1=664306&r2=664307&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sat Jun 7 02:45:26 2008 @@ -232,8 +232,8 @@ <field-map env-name="parameters.invoiceId" field-name="invoiceId"/> <order-by field-name="timeEntryId"/> </entity-and> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/createApplicationList.groovy"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/orderListInvoiceItem.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy"/> <set field="invoiceAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotalBd(invoice)}"/> <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"/> <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceAppliedBd(invoice)}"/> @@ -529,8 +529,8 @@ <set field="tabButtonItem" value="editInvoiceApplications"/> <set field="invoiceId" from-field="parameters.invoiceId"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/createApplicationList.groovy"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/listNotAppliedPayments.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy"/> <set field="invoiceAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotalBd(invoice)}"/> <set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"/> <set field="appliedAmount" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceAppliedBd(invoice)}"/> @@ -646,7 +646,7 @@ <field-map field-name="invoiceId" env-name="parameters.invoiceId"/> <order-by field-name="invoiceItemSeqId"/> </entity-and> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/getInvoiceItemTypes.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy"/> </actions> <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=664307&r1=664306&r2=664307&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sat Jun 7 02:45:26 2008 @@ -169,8 +169,8 @@ <set field="notAppliedAmountStr" type="String" value="${bsh: import java.text.NumberFormat; return(NumberFormat.getCurrencyInstance(context.get("locale")).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotAppliedBd(payment)));}"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedInvoices.groovy"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedPayments.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy"/> <entity-one entity-name="PartyNameView" value-name="partyNameViewTo"> <field-map field-name="partyId" env-name="payment.partyIdTo"/> </entity-one> @@ -470,7 +470,7 @@ <set field="titleProperty" value="AccountingManualTransaction"/> <set field="headerItem" value="transaction"/> <set field="tabButtonItem" value="manualtransactiontab"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy"/> </actions> <widgets> <decorator-screen name="GenericTransactionDecorator" location="component://accounting/widget/TransactionScreens.xml"> @@ -523,7 +523,7 @@ <set field="paymentId" from-field="parameters.paymentId" /> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/printChecks.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy"/> </actions> <widgets> <platform-specific> Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=664307&r1=664306&r2=664307&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Sat Jun 7 02:45:26 2008 @@ -109,7 +109,7 @@ <entity-one entity-name="PaymentGatewayResponse" value-name="paymentGatewayResponse" auto-field-map="true"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/viewGatewayResponse.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy"/> </actions> <widgets> <decorator-screen name="GenericTransactionDecorator"> @@ -163,7 +163,7 @@ </entity-one> <set field="paymentMethodTypeId" from-field="opp.paymentMethodTypeId"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/authorizeTransaction.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy"/> </actions> <widgets> <decorator-screen name="GenericTransactionDecorator"> @@ -203,7 +203,7 @@ </entity-one> <set field="paymentMethodTypeId" from-field="opp.paymentMethodTypeId"/> - <script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/captureTransaction.groovy"/> + <script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy"/> </actions> <widgets> <decorator-screen name="GenericTransactionDecorator"> |
Free forum by Nabble | Edit this page |