Commit 517fc306 by Volkan Uygun

refs #3428 - Bankadan çek ödemesi banka kayıtlarına 1 kez yansır hale getirildi.

- Eksik bilgi ve görünüm düzeltmesi yapıldı. 
- Kasa'dan ödeme işleminin kasa  hareketine yansımasındaki eksik bilgi setlendi.
parent 5edf3a6b
......@@ -417,6 +417,7 @@ public class AccountTxnActionBean implements AccountTxnAction {
accountTxn.setDate(doc.getDate());
accountTxn.setDocumentId(doc.getId());
accountTxn.setDocumentType(DocumentType.ChequeAccountPaymentPayroll);
accountTxn.setProcessType(AdvanceProcessType.Normal);
saveAuditRecords(accountTxn, (AuditBase)doc);
......
......@@ -52,7 +52,7 @@ import com.ut.tekir.general.GeneralSuggestion;
* Banka hareket tablosuna banka için alacak yazar.
* Çek tarihçesi tablosunda hareket ile ilgili kayıt atılır.
*
* @author yigit
* @author yigit, sinan , volkan
*/
@Stateful
@Name("chequeToBankPaymentPayrollHome")
......@@ -148,6 +148,7 @@ public class ChequeToBankPaymentPayrollHomeBean extends EntityBase<ChequeToBankP
cpm.setDocumentSerial(entity.getSerial());
cpm.setNewStatus(ChequeStatus.BankaOdeme);
cpm.setDocumentType(DocumentType.ChequeBankPaymentPayroll);
cpm.setStatusDate(entity.getDate()); //INFO: cek tarihcesine bordro kesim tarihi gitmeli
if (cheque.getMoney().getCurrency().equals(BaseConsts.SYSTEM_CURRENCY_CODE)) // cpm.getCheque().getMoney().setLocalAmount(cpm.getCheque().getMoney().getValue());
......@@ -164,8 +165,10 @@ public class ChequeToBankPaymentPayrollHomeBean extends EntityBase<ChequeToBankP
chequeAction.changePosition(cpm);
entityManager.merge(cheque);
}
bankTxnAction.saveChequeToBankPaymentPayroll(entity);
}
//txn icin ayrica detaylar satir olarak kontrol ediliyor
bankTxnAction.saveChequeToBankPaymentPayroll(entity);
}
entityManager.flush();
......
......@@ -212,6 +212,10 @@
<f:param name="eid" value="#{chequeHis.sourceId}"/>
<h:outputText value="#{chequeHis.serial}"/>
</s:link>
<s:link view="/finance/chequeToBankPaymentPayrollView.xhtml" propagation="begin" rendered="#{chequeHis.source eq 'ChequeBankPaymentPayroll'}">
<f:param name="eid" value="#{chequeHis.sourceId}"/>
<h:outputText value="#{chequeHis.serial}"/>
</s:link>
</r:column>
<r:column>
......@@ -230,9 +234,10 @@
<h:outputText rendered="#{(chequeHis.source eq 'ChequeAccountPaymentPayroll') and (not empty chequeHis.account)}" value="[#{chequeHis.account.code}] #{chequeHis.account.name}"/>
<h:outputText rendered="#{(chequeHis.source eq 'ChequeFromContactPayroll') and (not empty chequeHis.account)}" value="[#{chequeHis.account.code}] #{chequeHis.account.name}"/>
<h:outputText rendered="#{chequeHis.source eq 'ChequeToBankAssurancePayroll'}" value="#{chequeHis.bankAccount.bankBranch.bank.name} - #{chequeHis.bankAccount.bankBranch.name} - #{chequeHis.bankAccount.accountNo}"/>
<h:outputText rendered="#{chequeHis.source eq 'ChequePaymentPayroll'}" value="#{chequeHis.bankAccount.bankBranch.bank.name} - #{chequeHis.bankAccount.bankBranch.name} - #{chequeHis.bankAccount.accountNo}"/>
<h:outputText rendered="#{chequeHis.source eq 'ChequePaymentPayroll'}" value="[#{chequeHis.contact.code}] #{chequeHis.contact.fullname}"/>
<h:outputText rendered="#{(chequeHis.source eq 'ChequeAccountCollectionPayroll') and (not empty chequeHis.account)}" value="[#{chequeHis.account.code}] #{chequeHis.account.name}"/>
<h:outputText rendered="#{chequeHis.source eq 'ChequeStatusChanging'}" value=""/>
<h:outputText rendered="#{chequeHis.source eq 'ChequeBankPaymentPayroll'}" value="#{chequeHis.bankAccount.bankBranch.bank.name} - #{chequeHis.bankAccount.bankBranch.name} - #{chequeHis.bankAccount.accountNo}"/>
</r:column>
<f:facet name="footer">
<r:datascroller for="positionList" maxPages="5" />
......
......@@ -154,7 +154,8 @@
<s:enumItem enumValue="AccountToBankTransfer" label="#{messages['general.value.DocumentType.AccountToBankTransfer']}"/>
<s:enumItem enumValue="DepositAccount" label="#{messages['general.value.DocumentType.DepositAccount']}"/>
<s:enumItem enumValue="ChequeCollectedAtBankPayroll" label="#{messages['general.value.DocumentType.ChequeCollectedAtBankPayroll']}"/>
<s:enumItem enumValue="PromissoryCollectedAtBankPayroll" label="#{messages['general.value.DocumentType.PromissoryCollectedAtBankPayroll']}"/>
<s:enumItem enumValue="ChequeBankPaymentPayroll" label="#{messages['general.value.DocumentType.ChequeBankPaymentPayroll']}"/>
<s:enumItem enumValue="PromissoryCollectedAtBankPayroll" label="#{messages['general.value.DocumentType.PromissoryCollectedAtBankPayroll']}"/>
<s:enumItem enumValue="ForeignExchange" label="#{messages['general.value.DocumentType.ForeignExchange']}"/>
</h:selectOneMenu>
......@@ -342,6 +343,10 @@
<h:outputText value="#{rowItem.serial}" />
</s:link>
<s:link view="/finance/chequeToBankPaymentPayrollView.xhtml" rendered="#{rowItem.documentType eq 'ChequeBankPaymentPayroll' }" propagation="begin">
<f:param name="eid" value="#{rowItem.documentId}" />
<h:outputText value="#{rowItem.serial}" />
</s:link>
</r:column>
<r:column>
......@@ -392,6 +397,10 @@
<h:outputText value="#{rowItem.reference}" />
</s:link>
<s:link view="/finance/chequeToBankPaymentPayrollView.xhtml" rendered="#{rowItem.documentType eq 'ChequeBankPaymentPayroll' }" propagation="begin">
<f:param name="eid" value="#{rowItem.documentId}" />
<h:outputText value="#{rowItem.reference}" />
</s:link>
</r:column>
<r:column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment