svn commit: r792482 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: ashish
Date: Thu Jul 9 10:26:11 2009 New Revision: 792482 URL: http://svn.apache.org/viewvc?rev=792482&view=rev Log: Applied patch from jira issue OFBIZ-2706 - Create a screen under AP -> Invoice, which will search for a PURCHASE_INVOICE between dates. Following thing is covered in this patch: --Added Functionality to show form based on Action. Thanks Arpit, Rishi for your contribution. Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=792482&r1=792481&r2=792482&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Jul 9 10:26:11 2009 @@ -1095,6 +1095,9 @@ <value xml:lang="th">à¸à¸à¸²à¸à¸²à¸£</value> <value xml:lang="zh">é¶è¡</value> </property> + <property key="AccountingBankAccount"> + <value xml:lang="en">Bank Account</value> + </property> <property key="AccountingBankName"> <value xml:lang="ar">إس٠اÙ٠صرÙ</value> <value xml:lang="cs">Jméno banky</value> @@ -1602,6 +1605,9 @@ <value xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸³à¸à¸§à¸</value> <value xml:lang="zh">æ¯ç¥¨éé¢</value> </property> + <property key="AccountingCheckNumber"> + <value xml:lang="en">Check Number</value> + </property> <property key="AccountingCheckGiftCard"> <value xml:lang="de">Prüfen Sie, ob Sie einen Geschenkgutschein für heute haben</value> <value xml:lang="en">Check If You Have A Gift Card To Use Today</value> @@ -4531,6 +4537,9 @@ <value xml:lang="th">à¹à¸à¸à¸³à¸à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">å票</value> </property> + <property key="AccountingIssueCheck"> + <value xml:lang="en">Issue Check</value> + </property> <property key="AccountingItemNr"> <value xml:lang="en">ItemNr</value> <value xml:lang="es">NrElemento</value> @@ -7616,6 +7625,9 @@ <property key="AccountingVendorParty"> <value xml:lang="en">Vendor Party</value> </property> + <property key="AccountingVendorPaymentMethod"> + <value xml:lang="en">Vendor Payment Method</value> + </property> <property key="AccountingVerifyTransaction"> <value xml:lang="en">Verify Transaction</value> <value xml:lang="fr">Vérifier la transaction</value> Modified: ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=792482&r1=792481&r2=792482&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl Thu Jul 9 10:26:11 2009 @@ -55,6 +55,13 @@ $('showInvoiceRunningTotal').update(""); } } +function showIssueChecks(selection) { + if (selection.value == 'processMassCheckRun') { + Effect.BlindDown('issueChecks',{duration: 0.0}); + } else { + Effect.BlindUp('issueChecks',{duration: 0.0}); + } +} --> </script> @@ -63,7 +70,36 @@ <span class="label">${uiLabelMap.AccountingRunningTotal} :</span> <span class="label" id="showInvoiceRunningTotal"></span> </div> - <form name="listPurchaseInvoices" id="listPurchaseInvoices"> + <form name="listPurchaseInvoices" id="listPurchaseInvoices" method="post" action="javascript:void();"> + <div align="right"> + <!-- May add some more options in future like cancel selected invoices--> + <select name="serviceName" id="serviceName" onchange="javascript:showIssueChecks(this);"> + <option value=""/> + <option value="processMassCheckRun">${uiLabelMap.AccountingIssueCheck}</option> + </select> + <a href="#" id="runAction" class="buttontext">${uiLabelMap.OrderRunAction}</a><#--call the runAction--> + </div> + <input type="hidden" name="organizationPartyId" value="${organizationPartyId}"/> + <div id="issueChecks" style="display: none;" align="right"> + <span class="label">${uiLabelMap.AccountingVendorPaymentMethod}</span> + <select name="vendorPaymentMethod"> + <option value=""></option> + <#if paymentMethodType?has_content> + <option value="paymentMethodType.paymentMethodTypeId">${paymentMethodType.description}</option> + </#if> + </select> + <span class="label">${uiLabelMap.AccountingBankAccount}</span> + <select name="bankAccount"> + <option value=""></option> + <#if finAccounts?has_content> + <#list finAccounts as finAccount> + <option value="${finAccount.get("finAccountId")}">${finAccount.get("finAccountName")} [${finAccount.get("finAccountId")}]</option> + </#list> + </#if> + </select> + <span class="label">${uiLabelMap.AccountingCheckNumber}</span> + <input type="text" name="checkNumber"/> + </div> <table class="basic-table hover-bar" cellspacing="0"> <#-- Header Begins --> <tr class="header-row-2"> Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=792482&r1=792481&r2=792482&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Thu Jul 9 10:26:11 2009 @@ -23,6 +23,7 @@ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.AccountingApCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/> <set field="applicationMenuName" value="ApAppBar" global="true"/> Modified: ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml?rev=792482&r1=792481&r2=792482&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/InvoiceScreens.xml Thu Jul 9 10:26:11 2009 @@ -92,6 +92,14 @@ </condition-list> <order-by field-name="partyIdFrom"/> </entity-condition> + <entity-one entity-name="PaymentMethodType" value-field="paymentMethodType"> + <field-map field-name="paymentMethodTypeId" value="COMPANY_CHECK"></field-map> + </entity-one> + <entity-and entity-name="FinAccount" list="finAccounts"> + <field-map field-name="finAccountTypeId" value="BANK_ACCOUNT"/> + <field-map field-name="statusId" value="FNACT_ACTIVE"/> + </entity-and> + <set field="organizationPartyId" from-field="parameters.organizationPartyId"/> </actions> <widgets> <decorator-screen name="CommonApInvoiceDecorator" location="${parameters.CommonApInvoiceDecoratorLocation}"> Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=792482&r1=792481&r2=792482&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Thu Jul 9 10:26:11 2009 @@ -121,6 +121,9 @@ </form> <form name="FindPurchaseInvoices" type="single" target="FindPurchaseInvoices"> + <actions> + <set field="organizationPartyId" from-field="parameters.organizationPartyId" default-value="${defaultOrganizationPartyId}"/> + </actions> <field name="partyIdFrom" title="${uiLabelMap.AccountingVendorParty}" position="1"><lookup target-form-name="LookupPartyName"/></field> <field name="statusId" position="2"> <drop-down allow-empty="true"> @@ -129,6 +132,7 @@ </entity-options> </drop-down> </field> + <field name="organizationPartyId"><hidden/></field> <field name="invoiceTypeId"><hidden value="PURCHASE_INVOICE"/></field> <field name="fromInvoiceDate" position="1"><date-time/></field> <field name="thruInvoiceDate" position="2"><date-time/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |