Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
Locked
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
 
|
Hi Ashish,
A few tests are now failing due to this commit. http://ci.apache.org/waterfall?show=ofbiz-trunk I raised a jira issue with infra about the dev list not receiving failure notifications but unfortunately it hasn't seen any action as yet. HotWax Media http://www.hotwaxmedia.com On 5/12/2009, at 10:04 PM, [hidden email] wrote: > Author: ashish > Date: Sat Dec 5 09:04:53 2009 > New Revision: 887520 > > URL: http://svn.apache.org/viewvc?rev=887520&view=rev > Log: > Applied patch from jira issue OFBIZ-3310 - Cancel Pyament Group > issue - Can't cancel reconciled payment batch and issued payment > check. > > Steps to reproduce - > Issue : -1 > 1.Create few payments in AR . > 2.Create a batch payment for newly created payments from screen https://localhost:28443/ar/control/batchPayments > (where finAccountId=SC_CHECKING). > 3.Go to Financial Account screen and click on transaction tab https://localhost:28443/accounting/control/FindFinAccountTrans?finAccountId=SC_CHECKING > . > 4.Select GlReconciliationId as "Not Assigned" and click on serach > button. > 5.Select newly created FinAccountTrans from checkbox.Then select > GlReconciliationName from selectbox and click on button "Assign TO > reconciliation". > 6.This process will associate fin account transaction with > reconciliation. > 7.Now click on Reconciliation tab and select the > FinAccountTransaction. > 8.Reconcile the transaction by clicking on Reconcile button. > 9.Now the status of reconciliation will be "Reconciled". > 10.Status of transaction will be "Approved". > 11.Now go to Payment Group or Deposit slip tab, the created payment > group will appear with Cancel button in list form. > > * This is not correct. > * User can not cancel reconciled deposit slip. > Similiar changes will reflect on following screens : - > 1) https://localhost:8443/ar/control/FindArPaymentGroups > 2) https://localhost:8443/accounting/control/FindPaymentGroup > 3) https://localhost:28443/accounting/control/FindDepositSlips?finAccountId=SC_CHECKING&organizationPartyId=Company > > Issue : -2 > 1) Now go to PurchaseInvoices screen https://localhost:28443/ap/control/FindPurchaseInvoices > . > 2) Click on search button and select Invoices using checkbox. > 3) Select "Issue Check" from select box. > 4)Click on Run button. > 5)Performing this action fin account transaction will be created in > Apporved status . > 5) Now go to to https://localhost:28443/ap/control/ > FindApPaymentGroups screen the created payment group will appear > with Cancel button in list form. > > * This is not correct. > * User can not cancel issued check . > > Similiar changes will reflect on following screens : - > 1) https://localhost:28443/ap/control/FindApPaymentGroups > 2) https://localhost:8443/accounting/control/FindPaymentGroup > > Thanks Awdesh & Sumit for the contribution. > > Modified: > ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml > ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ > payment/PaymentServices.xml > ofbiz/trunk/applications/accounting/servicedef/services_payment.xml > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ > controller.xml > ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ > controller.xml > ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ > controller.xml > ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml > ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml > > Modified: ofbiz/trunk/applications/accounting/config/ > AccountingUiLabels.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=887520&r1=887519&r2=887520&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- ofbiz/trunk/applications/accounting/config/ > AccountingUiLabels.xml (original) > +++ ofbiz/trunk/applications/accounting/config/ > AccountingUiLabels.xml Sat Dec 5 09:04:53 2009 > @@ -1843,6 +1843,10 @@ > <value xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸ à¸à¸à¸³à¸à¸§à¸</ > value> > <value xml:lang="zh">æ¯ç¥¨éé¢</value> > </property> > + <property key="AccountingCheckIsAlreadyIssued"> > + <value xml:lang="en">Check Is Already Issued</value> > + <value xml:lang="hi_IN">à¤à¤¾à¤à¤ पहलॠसॠà > ¤¹à¥ निरà¥à¤à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤¤à¤¾ हà¥</value> > + </property> > <property key="AccountingCheckNumber"> > <value xml:lang="en">Check Number</value> > <value xml:lang="hi_IN">à¤à¥à¤/हà¥à¤à¤¡à¥ नमà¥à > ¤¬à¤°</value> > @@ -8896,6 +8900,10 @@ > <value xml:lang="en">Total Quantity On Hand</value> > <value xml:lang="hi_IN">à¤à¥à¤² मातà¥à¤°à¤¾ हाठ> ¥ पर</value> > </property> > + <property key="AccountingTransactionIsAlreadyReconciled"> > + <value xml:lang="en">Transaction Is already Reconciled</ > value> > + <value xml:lang="hi_IN">à¤à¤¤à¤¿à¤µà¤¿à¤§à¤¿ पहलॠà > ¤¸à¥ हॠसमà¤à¥à¤¤à¤¾ हà¥</value> > + </property> > <property key="AccountingTransactionHasBeenAlreadyPosted"> > <value xml:lang="en">Transaction has been already posted</ > value> > <value xml:lang="fr">Transaction déjà effectuée</value> > > Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/ > accounting/payment/PaymentServices.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=887520&r1=887519&r2=887520&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ > payment/PaymentServices.xml (original) > +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ > payment/PaymentServices.xml Sat Dec 5 09:04:53 2009 > @@ -473,38 +473,30 @@ > </simple-method> > > <simple-method method-name="cancelPaymentBatch" short- > description="cancel payment batch"> > - <set field="paymentGroupId" from- > field="parameters.paymentGroupId"/> > - <entity-and entity-name="PaymentGroupMember" > list="paymentGroupMembers"> > - <field-map field-name="paymentGroupId"/> > + <entity-and entity-name="PmtGrpMembrPaymentAndFinAcctTrans" > list="paymentGroupMemberAndTransList"> > + <field-map field-name="paymentGroupId" from- > field="parameters.paymentGroupId"/> > </entity-and> > - <set field="isGlReconciliationId" value="$ > {parameters.glReconciliationId == 'null'}" type="Boolean"/> > - <if-compare field="isGlReconciliationId" operator="equals" > value="true" type="Boolean"> > - <set-service-fields service- > name="getPaymentGroupReconciliationId" map="parameters" to- > map="getPaymentGroupReconciliationIdMap"/> > - <set > field="getPaymentGroupReconciliationIdMap.paymentGroupId" from- > field="paymentGroupId"/> > - <call-service service- > name="getPaymentGroupReconciliationId" in-map- > name="getPaymentGroupReconciliationIdMap"> > - <result-to-field result-name="glReconciliationId"/> > - </call-service> > - <else> > - <set field="glReconciliationId" from- > field="parameters.glReconciliationId"/> > - </else> > - </if-compare> > - <if-empty field="glReconciliationId"> > - <iterate list="paymentGroupMembers" > entry="paymentGroupMember"> > - <set-service-fields service- > name="expirePaymentGroupMember" map="paymentGroupMember" to- > map="expirePaymentGroupMemberMap"/> > + <if-not-empty field="paymentGroupMemberAndTransList"> > + <first-from-list list="paymentGroupMemberAndTransList" > entry="paymentGroupMemberAndTrans"/> > + <if-compare > field="paymentGroupMemberAndTrans.finAccountTransStatusId" > operator="equals" value="FINACT_TRNS_APPROVED"> > + <add-error> > + <fail-property resource="AccountingUiLabels" > property="AccountingTransactionIsAlreadyReconciled"/> > + </add-error> > + <check-errors/> > + </if-compare> > + <iterate list="paymentGroupMemberAndTransList" > entry="paymentGroupMemberAndTrans"> > + <set-service-fields service- > name="expirePaymentGroupMember" map="paymentGroupMemberAndTrans" to- > map="expirePaymentGroupMemberMap"/> > <call-service service- > name="expirePaymentGroupMember" in-map- > name="expirePaymentGroupMemberMap"/> > - <get-related-one relation-name="Payment" value- > field="paymentGroupMember" to-value-field="payment"/> > - <get-related-one relation-name="FinAccountTrans" > value-field="payment" to-value-field="finAccountTrans"/> > + <entity-one entity-name="FinAccountTrans" value- > field="finAccountTrans"> > + <field-map field-name="finAccountTransId" from- > field="paymentGroupMemberAndTrans.finAccountTransId"/> > + </entity-one> > <if-not-empty field="finAccountTrans"> > <set-service-fields service- > name="setFinAccountTransStatus" map="finAccountTrans" to- > map="setFinAccountTransStatusMap"/> > <set > field="setFinAccountTransStatusMap.statusId" > value="FINACT_TRNS_CANCELED"/> > <call-service service- > name="setFinAccountTransStatus" in-map- > name="setFinAccountTransStatusMap"/> > </if-not-empty> > </iterate> > - <else> > - <add-error><fail-property resource="AccountingUiLabels" > property="AccountingCancelBatchPaymentsError"/></add-error> > - <check-errors/> > - </else> > - </if-empty> > + </if-not-empty> > </simple-method> > > <simple-method method- > name="createPaymentAndPaymentGroupForInvoices" short- > description="Creates Payments, PaymentApplications and PaymentGroup > for the same"> > @@ -641,16 +633,29 @@ > </simple-method> > > <simple-method method-name="cancelCheckRunPayments" short- > description="Cancel all payments for payment group"> > - <entity-condition entity-name="PaymentGroupMember" > list="paymentGroupMembers"> > - <condition-expr field-name="paymentGroupId" from- > field="parameters.paymentGroupId"/> > - </entity-condition> > - <iterate list="paymentGroupMembers" > entry="paymentGroupMember"> > - <get-related-one relation-name="Payment" value- > field="paymentGroupMember" to-value-field="payment"/> > + <entity-and entity- > name="PmtGrpMembrPaymentAndFinAcctTrans" > list="paymentGroupMemberAndTransList"> > + <field-map field-name="paymentGroupId" from- > field="parameters.paymentGroupId"/> > + </entity-and> > + <first-from-list list="paymentGroupMemberAndTransList" > entry="paymentGroupMemberAndTrans"/> > + <if-compare > field="paymentGroupMemberAndTrans.finAccountTransStatusId" > operator="not-equals" value="FINACT_TRNS_APPROVED"> > + <iterate list="paymentGroupMemberAndTransList" > entry="paymentGroupMemberAndTrans"> > + <entity-one entity-name="Payment" value-field="payment"> > + <field-map field-name="paymentId" from- > field="paymentGroupMemberAndTrans.paymentId"/> > + </entity-one> > <set-service-fields service-name="voidPayment" > map="payment" to-map="voidPaymentMap"/> > <call-service service-name="voidPayment" in-map- > name="voidPaymentMap"/> > - <set-service-fields service- > name="expirePaymentGroupMember" map="paymentGroupMember" to- > map="expirePaymentGroupMemberMap"/> > + <set-service-fields service- > name="expirePaymentGroupMember" map="paymentGroupMemberAndTrans" to- > map="expirePaymentGroupMemberMap"/> > <call-service service-name="expirePaymentGroupMember" in- > map-name="expirePaymentGroupMemberMap"/> > + <clear-field field="voidPaymentMap"/> > + <clear-field field="expirePaymentGroupMemberMap"/> > </iterate> > + <else> > + <add-error> > + <fail-property resource="AccountingUiLabels" > property="AccountingCheckIsAlreadyIssued"/> > + </add-error> > + <check-errors/> > + </else> > + </if-compare> > </simple-method> > > <simple-method method-name="getPayments" short-description="Get > list of payment"> > > Modified: ofbiz/trunk/applications/accounting/servicedef/ > services_payment.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_payment.xml?rev=887520&r1=887519&r2=887520&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- ofbiz/trunk/applications/accounting/servicedef/ > services_payment.xml (original) > +++ ofbiz/trunk/applications/accounting/servicedef/ > services_payment.xml Sat Dec 5 09:04:53 2009 > @@ -161,7 +161,6 @@ > location="component://accounting/script/org/ofbiz/ > accounting/payment/PaymentServices.xml" invoke="cancelPaymentBatch" > auth="true"> > <description>cancel payment batch</description> > <attribute name="paymentGroupId" type="String" mode="IN" > optional="false"/> > - <attribute name="glReconciliationId" type="String" > mode="IN" optional="true"/> > </service> > <service name="createPaymentAndPaymentGroupForInvoices" > engine="simple" > location="component://accounting/script/org/ofbiz/ > accounting/payment/PaymentServices.xml" > invoke="createPaymentAndPaymentGroupForInvoices" auth="true"> > > 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=887520&r1=887519&r2=887520&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ > controller.xml (original) > +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ > controller.xml Sat Dec 5 09:04:53 2009 > @@ -440,14 +440,14 @@ > <security https="true" auth="true"/> > <event type="service" invoke="cancelPaymentBatch"/> > <response name="success" type="view" > value="PaymentGroupOverview"/> > - <response name="error" type="view" > value="PaymentGroupOverview"/> > + <response name="error" type="view" value="FindPaymentGroup"/> > </request-map> > > <request-map uri="cancelCheckRunPayments"> > <security https="true" auth="true"/> > <event type="service" invoke="cancelCheckRunPayments"/> > <response name="success" type="view" > value="PaymentGroupOverview"/> > - <response name="error" type="view" > value="PaymentGroupOverview"/> > + <response name="error" type="view" value="FindPaymentGroup"/> > </request-map> > > <request-map uri="DepositSlip.pdf"> > > Modified: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ > controller.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml?rev=887520&r1=887519&r2=887520&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ > controller.xml (original) > +++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ > controller.xml Sat Dec 5 09:04:53 2009 > @@ -99,6 +99,12 @@ > <event type="service" invoke="massChangeInvoiceStatus"/> > <response name="success" type="view" > value="FindPurchaseInvoices"/> > </request-map> > + <request-map uri="cancelCheckRunPayments"> > + <security https="true" auth="true"/> > + <event type="service" invoke="cancelCheckRunPayments"/> > + <response name="success" type="view" > value="PaymentGroupOverview"/> > + <response name="error" type="view" > value="FindApPaymentGroups"/> > + </request-map> > > <!-- ================ Vendor requests ================ --> > <request-map uri="findVendors"> > > Modified: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ > controller.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml?rev=887520&r1=887519&r2=887520&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ > controller.xml (original) > +++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ > controller.xml Sat Dec 5 09:04:53 2009 > @@ -95,6 +95,12 @@ > <response name="success" type="view" value="FindArInvoices"/> > <response name="error" type="view" value="FindArInvoices"/> > </request-map> > + <request-map uri="cancelPaymentGroup"> > + <security https="true" auth="true"/> > + <event type="service" invoke="cancelPaymentBatch"/> > + <response name="success" type="view" > value="PaymentGroupOverview"/> > + <response name="error" type="view" > value="FindArPaymentGroups"/> > + </request-map> > <!-- end of request mappings --> > > <!-- View Mappings --> > > Modified: ofbiz/trunk/applications/accounting/widget/ > FinAccountForms.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=887520&r1=887519&r2=887520&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml > (original) > +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml > Sat Dec 5 09:04:53 2009 > @@ -263,7 +263,7 @@ > <parameter param-name="finAccountId"/> > </hyperlink> > </field> > - <field name="deleteLink" title="$ > {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="$ > {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ > {groovy:org > .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> > + <field name="deleteLink" title="$ > {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="$ > {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ > {paymentGroupMemberAndTransList[0].finAccountTransStatusId != > 'FINACT_TRNS_APPROVED'} @and $ > {groovy:org > .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> > <hyperlink target="deleteDepositSlip" description="$ > {uiLabelMap.CommonCancel}" also-hidden="false"> > <parameter param-name="paymentGroupId"/> > <parameter param-name="finAccountId"/> > > Modified: ofbiz/trunk/applications/accounting/widget/ > PaymentGroupForms.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=887520&r1=887519&r2=887520&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml > (original) > +++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml > Sat Dec 5 09:04:53 2009 > @@ -35,6 +35,9 @@ > <entity-and entity-name="PaymentGroupMember" > list="paymentGroupMembers" filter-by-date="true"> > <field-map field-name="paymentGroupId"/> > </entity-and> > + <entity-and entity- > name="PmtGrpMembrPaymentAndFinAcctTrans" > list="paymentGroupMemberAndTransList" filter-by-date="true"> > + <field-map field-name="paymentGroupId"/> > + </entity-and> > </row-actions> > <field name="paymentGroupId" widget-style="buttontext"> > <hyperlink description="${paymentGroupId}" > target="PaymentGroupOverview"> > @@ -43,18 +46,23 @@ > </field> > <field name="paymentGroupTypeId" title="$ > {uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity entity- > name="PaymentGroupType"/></field> > <field name="paymentGroupName"><display description="$ > {paymentGroupName}"/></field> > - <field name="deleteLink" title="$ > {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="$ > {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ > {groovy:org > .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> > - <hyperlink target="cancelPaymentGroup" description="$ > {uiLabelMap.CommonCancel}" also-hidden="false"> > + <field name="depositSlip" title="$ > {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="$ > {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ > {groovy:org > .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> > + <hyperlink target="DepositSlip.pdf" description="$ > {uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> > <parameter param-name="paymentGroupId"/> > </hyperlink> > </field> > - <field name="deleteLink" title="$ > {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="$ > {paymentGroupTypeId == 'CHECK_RUN'} @and $ > {groovy:org > .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> > - <hyperlink target="cancelCheckRunPayments" > description="${uiLabelMap.CommonCancel}" also-hidden="false"> > + <field name="printCheck" title="$ > {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="$ > {paymentGroupTypeId == 'CHECK_RUN'} @and $ > {groovy:org > .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> > + <hyperlink target="printChecks.pdf" description="$ > {uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> > <parameter param-name="paymentGroupId"/> > </hyperlink> > </field> > - <field name="depositSlip" title="$ > {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="$ > {groovy:org > .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> > - <hyperlink target="DepositSlip.pdf" description="$ > {uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> > + <field name="deleteLink" title="$ > {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="$ > {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ > {paymentGroupMemberAndTransList[0].finAccountTransStatusId != > 'FINACT_TRNS_APPROVED'} @and $ > {groovy:org > .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> > + <hyperlink target="cancelPaymentGroup" description="$ > {uiLabelMap.CommonCancel}" also-hidden="false"> > + <parameter param-name="paymentGroupId"/> > + </hyperlink> > + </field> > + <field name="deleteLink" title="$ > {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="$ > {paymentGroupTypeId == 'CHECK_RUN'} @and $ > {paymentGroupMemberAndTransList[0].finAccountTransStatusId != > 'FINACT_TRNS_APPROVED'} @and $ > {groovy:org > .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> > + <hyperlink target="cancelCheckRunPayments" > description="${uiLabelMap.CommonCancel}" also-hidden="false"> > <parameter param-name="paymentGroupId"/> > </hyperlink> > </field> > > |
smime.p7s (4K)
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
Administrator
|
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
|
Not sure if I posted it already but here it is: https://issues.apache.org/jira/browse/INFRA-2353
In regards to your p.s., I'm sorry but I have no idea what you are trying to say :-) Regards Scott On 6/12/2009, at 9:49 AM, Jacques Le Roux wrote: > Hi Scott, > > If not already done, please could you share the infra issue number > to allow everybody to follow. > And even if done, please forgive to people who forgot (or not read > it) and give us a new chance ;o) > > Thanks > > Jacques > PS: at large I think we should be more to follow these issues (and I > believe you are more than aware and agree with that; can't express > it better in English, sorry) > > From: "Scott Gray" <[hidden email]> > Hi Ashish, > > A few tests are now failing due to this commit. > http://ci.apache.org/waterfall?show=ofbiz-trunk > > I raised a jira issue with infra about the dev list not receiving > failure notifications but unfortunately it hasn't seen any action as > yet. > > HotWax Media > http://www.hotwaxmedia.com > > > On 5/12/2009, at 10:04 PM, [hidden email] wrote: > >> Author: ashish >> Date: Sat Dec 5 09:04:53 2009 >> New Revision: 887520 >> >> URL: http://svn.apache.org/viewvc?rev=887520&view=rev >> Log: >> Applied patch from jira issue OFBIZ-3310 - Cancel Pyament Group >> issue - Can't cancel reconciled payment batch and issued payment >> check. >> >> Steps to reproduce - >> Issue : -1 >> 1.Create few payments in AR . >> 2.Create a batch payment for newly created payments from screen https://localhost:28443/ar/control/batchPayments >> (where finAccountId=SC_CHECKING). >> 3.Go to Financial Account screen and click on transaction tab https://localhost:28443/accounting/control/FindFinAccountTrans?finAccountId=SC_CHECKING >> . >> 4.Select GlReconciliationId as "Not Assigned" and click on serach >> button. >> 5.Select newly created FinAccountTrans from checkbox.Then select >> GlReconciliationName from selectbox and click on button "Assign TO >> reconciliation". >> 6.This process will associate fin account transaction with >> reconciliation. >> 7.Now click on Reconciliation tab and select the >> FinAccountTransaction. >> 8.Reconcile the transaction by clicking on Reconcile button. >> 9.Now the status of reconciliation will be "Reconciled". >> 10.Status of transaction will be "Approved". >> 11.Now go to Payment Group or Deposit slip tab, the created >> payment group will appear with Cancel button in list form. >> >> * This is not correct. >> * User can not cancel reconciled deposit slip. >> Similiar changes will reflect on following screens : - >> 1) https://localhost:8443/ar/control/FindArPaymentGroups >> 2) https://localhost:8443/accounting/control/FindPaymentGroup >> 3) https://localhost:28443/accounting/control/FindDepositSlips?finAccountId=SC_CHECKING&organizationPartyId=Company >> >> Issue : -2 >> 1) Now go to PurchaseInvoices screen https://localhost:28443/ap/control/FindPurchaseInvoices >> . >> 2) Click on search button and select Invoices using checkbox. >> 3) Select "Issue Check" from select box. >> 4)Click on Run button. >> 5)Performing this action fin account transaction will be created >> in Apporved status . >> 5) Now go to to https://localhost:28443/ap/control/ >> FindApPaymentGroups screen the created payment group will appear >> with Cancel button in list form. >> >> * This is not correct. >> * User can not cancel issued check . >> >> Similiar changes will reflect on following screens : - >> 1) https://localhost:28443/ap/control/FindApPaymentGroups >> 2) https://localhost:8443/accounting/control/FindPaymentGroup >> >> Thanks Awdesh & Sumit for the contribution. >> >> Modified: >> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >> ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ >> payment/PaymentServices.xml >> ofbiz/trunk/applications/accounting/servicedef/services_payment.xml >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ >> controller.xml >> ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >> controller.xml >> ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >> controller.xml >> ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml >> ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml >> >> Modified: ofbiz/trunk/applications/accounting/config/ >> AccountingUiLabels.xml >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=887520&r1=887519&r2=887520&view=diff >> = = = = = = = = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/accounting/config/ >> AccountingUiLabels.xml (original) >> +++ ofbiz/trunk/applications/accounting/config/ >> AccountingUiLabels.xml Sat Dec 5 09:04:53 2009 >> @@ -1843,6 +1843,10 @@ >> <value xml:lang="th">à¸.รวà¸^สภ>> à¸sà¸^ณà¸Tวà¸T</ value> >> <value xml:lang="zh">æ"¯ç¥¨é?'é¢ˇ</value> >> </property> >> + <property key="AccountingCheckIsAlreadyIssued"> >> + <value xml:lang="en">Check Is Already Issued</value> >> + <value xml:lang="hi_IN">à¤oà¤≤à¤,à¤s पà >> ¤’औà¥? सà¥? à ¤’à¥? निरà >> ¥Ÿà¤-त à¤.ियà¤≤ à¤oà¤≤तà¤≤ à >> ¤’à¥^</value> >> + </property> >> <property key="AccountingCheckNumber"> >> <value xml:lang="en">Check Number</value> >> <value xml:lang="hi_IN">à¤sà¥?à¤./ऒख़à¤,à >> ¤¡à¥? à¤¨à¤®à¥Ÿà ¤¬à¤°</value> >> @@ -8896,6 +8900,10 @@ >> <value xml:lang="en">Total Quantity On Hand</value> >> <value xml:lang="hi_IN">à¤.ख़औ मà¤≤ठ>> ¤à¥Ÿà¤°à¤≤ ऒà¤≤ठ¥ पर</value> >> </property> >> + <property key="AccountingTransactionIsAlreadyReconciled"> >> + <value xml:lang="en">Transaction Is already Reconciled</ >> value> >> + <value xml:lang="hi_IN">à¤-तिविà >> ¤§à¤¿ पऒऔà¥? à ¤¸à¥? ऒà¥? à >> ¤¸à¤®à¤ˇà¥Oतà¤≤ ऒà¥^</value> >> + </property> >> <property key="AccountingTransactionHasBeenAlreadyPosted"> >> <value xml:lang="en">Transaction has been already posted</ >> value> >> <value xml:lang="fr">Transaction déjà effectuée</ >> value> >> >> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/ >> accounting/payment/PaymentServices.xml >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=887520&r1=887519&r2=887520&view=diff >> = = = = = = = = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/accounting/script/org/ofbiz/ >> accounting/ payment/PaymentServices.xml (original) >> +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/ >> accounting/ payment/PaymentServices.xml Sat Dec 5 09:04:53 2009 >> @@ -473,38 +473,30 @@ >> </simple-method> >> >> <simple-method method-name="cancelPaymentBatch" short- >> description="cancel payment batch"> >> - <set field="paymentGroupId" from- >> field="parameters.paymentGroupId"/> >> - <entity-and entity-name="PaymentGroupMember" >> list="paymentGroupMembers"> >> - <field-map field-name="paymentGroupId"/> >> + <entity-and entity- >> name="PmtGrpMembrPaymentAndFinAcctTrans" >> list="paymentGroupMemberAndTransList"> >> + <field-map field-name="paymentGroupId" from- >> field="parameters.paymentGroupId"/> >> </entity-and> >> - <set field="isGlReconciliationId" value="$ >> {parameters.glReconciliationId == 'null'}" type="Boolean"/> >> - <if-compare field="isGlReconciliationId" >> operator="equals" value="true" type="Boolean"> >> - <set-service-fields service- >> name="getPaymentGroupReconciliationId" map="parameters" to- >> map="getPaymentGroupReconciliationIdMap"/> >> - <set >> field="getPaymentGroupReconciliationIdMap.paymentGroupId" from- >> field="paymentGroupId"/> >> - <call-service service- >> name="getPaymentGroupReconciliationId" in-map- >> name="getPaymentGroupReconciliationIdMap"> >> - <result-to-field result-name="glReconciliationId"/> >> - </call-service> >> - <else> >> - <set field="glReconciliationId" from- >> field="parameters.glReconciliationId"/> >> - </else> >> - </if-compare> >> - <if-empty field="glReconciliationId"> >> - <iterate list="paymentGroupMembers" >> entry="paymentGroupMember"> >> - <set-service-fields service- >> name="expirePaymentGroupMember" map="paymentGroupMember" to- >> map="expirePaymentGroupMemberMap"/> >> + <if-not-empty field="paymentGroupMemberAndTransList"> >> + <first-from-list >> list="paymentGroupMemberAndTransList" >> entry="paymentGroupMemberAndTrans"/> >> + <if-compare >> field="paymentGroupMemberAndTrans.finAccountTransStatusId" >> operator="equals" value="FINACT_TRNS_APPROVED"> >> + <add-error> >> + <fail-property resource="AccountingUiLabels" >> property="AccountingTransactionIsAlreadyReconciled"/> >> + </add-error> >> + <check-errors/> >> + </if-compare> >> + <iterate list="paymentGroupMemberAndTransList" >> entry="paymentGroupMemberAndTrans"> >> + <set-service-fields service- >> name="expirePaymentGroupMember" map="paymentGroupMemberAndTrans" >> to- map="expirePaymentGroupMemberMap"/> >> <call-service service- >> name="expirePaymentGroupMember" in-map- >> name="expirePaymentGroupMemberMap"/> >> - <get-related-one relation-name="Payment" value- >> field="paymentGroupMember" to-value-field="payment"/> >> - <get-related-one relation-name="FinAccountTrans" >> value-field="payment" to-value-field="finAccountTrans"/> >> + <entity-one entity-name="FinAccountTrans" value- >> field="finAccountTrans"> >> + <field-map field-name="finAccountTransId" >> from- field="paymentGroupMemberAndTrans.finAccountTransId"/> >> + </entity-one> >> <if-not-empty field="finAccountTrans"> >> <set-service-fields service- >> name="setFinAccountTransStatus" map="finAccountTrans" to- >> map="setFinAccountTransStatusMap"/> >> <set >> field="setFinAccountTransStatusMap.statusId" >> value="FINACT_TRNS_CANCELED"/> >> <call-service service- >> name="setFinAccountTransStatus" in-map- >> name="setFinAccountTransStatusMap"/> >> </if-not-empty> >> </iterate> >> - <else> >> - <add-error><fail-property >> resource="AccountingUiLabels" >> property="AccountingCancelBatchPaymentsError"/></add-error> >> - <check-errors/> >> - </else> >> - </if-empty> >> + </if-not-empty> >> </simple-method> >> >> <simple-method method- >> name="createPaymentAndPaymentGroupForInvoices" short- >> description="Creates Payments, PaymentApplications and >> PaymentGroup for the same"> >> @@ -641,16 +633,29 @@ >> </simple-method> >> >> <simple-method method-name="cancelCheckRunPayments" short- >> description="Cancel all payments for payment group"> >> - <entity-condition entity-name="PaymentGroupMember" >> list="paymentGroupMembers"> >> - <condition-expr field-name="paymentGroupId" from- >> field="parameters.paymentGroupId"/> >> - </entity-condition> >> - <iterate list="paymentGroupMembers" >> entry="paymentGroupMember"> >> - <get-related-one relation-name="Payment" value- >> field="paymentGroupMember" to-value-field="payment"/> >> + <entity-and entity- >> name="PmtGrpMembrPaymentAndFinAcctTrans" >> list="paymentGroupMemberAndTransList"> >> + <field-map field-name="paymentGroupId" from- >> field="parameters.paymentGroupId"/> >> + </entity-and> >> + <first-from-list list="paymentGroupMemberAndTransList" >> entry="paymentGroupMemberAndTrans"/> >> + <if-compare >> field="paymentGroupMemberAndTrans.finAccountTransStatusId" >> operator="not-equals" value="FINACT_TRNS_APPROVED"> >> + <iterate list="paymentGroupMemberAndTransList" >> entry="paymentGroupMemberAndTrans"> >> + <entity-one entity-name="Payment" value-field="payment"> >> + <field-map field-name="paymentId" from- >> field="paymentGroupMemberAndTrans.paymentId"/> >> + </entity-one> >> <set-service-fields service-name="voidPayment" >> map="payment" to-map="voidPaymentMap"/> >> <call-service service-name="voidPayment" in-map- >> name="voidPaymentMap"/> >> - <set-service-fields service- >> name="expirePaymentGroupMember" map="paymentGroupMember" to- >> map="expirePaymentGroupMemberMap"/> >> + <set-service-fields service- >> name="expirePaymentGroupMember" map="paymentGroupMemberAndTrans" >> to- map="expirePaymentGroupMemberMap"/> >> <call-service service-name="expirePaymentGroupMember" >> in- map-name="expirePaymentGroupMemberMap"/> >> + <clear-field field="voidPaymentMap"/> >> + <clear-field field="expirePaymentGroupMemberMap"/> >> </iterate> >> + <else> >> + <add-error> >> + <fail-property resource="AccountingUiLabels" >> property="AccountingCheckIsAlreadyIssued"/> >> + </add-error> >> + <check-errors/> >> + </else> >> + </if-compare> >> </simple-method> >> >> <simple-method method-name="getPayments" short-description="Get >> list of payment"> >> >> Modified: ofbiz/trunk/applications/accounting/servicedef/ >> services_payment.xml >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_payment.xml?rev=887520&r1=887519&r2=887520&view=diff >> = = = = = = = = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/accounting/servicedef/ >> services_payment.xml (original) >> +++ ofbiz/trunk/applications/accounting/servicedef/ >> services_payment.xml Sat Dec 5 09:04:53 2009 >> @@ -161,7 +161,6 @@ >> location="component://accounting/script/org/ofbiz/ >> accounting/payment/PaymentServices.xml" invoke="cancelPaymentBatch" >> auth="true"> >> <description>cancel payment batch</description> >> <attribute name="paymentGroupId" type="String" mode="IN" >> optional="false"/> >> - <attribute name="glReconciliationId" type="String" >> mode="IN" optional="true"/> >> </service> >> <service name="createPaymentAndPaymentGroupForInvoices" >> engine="simple" >> location="component://accounting/script/org/ofbiz/ >> accounting/payment/PaymentServices.xml" >> invoke="createPaymentAndPaymentGroupForInvoices" auth="true"> >> >> 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=887520&r1=887519&r2=887520&view=diff >> = = = = = = = = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ >> controller.xml (original) >> +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ >> controller.xml Sat Dec 5 09:04:53 2009 >> @@ -440,14 +440,14 @@ >> <security https="true" auth="true"/> >> <event type="service" invoke="cancelPaymentBatch"/> >> <response name="success" type="view" >> value="PaymentGroupOverview"/> >> - <response name="error" type="view" >> value="PaymentGroupOverview"/> >> + <response name="error" type="view" >> value="FindPaymentGroup"/> >> </request-map> >> >> <request-map uri="cancelCheckRunPayments"> >> <security https="true" auth="true"/> >> <event type="service" invoke="cancelCheckRunPayments"/> >> <response name="success" type="view" >> value="PaymentGroupOverview"/> >> - <response name="error" type="view" >> value="PaymentGroupOverview"/> >> + <response name="error" type="view" >> value="FindPaymentGroup"/> >> </request-map> >> >> <request-map uri="DepositSlip.pdf"> >> >> Modified: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >> controller.xml >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml?rev=887520&r1=887519&r2=887520&view=diff >> = = = = = = = = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >> controller.xml (original) >> +++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >> controller.xml Sat Dec 5 09:04:53 2009 >> @@ -99,6 +99,12 @@ >> <event type="service" invoke="massChangeInvoiceStatus"/> >> <response name="success" type="view" >> value="FindPurchaseInvoices"/> >> </request-map> >> + <request-map uri="cancelCheckRunPayments"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="cancelCheckRunPayments"/> >> + <response name="success" type="view" >> value="PaymentGroupOverview"/> >> + <response name="error" type="view" >> value="FindApPaymentGroups"/> >> + </request-map> >> >> <!-- ================ Vendor requests ================ --> >> <request-map uri="findVendors"> >> >> Modified: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >> controller.xml >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml?rev=887520&r1=887519&r2=887520&view=diff >> = = = = = = = = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >> controller.xml (original) >> +++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >> controller.xml Sat Dec 5 09:04:53 2009 >> @@ -95,6 +95,12 @@ >> <response name="success" type="view" value="FindArInvoices"/> >> <response name="error" type="view" value="FindArInvoices"/> >> </request-map> >> + <request-map uri="cancelPaymentGroup"> >> + <security https="true" auth="true"/> >> + <event type="service" invoke="cancelPaymentBatch"/> >> + <response name="success" type="view" >> value="PaymentGroupOverview"/> >> + <response name="error" type="view" >> value="FindArPaymentGroups"/> >> + </request-map> >> <!-- end of request mappings --> >> >> <!-- View Mappings --> >> >> Modified: ofbiz/trunk/applications/accounting/widget/ >> FinAccountForms.xml >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=887520&r1=887519&r2=887520&view=diff >> = = = = = = = = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml >> (original) >> +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml >> Sat Dec 5 09:04:53 2009 >> @@ -263,7 +263,7 @@ >> <parameter param-name="finAccountId"/> >> </hyperlink> >> </field> >> - <field name="deleteLink" title="$ >> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >> {groovy:org >> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >> + <field name="deleteLink" title="$ >> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >> {paymentGroupMemberAndTransList[0].finAccountTransStatusId != >> 'FINACT_TRNS_APPROVED'} @and $ >> {groovy:org >> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >> <hyperlink target="deleteDepositSlip" description="$ >> {uiLabelMap.CommonCancel}" also-hidden="false"> >> <parameter param-name="paymentGroupId"/> >> <parameter param-name="finAccountId"/> >> >> Modified: ofbiz/trunk/applications/accounting/widget/ >> PaymentGroupForms.xml >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=887520&r1=887519&r2=887520&view=diff >> = = = = = = = = >> = >> ===================================================================== >> --- ofbiz/trunk/applications/accounting/widget/ >> PaymentGroupForms.xml (original) >> +++ ofbiz/trunk/applications/accounting/widget/ >> PaymentGroupForms.xml Sat Dec 5 09:04:53 2009 >> @@ -35,6 +35,9 @@ >> <entity-and entity-name="PaymentGroupMember" >> list="paymentGroupMembers" filter-by-date="true"> >> <field-map field-name="paymentGroupId"/> >> </entity-and> >> + <entity-and entity- >> name="PmtGrpMembrPaymentAndFinAcctTrans" >> list="paymentGroupMemberAndTransList" filter-by-date="true"> >> + <field-map field-name="paymentGroupId"/> >> + </entity-and> >> </row-actions> >> <field name="paymentGroupId" widget-style="buttontext"> >> <hyperlink description="${paymentGroupId}" >> target="PaymentGroupOverview"> >> @@ -43,18 +46,23 @@ >> </field> >> <field name="paymentGroupTypeId" title="$ >> {uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity >> entity- name="PaymentGroupType"/></field> >> <field name="paymentGroupName"><display description="$ >> {paymentGroupName}"/></field> >> - <field name="deleteLink" title="$ >> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >> {groovy:org >> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >> - <hyperlink target="cancelPaymentGroup" description="$ >> {uiLabelMap.CommonCancel}" also-hidden="false"> >> + <field name="depositSlip" title="$ >> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >> {groovy:org >> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >> + <hyperlink target="DepositSlip.pdf" description="$ >> {uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> >> <parameter param-name="paymentGroupId"/> >> </hyperlink> >> </field> >> - <field name="deleteLink" title="$ >> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >> when="$ {paymentGroupTypeId == 'CHECK_RUN'} @and $ >> {groovy:org >> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >> - <hyperlink target="cancelCheckRunPayments" >> description="${uiLabelMap.CommonCancel}" also-hidden="false"> >> + <field name="printCheck" title="$ >> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >> when="$ {paymentGroupTypeId == 'CHECK_RUN'} @and $ >> {groovy:org >> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >> + <hyperlink target="printChecks.pdf" description="$ >> {uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> >> <parameter param-name="paymentGroupId"/> >> </hyperlink> >> </field> >> - <field name="depositSlip" title="$ >> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >> when="$ >> {groovy:org >> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >> - <hyperlink target="DepositSlip.pdf" description="$ >> {uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> >> + <field name="deleteLink" title="$ >> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >> {paymentGroupMemberAndTransList[0].finAccountTransStatusId != >> 'FINACT_TRNS_APPROVED'} @and $ >> {groovy:org >> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >> + <hyperlink target="cancelPaymentGroup" description="$ >> {uiLabelMap.CommonCancel}" also-hidden="false"> >> + <parameter param-name="paymentGroupId"/> >> + </hyperlink> >> + </field> >> + <field name="deleteLink" title="$ >> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >> when="$ {paymentGroupTypeId == 'CHECK_RUN'} @and $ >> {paymentGroupMemberAndTransList[0].finAccountTransStatusId != >> 'FINACT_TRNS_APPROVED'} @and $ >> {groovy:org >> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >> + <hyperlink target="cancelCheckRunPayments" >> description="${uiLabelMap.CommonCancel}" also-hidden="false"> >> <parameter param-name="paymentGroupId"/> >> </hyperlink> >> </field> >> >> > > > |
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
Administrator
|
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
Administrator
|
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
|
In reply to this post by Jacques Le Roux
I'd prefer to leave it open until the build is fixed and we receive
the success notification. Thanks Scott On 6/12/2009, at 10:25 PM, Jacques Le Roux wrote: > Hi Scott, > > Forgot the PS, I'm not even sure of what I meaned :D > Anyway this invocation worked and, hop, now we have the results in > dev ML > I think we can close this issue > > Thanks > > Jacques > () ascii ribbon campaign against HTML e-mail > /\ www.asciiribbon.org > > From: "Scott Gray" <[hidden email]> > Not sure if I posted it already but here it is: https://issues.apache.org/jira/browse/INFRA-2353 > > In regards to your p.s., I'm sorry but I have no idea what you are > trying to say :-) > > Regards > Scott > > On 6/12/2009, at 9:49 AM, Jacques Le Roux wrote: > >> Hi Scott, >> >> If not already done, please could you share the infra issue number >> to allow everybody to follow. >> And even if done, please forgive to people who forgot (or not read >> it) and give us a new chance ;o) >> >> Thanks >> >> Jacques >> PS: at large I think we should be more to follow these issues (and >> I believe you are more than aware and agree with that; can't >> express it better in English, sorry) >> >> From: "Scott Gray" <[hidden email]> >> Hi Ashish, >> >> A few tests are now failing due to this commit. >> http://ci.apache.org/waterfall?show=ofbiz-trunk >> >> I raised a jira issue with infra about the dev list not receiving >> failure notifications but unfortunately it hasn't seen any action as >> yet. >> >> HotWax Media >> http://www.hotwaxmedia.com >> >> >> On 5/12/2009, at 10:04 PM, [hidden email] wrote: >> >>> Author: ashish >>> Date: Sat Dec 5 09:04:53 2009 >>> New Revision: 887520 >>> >>> URL: http://svn.apache.org/viewvc?rev=887520&view=rev >>> Log: >>> Applied patch from jira issue OFBIZ-3310 - Cancel Pyament Group >>> issue - Can't cancel reconciled payment batch and issued payment >>> check. >>> >>> Steps to reproduce - >>> Issue : -1 >>> 1.Create few payments in AR . >>> 2.Create a batch payment for newly created payments from screen https://localhost:28443/ar/control/batchPayments >>> (where finAccountId=SC_CHECKING). >>> 3.Go to Financial Account screen and click on transaction tab https://localhost:28443/accounting/control/FindFinAccountTrans?finAccountId=SC_CHECKING >>> . >>> 4.Select GlReconciliationId as "Not Assigned" and click on >>> serach button. >>> 5.Select newly created FinAccountTrans from checkbox.Then select >>> GlReconciliationName from selectbox and click on button "Assign >>> TO reconciliation". >>> 6.This process will associate fin account transaction with >>> reconciliation. >>> 7.Now click on Reconciliation tab and select the >>> FinAccountTransaction. >>> 8.Reconcile the transaction by clicking on Reconcile button. >>> 9.Now the status of reconciliation will be "Reconciled". >>> 10.Status of transaction will be "Approved". >>> 11.Now go to Payment Group or Deposit slip tab, the created >>> payment group will appear with Cancel button in list form. >>> >>> * This is not correct. >>> * User can not cancel reconciled deposit slip. >>> Similiar changes will reflect on following screens : - >>> 1) https://localhost:8443/ar/control/FindArPaymentGroups >>> 2) https://localhost:8443/accounting/control/FindPaymentGroup >>> 3) https://localhost:28443/accounting/control/FindDepositSlips?finAccountId=SC_CHECKING&organizationPartyId=Company >>> >>> Issue : -2 >>> 1) Now go to PurchaseInvoices screen https://localhost:28443/ap/control/FindPurchaseInvoices >>> . >>> 2) Click on search button and select Invoices using checkbox. >>> 3) Select "Issue Check" from select box. >>> 4)Click on Run button. >>> 5)Performing this action fin account transaction will be created >>> in Apporved status . >>> 5) Now go to to https://localhost:28443/ap/control/ >>> FindApPaymentGroups screen the created payment group will appear >>> with Cancel button in list form. >>> >>> * This is not correct. >>> * User can not cancel issued check . >>> >>> Similiar changes will reflect on following screens : - >>> 1) https://localhost:28443/ap/control/FindApPaymentGroups >>> 2) https://localhost:8443/accounting/control/FindPaymentGroup >>> >>> Thanks Awdesh & Sumit for the contribution. >>> >>> Modified: >>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >>> ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ >>> payment/PaymentServices.xml >>> ofbiz/trunk/applications/accounting/servicedef/services_payment.xml >>> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ >>> controller.xml >>> ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >>> controller.xml >>> ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >>> controller.xml >>> ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml >>> ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml >>> >>> Modified: ofbiz/trunk/applications/accounting/config/ >>> AccountingUiLabels.xml >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=887520&r1=887519&r2=887520&view=diff >>> = = = = = = = = = >>> = >>> ==================================================================== >>> --- ofbiz/trunk/applications/accounting/config/ >>> AccountingUiLabels.xml (original) >>> +++ ofbiz/trunk/applications/accounting/config/ >>> AccountingUiLabels.xml Sat Dec 5 09:04:53 2009 >>> @@ -1843,6 +1843,10 @@ >>> <value xml:lang="th">à ¸.à ¸£à ¸§à ¸^à >>> ¸ªà ¸ à ¸sà ¸^à ¸â?oà ¸Tà ¸§à >>> ¸T</ value> >>> <value xml:lang="zh">Ãœ"¯ç¥¨é?'é¢Ë?</ >>> value> >>> </property> >>> + <property key="AccountingCheckIsAlreadyIssued"> >>> + <value xml:lang="en">Check Is Already Issued</value> >>> + <value xml:lang="hi_IN">à ¤oà ¤â?¤Ã ¤,à  >>> ¤s à ¤ªà ¤â?Tà ¤â?ˇÃ Â¥? à ¤¸à ¥? >>> à ¤â?Tà ¥? à ¤¨à ¤¿à ¤°à ¥Ÿà >>> ¤-à ¤¤ à ¤.à ¤¿à ¤¯à ¤â?¤ à  >>> ¤oà ¤â?¤Ã ¤¤à ¤â?¤ à ¤â?Tà ¥^</value> >>> + </property> >>> <property key="AccountingCheckNumber"> >>> <value xml:lang="en">Check Number</value> >>> <value xml:lang="hi_IN">à ¤sà ¥?à ¤./à ¤â? >>> Tà ¥â"¢Ã ¤,à ¤¡à ¥? à ¤¨à ¤®à  >>> ¥Å¸Ã ¤¬à ¤°</value> >>> @@ -8896,6 +8900,10 @@ >>> <value xml:lang="en">Total Quantity On Hand</value> >>> <value xml:lang="hi_IN">à ¤.à ¥â"¢Ã ¤â?ˇ à  >>> ¤Â®Ã ¤â?¤Ã ¤ ¤à ¥Ÿà ¤°à ¤â?¤ à >>> ¤â?Tà ¤â?¤Ã ¤ Â¥ à ¤ªà ¤°</value> >>> </property> >>> + <property key="AccountingTransactionIsAlreadyReconciled"> >>> + <value xml:lang="en">Transaction Is already Reconciled</ >>> value> >>> + <value xml:lang="hi_IN">à ¤-à ¤¤à ¤¿à  >>> ¤ÂµÃ ¤¿à ¤§à ¤¿ à ¤ªà ¤â?Tà  >>> ¤â?ˇÃ Â¥? à ¤¸à ¥? à ¤â?Tà ¥? à  >>> ¤Â¸Ã ¤®à ¤Ë?à ¥Oà ¤¤à ¤â?¤ à  >>> ¤â?Tà ¥^</value> >>> + </property> >>> <property key="AccountingTransactionHasBeenAlreadyPosted"> >>> <value xml:lang="en">Transaction has been already posted</ >>> value> >>> <value xml:lang="fr">Transaction dÃf©jÃf >>> effectuÃf©e</ value> >>> >>> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/ >>> accounting/payment/PaymentServices.xml >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=887520&r1=887519&r2=887520&view=diff >>> = = = = = = = = = >>> = >>> ==================================================================== >>> --- ofbiz/trunk/applications/accounting/script/org/ofbiz/ >>> accounting/ payment/PaymentServices.xml (original) >>> +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/ >>> accounting/ payment/PaymentServices.xml Sat Dec 5 09:04:53 2009 >>> @@ -473,38 +473,30 @@ >>> </simple-method> >>> >>> <simple-method method-name="cancelPaymentBatch" short- >>> description="cancel payment batch"> >>> - <set field="paymentGroupId" from- >>> field="parameters.paymentGroupId"/> >>> - <entity-and entity-name="PaymentGroupMember" >>> list="paymentGroupMembers"> >>> - <field-map field-name="paymentGroupId"/> >>> + <entity-and entity- >>> name="PmtGrpMembrPaymentAndFinAcctTrans" >>> list="paymentGroupMemberAndTransList"> >>> + <field-map field-name="paymentGroupId" from- >>> field="parameters.paymentGroupId"/> >>> </entity-and> >>> - <set field="isGlReconciliationId" value="$ >>> {parameters.glReconciliationId == 'null'}" type="Boolean"/> >>> - <if-compare field="isGlReconciliationId" >>> operator="equals" value="true" type="Boolean"> >>> - <set-service-fields service- >>> name="getPaymentGroupReconciliationId" map="parameters" to- >>> map="getPaymentGroupReconciliationIdMap"/> >>> - <set >>> field="getPaymentGroupReconciliationIdMap.paymentGroupId" from- >>> field="paymentGroupId"/> >>> - <call-service service- >>> name="getPaymentGroupReconciliationId" in-map- >>> name="getPaymentGroupReconciliationIdMap"> >>> - <result-to-field result-name="glReconciliationId"/> >>> - </call-service> >>> - <else> >>> - <set field="glReconciliationId" from- >>> field="parameters.glReconciliationId"/> >>> - </else> >>> - </if-compare> >>> - <if-empty field="glReconciliationId"> >>> - <iterate list="paymentGroupMembers" >>> entry="paymentGroupMember"> >>> - <set-service-fields service- >>> name="expirePaymentGroupMember" map="paymentGroupMember" to- >>> map="expirePaymentGroupMemberMap"/> >>> + <if-not-empty field="paymentGroupMemberAndTransList"> >>> + <first-from-list >>> list="paymentGroupMemberAndTransList" >>> entry="paymentGroupMemberAndTrans"/> >>> + <if-compare >>> field="paymentGroupMemberAndTrans.finAccountTransStatusId" >>> operator="equals" value="FINACT_TRNS_APPROVED"> >>> + <add-error> >>> + <fail-property >>> resource="AccountingUiLabels" >>> property="AccountingTransactionIsAlreadyReconciled"/> >>> + </add-error> >>> + <check-errors/> >>> + </if-compare> >>> + <iterate list="paymentGroupMemberAndTransList" >>> entry="paymentGroupMemberAndTrans"> >>> + <set-service-fields service- >>> name="expirePaymentGroupMember" map="paymentGroupMemberAndTrans" >>> to- map="expirePaymentGroupMemberMap"/> >>> <call-service service- >>> name="expirePaymentGroupMember" in-map- >>> name="expirePaymentGroupMemberMap"/> >>> - <get-related-one relation-name="Payment" value- >>> field="paymentGroupMember" to-value-field="payment"/> >>> - <get-related-one relation- >>> name="FinAccountTrans" value-field="payment" to-value- >>> field="finAccountTrans"/> >>> + <entity-one entity-name="FinAccountTrans" value- >>> field="finAccountTrans"> >>> + <field-map field-name="finAccountTransId" >>> from- field="paymentGroupMemberAndTrans.finAccountTransId"/> >>> + </entity-one> >>> <if-not-empty field="finAccountTrans"> >>> <set-service-fields service- >>> name="setFinAccountTransStatus" map="finAccountTrans" to- >>> map="setFinAccountTransStatusMap"/> >>> <set >>> field="setFinAccountTransStatusMap.statusId" >>> value="FINACT_TRNS_CANCELED"/> >>> <call-service service- >>> name="setFinAccountTransStatus" in-map- >>> name="setFinAccountTransStatusMap"/> >>> </if-not-empty> >>> </iterate> >>> - <else> >>> - <add-error><fail-property >>> resource="AccountingUiLabels" >>> property="AccountingCancelBatchPaymentsError"/></add-error> >>> - <check-errors/> >>> - </else> >>> - </if-empty> >>> + </if-not-empty> >>> </simple-method> >>> >>> <simple-method method- >>> name="createPaymentAndPaymentGroupForInvoices" short- >>> description="Creates Payments, PaymentApplications and >>> PaymentGroup for the same"> >>> @@ -641,16 +633,29 @@ >>> </simple-method> >>> >>> <simple-method method-name="cancelCheckRunPayments" short- >>> description="Cancel all payments for payment group"> >>> - <entity-condition entity-name="PaymentGroupMember" >>> list="paymentGroupMembers"> >>> - <condition-expr field-name="paymentGroupId" from- >>> field="parameters.paymentGroupId"/> >>> - </entity-condition> >>> - <iterate list="paymentGroupMembers" >>> entry="paymentGroupMember"> >>> - <get-related-one relation-name="Payment" value- >>> field="paymentGroupMember" to-value-field="payment"/> >>> + <entity-and entity- >>> name="PmtGrpMembrPaymentAndFinAcctTrans" >>> list="paymentGroupMemberAndTransList"> >>> + <field-map field-name="paymentGroupId" from- >>> field="parameters.paymentGroupId"/> >>> + </entity-and> >>> + <first-from-list list="paymentGroupMemberAndTransList" >>> entry="paymentGroupMemberAndTrans"/> >>> + <if-compare >>> field="paymentGroupMemberAndTrans.finAccountTransStatusId" >>> operator="not-equals" value="FINACT_TRNS_APPROVED"> >>> + <iterate list="paymentGroupMemberAndTransList" >>> entry="paymentGroupMemberAndTrans"> >>> + <entity-one entity-name="Payment" value- >>> field="payment"> >>> + <field-map field-name="paymentId" from- >>> field="paymentGroupMemberAndTrans.paymentId"/> >>> + </entity-one> >>> <set-service-fields service-name="voidPayment" >>> map="payment" to-map="voidPaymentMap"/> >>> <call-service service-name="voidPayment" in-map- >>> name="voidPaymentMap"/> >>> - <set-service-fields service- >>> name="expirePaymentGroupMember" map="paymentGroupMember" to- >>> map="expirePaymentGroupMemberMap"/> >>> + <set-service-fields service- >>> name="expirePaymentGroupMember" map="paymentGroupMemberAndTrans" >>> to- map="expirePaymentGroupMemberMap"/> >>> <call-service service-name="expirePaymentGroupMember" >>> in- map-name="expirePaymentGroupMemberMap"/> >>> + <clear-field field="voidPaymentMap"/> >>> + <clear-field field="expirePaymentGroupMemberMap"/> >>> </iterate> >>> + <else> >>> + <add-error> >>> + <fail-property resource="AccountingUiLabels" >>> property="AccountingCheckIsAlreadyIssued"/> >>> + </add-error> >>> + <check-errors/> >>> + </else> >>> + </if-compare> >>> </simple-method> >>> >>> <simple-method method-name="getPayments" short- >>> description="Get list of payment"> >>> >>> Modified: ofbiz/trunk/applications/accounting/servicedef/ >>> services_payment.xml >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_payment.xml?rev=887520&r1=887519&r2=887520&view=diff >>> = = = = = = = = = >>> = >>> ==================================================================== >>> --- ofbiz/trunk/applications/accounting/servicedef/ >>> services_payment.xml (original) >>> +++ ofbiz/trunk/applications/accounting/servicedef/ >>> services_payment.xml Sat Dec 5 09:04:53 2009 >>> @@ -161,7 +161,6 @@ >>> location="component://accounting/script/org/ofbiz/ >>> accounting/payment/PaymentServices.xml" >>> invoke="cancelPaymentBatch" auth="true"> >>> <description>cancel payment batch</description> >>> <attribute name="paymentGroupId" type="String" mode="IN" >>> optional="false"/> >>> - <attribute name="glReconciliationId" type="String" >>> mode="IN" optional="true"/> >>> </service> >>> <service name="createPaymentAndPaymentGroupForInvoices" >>> engine="simple" >>> location="component://accounting/script/org/ofbiz/ >>> accounting/payment/PaymentServices.xml" >>> invoke="createPaymentAndPaymentGroupForInvoices" auth="true"> >>> >>> 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=887520&r1=887519&r2=887520&view=diff >>> = = = = = = = = = >>> = >>> ==================================================================== >>> --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB- >>> INF/ controller.xml (original) >>> +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB- >>> INF/ controller.xml Sat Dec 5 09:04:53 2009 >>> @@ -440,14 +440,14 @@ >>> <security https="true" auth="true"/> >>> <event type="service" invoke="cancelPaymentBatch"/> >>> <response name="success" type="view" >>> value="PaymentGroupOverview"/> >>> - <response name="error" type="view" >>> value="PaymentGroupOverview"/> >>> + <response name="error" type="view" >>> value="FindPaymentGroup"/> >>> </request-map> >>> >>> <request-map uri="cancelCheckRunPayments"> >>> <security https="true" auth="true"/> >>> <event type="service" invoke="cancelCheckRunPayments"/> >>> <response name="success" type="view" >>> value="PaymentGroupOverview"/> >>> - <response name="error" type="view" >>> value="PaymentGroupOverview"/> >>> + <response name="error" type="view" >>> value="FindPaymentGroup"/> >>> </request-map> >>> >>> <request-map uri="DepositSlip.pdf"> >>> >>> Modified: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >>> controller.xml >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/controller.xml?rev=887520&r1=887519&r2=887520&view=diff >>> = = = = = = = = = >>> = >>> ==================================================================== >>> --- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >>> controller.xml (original) >>> +++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >>> controller.xml Sat Dec 5 09:04:53 2009 >>> @@ -99,6 +99,12 @@ >>> <event type="service" invoke="massChangeInvoiceStatus"/> >>> <response name="success" type="view" >>> value="FindPurchaseInvoices"/> >>> </request-map> >>> + <request-map uri="cancelCheckRunPayments"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="cancelCheckRunPayments"/> >>> + <response name="success" type="view" >>> value="PaymentGroupOverview"/> >>> + <response name="error" type="view" >>> value="FindApPaymentGroups"/> >>> + </request-map> >>> >>> <!-- ================ Vendor requests ================ --> >>> <request-map uri="findVendors"> >>> >>> Modified: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >>> controller.xml >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml?rev=887520&r1=887519&r2=887520&view=diff >>> = = = = = = = = = >>> = >>> ==================================================================== >>> --- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >>> controller.xml (original) >>> +++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >>> controller.xml Sat Dec 5 09:04:53 2009 >>> @@ -95,6 +95,12 @@ >>> <response name="success" type="view" value="FindArInvoices"/> >>> <response name="error" type="view" value="FindArInvoices"/> >>> </request-map> >>> + <request-map uri="cancelPaymentGroup"> >>> + <security https="true" auth="true"/> >>> + <event type="service" invoke="cancelPaymentBatch"/> >>> + <response name="success" type="view" >>> value="PaymentGroupOverview"/> >>> + <response name="error" type="view" >>> value="FindArPaymentGroups"/> >>> + </request-map> >>> <!-- end of request mappings --> >>> >>> <!-- View Mappings --> >>> >>> Modified: ofbiz/trunk/applications/accounting/widget/ >>> FinAccountForms.xml >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=887520&r1=887519&r2=887520&view=diff >>> = = = = = = = = = >>> = >>> ==================================================================== >>> --- ofbiz/trunk/applications/accounting/widget/ >>> FinAccountForms.xml (original) >>> +++ ofbiz/trunk/applications/accounting/widget/ >>> FinAccountForms.xml Sat Dec 5 09:04:53 2009 >>> @@ -263,7 +263,7 @@ >>> <parameter param-name="finAccountId"/> >>> </hyperlink> >>> </field> >>> - <field name="deleteLink" title="$ >>> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >>> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >>> {groovy:org >>> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >>> + <field name="deleteLink" title="$ >>> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >>> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >>> {paymentGroupMemberAndTransList[0].finAccountTransStatusId != >>> 'FINACT_TRNS_APPROVED'} @and $ >>> {groovy:org >>> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >>> <hyperlink target="deleteDepositSlip" description="$ >>> {uiLabelMap.CommonCancel}" also-hidden="false"> >>> <parameter param-name="paymentGroupId"/> >>> <parameter param-name="finAccountId"/> >>> >>> Modified: ofbiz/trunk/applications/accounting/widget/ >>> PaymentGroupForms.xml >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=887520&r1=887519&r2=887520&view=diff >>> = = = = = = = = = >>> = >>> ==================================================================== >>> --- ofbiz/trunk/applications/accounting/widget/ >>> PaymentGroupForms.xml (original) >>> +++ ofbiz/trunk/applications/accounting/widget/ >>> PaymentGroupForms.xml Sat Dec 5 09:04:53 2009 >>> @@ -35,6 +35,9 @@ >>> <entity-and entity-name="PaymentGroupMember" >>> list="paymentGroupMembers" filter-by-date="true"> >>> <field-map field-name="paymentGroupId"/> >>> </entity-and> >>> + <entity-and entity- >>> name="PmtGrpMembrPaymentAndFinAcctTrans" >>> list="paymentGroupMemberAndTransList" filter-by-date="true"> >>> + <field-map field-name="paymentGroupId"/> >>> + </entity-and> >>> </row-actions> >>> <field name="paymentGroupId" widget-style="buttontext"> >>> <hyperlink description="${paymentGroupId}" >>> target="PaymentGroupOverview"> >>> @@ -43,18 +46,23 @@ >>> </field> >>> <field name="paymentGroupTypeId" title="$ >>> {uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity >>> entity- name="PaymentGroupType"/></field> >>> <field name="paymentGroupName"><display description="$ >>> {paymentGroupName}"/></field> >>> - <field name="deleteLink" title="$ >>> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >>> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >>> {groovy:org >>> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >>> - <hyperlink target="cancelPaymentGroup" >>> description="$ {uiLabelMap.CommonCancel}" also-hidden="false"> >>> + <field name="depositSlip" title="$ >>> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >>> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >>> {groovy:org >>> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >>> + <hyperlink target="DepositSlip.pdf" description="$ >>> {uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> >>> <parameter param-name="paymentGroupId"/> >>> </hyperlink> >>> </field> >>> - <field name="deleteLink" title="$ >>> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >>> when="$ {paymentGroupTypeId == 'CHECK_RUN'} @and $ >>> {groovy:org >>> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >>> - <hyperlink target="cancelCheckRunPayments" >>> description="${uiLabelMap.CommonCancel}" also-hidden="false"> >>> + <field name="printCheck" title="$ >>> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >>> when="$ {paymentGroupTypeId == 'CHECK_RUN'} @and $ >>> {groovy:org >>> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >>> + <hyperlink target="printChecks.pdf" description="$ >>> {uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> >>> <parameter param-name="paymentGroupId"/> >>> </hyperlink> >>> </field> >>> - <field name="depositSlip" title="$ >>> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >>> when="$ >>> {groovy:org >>> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >>> - <hyperlink target="DepositSlip.pdf" description="$ >>> {uiLabelMap.AccountingInvoicePDF}" also-hidden="false"> >>> + <field name="deleteLink" title="$ >>> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >>> when="$ {paymentGroupTypeId == 'BATCH_PAYMENT'} @and $ >>> {paymentGroupMemberAndTransList[0].finAccountTransStatusId != >>> 'FINACT_TRNS_APPROVED'} @and $ >>> {groovy:org >>> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >>> + <hyperlink target="cancelPaymentGroup" >>> description="$ {uiLabelMap.CommonCancel}" also-hidden="false"> >>> + <parameter param-name="paymentGroupId"/> >>> + </hyperlink> >>> + </field> >>> + <field name="deleteLink" title="$ >>> {uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use- >>> when="$ {paymentGroupTypeId == 'CHECK_RUN'} @and $ >>> {paymentGroupMemberAndTransList[0].finAccountTransStatusId != >>> 'FINACT_TRNS_APPROVED'} @and $ >>> {groovy:org >>> .ofbiz.base.util.UtilValidate.isNotEmpty(paymentGroupMembers)}"> >>> + <hyperlink target="cancelCheckRunPayments" >>> description="${uiLabelMap.CommonCancel}" also-hidden="false"> >>> <parameter param-name="paymentGroupId"/> >>> </hyperlink> >>> </field> >>> >>> >> >> >> > > > |
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
|
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
|
Thanks Ashish, let me know if I can be of any help.
Regards Scott On 7/12/2009, at 4:46 PM, Ashish Vijaywargiya wrote: > Scott, > > I will take care of it today. > > -- > Ashish > > On Mon, Dec 7, 2009 at 4:46 AM, Scott Gray > <[hidden email]>wrote: > >> I'd prefer to leave it open until the build is fixed and we receive >> the >> success notification. >> >> Thanks >> Scott >> >> >> On 6/12/2009, at 10:25 PM, Jacques Le Roux wrote: >> >> Hi Scott, >>> >>> Forgot the PS, I'm not even sure of what I meaned :D >>> Anyway this invocation worked and, hop, now we have the results in >>> dev ML >>> I think we can close this issue >>> >>> Thanks >>> >>> Jacques >>> () ascii ribbon campaign against HTML e-mail >>> /\ www.asciiribbon.org >>> >>> From: "Scott Gray" <[hidden email]> >>> Not sure if I posted it already but here it is: >>> https://issues.apache.org/jira/browse/INFRA-2353 >>> >>> In regards to your p.s., I'm sorry but I have no idea what you are >>> trying to say :-) >>> >>> Regards >>> Scott >>> >>> On 6/12/2009, at 9:49 AM, Jacques Le Roux wrote: >>> >>> Hi Scott, >>>> >>>> If not already done, please could you share the infra issue >>>> number to >>>> allow everybody to follow. >>>> And even if done, please forgive to people who forgot (or not >>>> read it) >>>> and give us a new chance ;o) >>>> >>>> Thanks >>>> >>>> Jacques >>>> PS: at large I think we should be more to follow these issues >>>> (and I >>>> believe you are more than aware and agree with that; can't >>>> express it >>>> better in English, sorry) >>>> >>>> From: "Scott Gray" <[hidden email]> >>>> Hi Ashish, >>>> >>>> A few tests are now failing due to this commit. >>>> http://ci.apache.org/waterfall?show=ofbiz-trunk >>>> >>>> I raised a jira issue with infra about the dev list not receiving >>>> failure notifications but unfortunately it hasn't seen any action >>>> as >>>> yet. >>>> >>>> HotWax Media >>>> http://www.hotwaxmedia.com >>>> >>>> >>>> On 5/12/2009, at 10:04 PM, [hidden email] wrote: >>>> >>>> Author: ashish >>>>> Date: Sat Dec 5 09:04:53 2009 >>>>> New Revision: 887520 >>>>> >>>>> URL: http://svn.apache.org/viewvc?rev=887520&view=rev >>>>> Log: >>>>> Applied patch from jira issue OFBIZ-3310 - Cancel Pyament >>>>> Group issue >>>>> - Can't cancel reconciled payment batch and issued payment check. >>>>> >>>>> Steps to reproduce - >>>>> Issue : -1 >>>>> 1.Create few payments in AR . >>>>> 2.Create a batch payment for newly created payments from screen >>>>> https://localhost:28443/ar/control/batchPayments (where >>>>> finAccountId=SC_CHECKING). >>>>> 3.Go to Financial Account screen and click on transaction tab >>>>> https://localhost:28443/accounting/control/FindFinAccountTrans?finAccountId=SC_CHECKING >>>>> . >>>>> 4.Select GlReconciliationId as "Not Assigned" and click on serach >>>>> button. >>>>> 5.Select newly created FinAccountTrans from checkbox.Then select >>>>> GlReconciliationName from selectbox and click on button "Assign TO >>>>> reconciliation". >>>>> 6.This process will associate fin account transaction with >>>>> reconciliation. >>>>> 7.Now click on Reconciliation tab and select the >>>>> FinAccountTransaction. >>>>> 8.Reconcile the transaction by clicking on Reconcile button. >>>>> 9.Now the status of reconciliation will be "Reconciled". >>>>> 10.Status of transaction will be "Approved". >>>>> 11.Now go to Payment Group or Deposit slip tab, the created >>>>> payment >>>>> group will appear with Cancel button in list form. >>>>> >>>>> * This is not correct. >>>>> * User can not cancel reconciled deposit slip. >>>>> Similiar changes will reflect on following screens : - >>>>> 1) https://localhost:8443/ar/control/FindArPaymentGroups >>>>> 2) https://localhost:8443/accounting/control/FindPaymentGroup >>>>> 3) >>>>> https://localhost:28443/accounting/control/FindDepositSlips?finAccountId=SC_CHECKING&organizationPartyId=Company >>>>> >>>>> Issue : -2 >>>>> 1) Now go to PurchaseInvoices screen >>>>> https://localhost:28443/ap/control/FindPurchaseInvoices . >>>>> 2) Click on search button and select Invoices using checkbox. >>>>> 3) Select "Issue Check" from select box. >>>>> 4)Click on Run button. >>>>> 5)Performing this action fin account transaction will be >>>>> created in >>>>> Apporved status . >>>>> 5) Now go to to https://localhost:28443/ap/control/ >>>>> FindApPaymentGroups screen the created payment group will >>>>> appear with >>>>> Cancel button in list form. >>>>> >>>>> * This is not correct. >>>>> * User can not cancel issued check . >>>>> >>>>> Similiar changes will reflect on following screens : - >>>>> 1) https://localhost:28443/ap/control/FindApPaymentGroups >>>>> 2) https://localhost:8443/accounting/control/FindPaymentGroup >>>>> >>>>> Thanks Awdesh & Sumit for the contribution. >>>>> >>>>> Modified: >>>>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >>>>> ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ >>>>> payment/PaymentServices.xml >>>>> ofbiz/trunk/applications/accounting/servicedef/ >>>>> services_payment.xml >>>>> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ >>>>> controller.xml >>>>> ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >>>>> controller.xml >>>>> ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >>>>> controller.xml >>>>> ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml >>>>> ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml >>>>> >>>>> Modified: ofbiz/trunk/applications/accounting/config/ >>>>> AccountingUiLabels.xml >>>>> URL: >>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=887520&r1=887519&r2=887520&view=diff >>>>> = = = = = = = = = >>>>> = >>>>> = >>>>> = >>>>> ================================================================== >>>>> --- ofbiz/trunk/applications/accounting/config/ >>>>> AccountingUiLabels.xml >>>>> (original) >>>>> +++ ofbiz/trunk/applications/accounting/config/ >>>>> AccountingUiLabels.xml >>>>> Sat Dec 5 09:04:53 2009 >>>>> @@ -1843,6 +1843,10 @@ >>>>> <value xml:lang="th">à ¸.à ¸£à ¸§à ¸^à ¸ªà ¸ à >>>>> ¸sà ¸^à >>>>> ¸â?oà ¸Tà ¸§à ¸T</ value> >>>>> >>>>> >>>> |
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
|
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
|
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
|
In reply to this post by Ashish Vijaywargiya
Thanks Ashish and Awdesh, much appreciated.
I notice we didn't receive a success notification from buildbot, I'll mention it to Gavin on the infra issue. Thanks Scott On 8/12/2009, at 6:50 PM, Ashish Vijaywargiya wrote: > Hello Scott, > > Test case issue should be fixed in 888270. > Please have a look at my commit and let me know if you have > something for > me. > > I am also sending the console log of "java -Xmx1024M -jar ofbiz.jar - > test" > on your personal email. > > -- > Ashish > > On Mon, Dec 7, 2009 at 10:29 AM, Scott Gray <[hidden email] > >wrote: > >> Thanks Ashish, let me know if I can be of any help. >> >> Regards >> Scott >> >> >> On 7/12/2009, at 4:46 PM, Ashish Vijaywargiya wrote: >> >> Scott, >>> >>> I will take care of it today. >>> >>> -- >>> Ashish >>> >>> On Mon, Dec 7, 2009 at 4:46 AM, Scott Gray <[hidden email] >>>> wrote: >>> >>> I'd prefer to leave it open until the build is fixed and we >>> receive the >>>> success notification. >>>> >>>> Thanks >>>> Scott >>>> >>>> >>>> On 6/12/2009, at 10:25 PM, Jacques Le Roux wrote: >>>> >>>> Hi Scott, >>>> >>>>> >>>>> Forgot the PS, I'm not even sure of what I meaned :D >>>>> Anyway this invocation worked and, hop, now we have the results >>>>> in dev >>>>> ML >>>>> I think we can close this issue >>>>> >>>>> Thanks >>>>> >>>>> Jacques >>>>> () ascii ribbon campaign against HTML e-mail >>>>> /\ www.asciiribbon.org >>>>> >>>>> From: "Scott Gray" <[hidden email]> >>>>> Not sure if I posted it already but here it is: >>>>> https://issues.apache.org/jira/browse/INFRA-2353 >>>>> >>>>> In regards to your p.s., I'm sorry but I have no idea what you are >>>>> trying to say :-) >>>>> >>>>> Regards >>>>> Scott >>>>> >>>>> On 6/12/2009, at 9:49 AM, Jacques Le Roux wrote: >>>>> >>>>> Hi Scott, >>>>> >>>>>> >>>>>> If not already done, please could you share the infra issue >>>>>> number to >>>>>> allow everybody to follow. >>>>>> And even if done, please forgive to people who forgot (or not >>>>>> read it) >>>>>> and give us a new chance ;o) >>>>>> >>>>>> Thanks >>>>>> >>>>>> Jacques >>>>>> PS: at large I think we should be more to follow these issues >>>>>> (and I >>>>>> believe you are more than aware and agree with that; can't >>>>>> express it >>>>>> better in English, sorry) >>>>>> >>>>>> From: "Scott Gray" <[hidden email]> >>>>>> Hi Ashish, >>>>>> >>>>>> A few tests are now failing due to this commit. >>>>>> http://ci.apache.org/waterfall?show=ofbiz-trunk >>>>>> >>>>>> I raised a jira issue with infra about the dev list not receiving >>>>>> failure notifications but unfortunately it hasn't seen any >>>>>> action as >>>>>> yet. >>>>>> >>>>>> HotWax Media >>>>>> http://www.hotwaxmedia.com >>>>>> >>>>>> >>>>>> On 5/12/2009, at 10:04 PM, [hidden email] wrote: >>>>>> >>>>>> Author: ashish >>>>>> >>>>>>> Date: Sat Dec 5 09:04:53 2009 >>>>>>> New Revision: 887520 >>>>>>> >>>>>>> URL: http://svn.apache.org/viewvc?rev=887520&view=rev >>>>>>> Log: >>>>>>> Applied patch from jira issue OFBIZ-3310 - Cancel Pyament Group >>>>>>> issue >>>>>>> - Can't cancel reconciled payment batch and issued payment >>>>>>> check. >>>>>>> >>>>>>> Steps to reproduce - >>>>>>> Issue : -1 >>>>>>> 1.Create few payments in AR . >>>>>>> 2.Create a batch payment for newly created payments from screen >>>>>>> https://localhost:28443/ar/control/batchPayments (where >>>>>>> finAccountId=SC_CHECKING). >>>>>>> 3.Go to Financial Account screen and click on transaction tab >>>>>>> >>>>>>> https://localhost:28443/accounting/control/FindFinAccountTrans?finAccountId=SC_CHECKING >>>>>>> . >>>>>>> 4.Select GlReconciliationId as "Not Assigned" and click on >>>>>>> serach >>>>>>> button. >>>>>>> 5.Select newly created FinAccountTrans from checkbox.Then select >>>>>>> GlReconciliationName from selectbox and click on button >>>>>>> "Assign TO >>>>>>> reconciliation". >>>>>>> 6.This process will associate fin account transaction with >>>>>>> reconciliation. >>>>>>> 7.Now click on Reconciliation tab and select the >>>>>>> FinAccountTransaction. >>>>>>> 8.Reconcile the transaction by clicking on Reconcile button. >>>>>>> 9.Now the status of reconciliation will be "Reconciled". >>>>>>> 10.Status of transaction will be "Approved". >>>>>>> 11.Now go to Payment Group or Deposit slip tab, the created >>>>>>> payment >>>>>>> group will appear with Cancel button in list form. >>>>>>> >>>>>>> * This is not correct. >>>>>>> * User can not cancel reconciled deposit slip. >>>>>>> Similiar changes will reflect on following screens : - >>>>>>> 1) https://localhost:8443/ar/control/FindArPaymentGroups >>>>>>> 2) https://localhost:8443/accounting/control/FindPaymentGroup >>>>>>> 3) >>>>>>> >>>>>>> https://localhost:28443/accounting/control/FindDepositSlips?finAccountId=SC_CHECKING&organizationPartyId=Company >>>>>>> >>>>>>> Issue : -2 >>>>>>> 1) Now go to PurchaseInvoices screen >>>>>>> https://localhost:28443/ap/control/FindPurchaseInvoices . >>>>>>> 2) Click on search button and select Invoices using checkbox. >>>>>>> 3) Select "Issue Check" from select box. >>>>>>> 4)Click on Run button. >>>>>>> 5)Performing this action fin account transaction will be >>>>>>> created in >>>>>>> Apporved status . >>>>>>> 5) Now go to to https://localhost:28443/ap/control/FindApPaymentGroups >>>>>>> screen the created payment group will appear with >>>>>>> Cancel button in list form. >>>>>>> >>>>>>> * This is not correct. >>>>>>> * User can not cancel issued check . >>>>>>> >>>>>>> Similiar changes will reflect on following screens : - >>>>>>> 1) https://localhost:28443/ap/control/FindApPaymentGroups >>>>>>> 2) https://localhost:8443/accounting/control/FindPaymentGroup >>>>>>> >>>>>>> Thanks Awdesh & Sumit for the contribution. >>>>>>> >>>>>>> Modified: >>>>>>> ofbiz/trunk/applications/accounting/config/ >>>>>>> AccountingUiLabels.xml >>>>>>> ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ >>>>>>> payment/PaymentServices.xml >>>>>>> ofbiz/trunk/applications/accounting/servicedef/ >>>>>>> services_payment.xml >>>>>>> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ >>>>>>> controller.xml >>>>>>> ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ >>>>>>> controller.xml >>>>>>> ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ >>>>>>> controller.xml >>>>>>> ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml >>>>>>> ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml >>>>>>> >>>>>>> Modified: ofbiz/trunk/applications/accounting/config/ >>>>>>> AccountingUiLabels.xml >>>>>>> URL: >>>>>>> >>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=887520&r1=887519&r2=887520&view=diff >>>>>>> = = = = = = = = = >>>>>>> = >>>>>>> = >>>>>>> = >>>>>>> = >>>>>>> = >>>>>>> ================================================================ >>>>>>> --- ofbiz/trunk/applications/accounting/config/ >>>>>>> AccountingUiLabels.xml >>>>>>> (original) >>>>>>> +++ ofbiz/trunk/applications/accounting/config/ >>>>>>> AccountingUiLabels.xml >>>>>>> Sat Dec 5 09:04:53 2009 >>>>>>> @@ -1843,6 +1843,10 @@ >>>>>>> <value xml:lang="th">à ¸.à ¸£à ¸§à ¸^à ¸ªà ¸ à >>>>>>> ¸sà ¸^à >>>>>>> ¸â?oà ¸Tà ¸§à ¸T</ value> >>>>>>> >>>>>>> >>>>>>> >>>>>> >> |
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
|
Thanks for following up Scott.
Cheers, Ruppert -- Tim Ruppert HotWax Media http://www.hotwaxmedia.com o:801.649.6594 f:801.649.6595 On Dec 7, 2009, at 11:52 PM, Scott Gray wrote: > Thanks Ashish and Awdesh, much appreciated. > > I notice we didn't receive a success notification from buildbot, I'll mention it to Gavin on the infra issue. > > Thanks > Scott > > On 8/12/2009, at 6:50 PM, Ashish Vijaywargiya wrote: > >> Hello Scott, >> >> Test case issue should be fixed in 888270. >> Please have a look at my commit and let me know if you have something for >> me. >> >> I am also sending the console log of "java -Xmx1024M -jar ofbiz.jar -test" >> on your personal email. >> >> -- >> Ashish >> >> On Mon, Dec 7, 2009 at 10:29 AM, Scott Gray <[hidden email]>wrote: >> >>> Thanks Ashish, let me know if I can be of any help. >>> >>> Regards >>> Scott >>> >>> >>> On 7/12/2009, at 4:46 PM, Ashish Vijaywargiya wrote: >>> >>> Scott, >>>> >>>> I will take care of it today. >>>> >>>> -- >>>> Ashish >>>> >>>> On Mon, Dec 7, 2009 at 4:46 AM, Scott Gray <[hidden email] >>>>> wrote: >>>> >>>> I'd prefer to leave it open until the build is fixed and we receive the >>>>> success notification. >>>>> >>>>> Thanks >>>>> Scott >>>>> >>>>> >>>>> On 6/12/2009, at 10:25 PM, Jacques Le Roux wrote: >>>>> >>>>> Hi Scott, >>>>> >>>>>> >>>>>> Forgot the PS, I'm not even sure of what I meaned :D >>>>>> Anyway this invocation worked and, hop, now we have the results in dev >>>>>> ML >>>>>> I think we can close this issue >>>>>> >>>>>> Thanks >>>>>> >>>>>> Jacques >>>>>> () ascii ribbon campaign against HTML e-mail >>>>>> /\ www.asciiribbon.org >>>>>> >>>>>> From: "Scott Gray" <[hidden email]> >>>>>> Not sure if I posted it already but here it is: >>>>>> https://issues.apache.org/jira/browse/INFRA-2353 >>>>>> >>>>>> In regards to your p.s., I'm sorry but I have no idea what you are >>>>>> trying to say :-) >>>>>> >>>>>> Regards >>>>>> Scott >>>>>> >>>>>> On 6/12/2009, at 9:49 AM, Jacques Le Roux wrote: >>>>>> >>>>>> Hi Scott, >>>>>> >>>>>>> >>>>>>> If not already done, please could you share the infra issue number to >>>>>>> allow everybody to follow. >>>>>>> And even if done, please forgive to people who forgot (or not read it) >>>>>>> and give us a new chance ;o) >>>>>>> >>>>>>> Thanks >>>>>>> >>>>>>> Jacques >>>>>>> PS: at large I think we should be more to follow these issues (and I >>>>>>> believe you are more than aware and agree with that; can't express it >>>>>>> better in English, sorry) >>>>>>> >>>>>>> From: "Scott Gray" <[hidden email]> >>>>>>> Hi Ashish, >>>>>>> >>>>>>> A few tests are now failing due to this commit. >>>>>>> http://ci.apache.org/waterfall?show=ofbiz-trunk >>>>>>> >>>>>>> I raised a jira issue with infra about the dev list not receiving >>>>>>> failure notifications but unfortunately it hasn't seen any action as >>>>>>> yet. >>>>>>> >>>>>>> HotWax Media >>>>>>> http://www.hotwaxmedia.com >>>>>>> >>>>>>> >>>>>>> On 5/12/2009, at 10:04 PM, [hidden email] wrote: >>>>>>> >>>>>>> Author: ashish >>>>>>> >>>>>>>> Date: Sat Dec 5 09:04:53 2009 >>>>>>>> New Revision: 887520 >>>>>>>> >>>>>>>> URL: http://svn.apache.org/viewvc?rev=887520&view=rev >>>>>>>> Log: >>>>>>>> Applied patch from jira issue OFBIZ-3310 - Cancel Pyament Group >>>>>>>> issue >>>>>>>> - Can't cancel reconciled payment batch and issued payment check. >>>>>>>> >>>>>>>> Steps to reproduce - >>>>>>>> Issue : -1 >>>>>>>> 1.Create few payments in AR . >>>>>>>> 2.Create a batch payment for newly created payments from screen >>>>>>>> https://localhost:28443/ar/control/batchPayments (where >>>>>>>> finAccountId=SC_CHECKING). >>>>>>>> 3.Go to Financial Account screen and click on transaction tab >>>>>>>> >>>>>>>> https://localhost:28443/accounting/control/FindFinAccountTrans?finAccountId=SC_CHECKING >>>>>>>> . >>>>>>>> 4.Select GlReconciliationId as "Not Assigned" and click on serach >>>>>>>> button. >>>>>>>> 5.Select newly created FinAccountTrans from checkbox.Then select >>>>>>>> GlReconciliationName from selectbox and click on button "Assign TO >>>>>>>> reconciliation". >>>>>>>> 6.This process will associate fin account transaction with >>>>>>>> reconciliation. >>>>>>>> 7.Now click on Reconciliation tab and select the >>>>>>>> FinAccountTransaction. >>>>>>>> 8.Reconcile the transaction by clicking on Reconcile button. >>>>>>>> 9.Now the status of reconciliation will be "Reconciled". >>>>>>>> 10.Status of transaction will be "Approved". >>>>>>>> 11.Now go to Payment Group or Deposit slip tab, the created payment >>>>>>>> group will appear with Cancel button in list form. >>>>>>>> >>>>>>>> * This is not correct. >>>>>>>> * User can not cancel reconciled deposit slip. >>>>>>>> Similiar changes will reflect on following screens : - >>>>>>>> 1) https://localhost:8443/ar/control/FindArPaymentGroups >>>>>>>> 2) https://localhost:8443/accounting/control/FindPaymentGroup >>>>>>>> 3) >>>>>>>> >>>>>>>> https://localhost:28443/accounting/control/FindDepositSlips?finAccountId=SC_CHECKING&organizationPartyId=Company >>>>>>>> >>>>>>>> Issue : -2 >>>>>>>> 1) Now go to PurchaseInvoices screen >>>>>>>> https://localhost:28443/ap/control/FindPurchaseInvoices . >>>>>>>> 2) Click on search button and select Invoices using checkbox. >>>>>>>> 3) Select "Issue Check" from select box. >>>>>>>> 4)Click on Run button. >>>>>>>> 5)Performing this action fin account transaction will be created in >>>>>>>> Apporved status . >>>>>>>> 5) Now go to to https://localhost:28443/ap/control/FindApPaymentGroups screen the created payment group will appear with >>>>>>>> Cancel button in list form. >>>>>>>> >>>>>>>> * This is not correct. >>>>>>>> * User can not cancel issued check . >>>>>>>> >>>>>>>> Similiar changes will reflect on following screens : - >>>>>>>> 1) https://localhost:28443/ap/control/FindApPaymentGroups >>>>>>>> 2) https://localhost:8443/accounting/control/FindPaymentGroup >>>>>>>> >>>>>>>> Thanks Awdesh & Sumit for the contribution. >>>>>>>> >>>>>>>> Modified: >>>>>>>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml >>>>>>>> ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ >>>>>>>> payment/PaymentServices.xml >>>>>>>> ofbiz/trunk/applications/accounting/servicedef/services_payment.xml >>>>>>>> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/ >>>>>>>> controller.xml >>>>>>>> ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/ controller.xml >>>>>>>> ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/ controller.xml >>>>>>>> ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml >>>>>>>> ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml >>>>>>>> >>>>>>>> Modified: ofbiz/trunk/applications/accounting/config/ >>>>>>>> AccountingUiLabels.xml >>>>>>>> URL: >>>>>>>> >>>>>>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=887520&r1=887519&r2=887520&view=diff >>>>>>>> = = = = = = = = = >>>>>>>> ===================================================================== >>>>>>>> --- ofbiz/trunk/applications/accounting/config/ >>>>>>>> AccountingUiLabels.xml >>>>>>>> (original) >>>>>>>> +++ ofbiz/trunk/applications/accounting/config/ >>>>>>>> AccountingUiLabels.xml >>>>>>>> Sat Dec 5 09:04:53 2009 >>>>>>>> @@ -1843,6 +1843,10 @@ >>>>>>>> <value xml:lang="th">à ¸.à ¸£à ¸§à ¸^à ¸ªà ¸ à ¸sà ¸^à >>>>>>>> ¸â?oà ¸Tà ¸§à ¸T</ value> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>> > |
Re: svn commit: r887520 - in /ofbiz/trunk/applications/acco
|
Administrator
|
| Free forum by Nabble | Edit this page |