Commit 4ea9a7d6 by Volkan Uygun

refs #1860 Yerel/Döviz kodu ile çalışılmasında rapora gelen yanlış döviz tipi…

refs #1860 Yerel/Döviz kodu ile çalışılmasında rapora gelen yanlış döviz tipi düzeltildi. Rapor düzeltildi. 
Eksik dil karşılıkları eklendi. 
Eksik sürüm no bilgisi düzeltildi.
Yanlış yerde duran rapor dosyası silindi.
parent d08d690d
......@@ -4,7 +4,7 @@
<property name="ireport.encoding" value="UTF-8"/>
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="375"/>
<property name="ireport.y" value="214"/>
<import value="net.sf.jasperreports.engine.*"/>
<import value="java.util.*"/>
<import value="net.sf.jasperreports.engine.data.*"/>
......@@ -23,6 +23,7 @@
<parameter name="pCompanyEmail" class="java.lang.String" isForPrompting="false"/>
<parameter name="pCompanyWeb" class="java.lang.String" isForPrompting="false"/>
<parameter name="pProductLabel" class="java.lang.String"/>
<parameter name="pReportCurrency" class="java.lang.String"/>
<queryString>
<![CDATA[]]>
</queryString>
......@@ -161,7 +162,7 @@
<textElement textAlignment="Left" verticalAlignment="Middle">
<font fontName="Lucida Sans" size="10" pdfEncoding="Cp1254"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[($F{totallcyval}.compareTo( BigDecimal.ZERO ) < 0 ) ? $P{totallcyval}.concat(" " + $F{currency}.concat( " Alacak " )) : $P{totallcyval}.concat(" " + $F{currency}.concat( " Borç " ))]]></textFieldExpression>
<textFieldExpression class="java.lang.String"><![CDATA[($F{totallcyval}.compareTo( BigDecimal.ZERO ) < 0 ) ? $P{totallcyval}.concat(" " + $P{pReportCurrency}.concat( " Alacak " )) : $P{totallcyval}.concat(" " + $P{pReportCurrency}.concat( " Borç " ))]]></textFieldExpression>
</textField>
<staticText>
<reportElement key="staticText-16" x="23" y="41" width="504" height="13"/>
......@@ -460,7 +461,7 @@ Kaşe / İmza
<textElement textAlignment="Left" verticalAlignment="Middle">
<font fontName="Lucida Sans" size="10" pdfEncoding="Cp1254"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA["................................................ " + $F{currency}]]></textFieldExpression>
<textFieldExpression class="java.lang.String"><![CDATA["................................................ " + $P{pReportCurrency}]]></textFieldExpression>
</textField>
</band>
</summary>
......
......@@ -92,7 +92,7 @@ INSERT INTO `OPTIONS` (`ID`, `USER_NAME`, `OP_VALUE`, `OPKEY`) VALUES(105, 'SYST
INSERT INTO `OPTIONS` (`ID`, `USER_NAME`, `OP_VALUE`, `OPKEY`) VALUES(106, 'SYSTEM', 'NoControl', 'systemSettings.control.StockShelfLife');
INSERT INTO `OPTIONS` (`ID`, `USER_NAME`, `OP_VALUE`, `OPKEY`) VALUES(107, 'SYSTEM', 'NoControl', 'systemSettings.control.PriceChangeControl');
INSERT INTO `OPTIONS` (`ID`, `USER_NAME`, `OP_VALUE`, `OPKEY`) VALUES(108, 'SYSTEM', '2.0.3', 'base.programVersion');
INSERT INTO `OPTIONS` (`ID`, `USER_NAME`, `OP_VALUE`, `OPKEY`) VALUES(108, 'SYSTEM', '2.1.0', 'base.programVersion');
INSERT INTO `OPTIONS` (`ID`, `USER_NAME`, `OP_VALUE`, `OPKEY`) VALUES(109, 'SYSTEM', 'false', 'base.isUnderConstruction');
INSERT INTO `OPTIONS` (`ID`, `USER_NAME`, `OP_VALUE`, `OPKEY`) VALUES(110, 'SYSTEM', 'MK', 'serial.cards.Expense');
INSERT INTO `OPTIONS` (`ID`, `USER_NAME`, `OP_VALUE`, `OPKEY`) VALUES(111, 'SYSTEM', 'IK', 'serial.cards.Discount');
......
......@@ -2588,6 +2588,12 @@ optionEditor.systemSettings.control.StockLevel=Stock Level
optionEditor.systemSettings.control.StockShelfLife=Stock Shelf Life
optionEditor.systemSettings.foreignInvoicingEnabled=Foreign Invoicing Enabled
optionEditor.systemSettings.value.GeneralExpenseContact=General Expense Contact Code
optionEditor.systemOption.CountryCode=Country Code
optionEditor.systemOption.CountryName=Country Name
optionEditor.systemOption.CountryShortName=Country Short Name
optionEditor.systemOption.CurrencyCode=Currency
optionEditor.systemOption.CurrencydecCode=Decimal Currency
optionEditor.systemOption.Locale=Language Code
optionPane.caption.allstar=All Settings
optionPane.caption.amountLimitationOptionPane=Amount Limitation Options
......
......@@ -2612,6 +2612,12 @@ optionEditor.systemSettings.control.StockLevel=Stok Seviyesi
optionEditor.systemSettings.control.StockShelfLife=Stok Raf \u00d6mr\u00fc
optionEditor.systemSettings.foreignInvoicingEnabled=D\u00f6vizli Fatura Kesilebilsin
optionEditor.systemSettings.value.GeneralExpenseContact=Genel Gider Carisi Kodu
optionEditor.systemOption.CountryCode=Tan\u0131ml\u0131 \u00dclke Kodu
optionEditor.systemOption.CountryName=Tan\u0131ml\u0131 \u00dclke
optionEditor.systemOption.CountryShortName=Tan\u0131ml\u0131 K\u0131sa \u00dclke Ad\u0131
optionEditor.systemOption.CurrencyCode=Tan\u0131ml\u0131 Para Birimi
optionEditor.systemOption.CurrencydecCode=Tan\u0131ml\u0131 Para Ondal\u0131k Birimi
optionEditor.systemOption.Locale=Tan\u0131ml\u0131 Dil Kodu
optionPane.caption.allstar=T\u00fcm Ayarlar
optionPane.caption.amountLimitationOptionPane=Tutar K\u0131s\u0131tlama Ayarlar\u0131
......
......@@ -92,6 +92,7 @@ public class ReconciliationContactReportBean {
" inner join CONTACT cn on cn.id = ft.contact_id "+
" where ft.isActive=true ";
//dovizli
} else {
query="select cn.fullname, cn.company as company, ft.ccy , "+
" sum(ft.lcyval * case when ft.finance_action = 1 then -1 else 1 end) as totallcyval"+
......@@ -99,6 +100,7 @@ public class ReconciliationContactReportBean {
" inner join CONTACT cn on cn.id = ft.contact_id "+
" where ft.isActive=true ";
//yerel karsilik
}
//log.info("asil sorgu: #0", query);
......@@ -112,12 +114,12 @@ public class ReconciliationContactReportBean {
if(getCurrency() != null) {
query = query.concat(" and ft.ccy = :currency");
log.info("dovizli sorgu: #0", query);
log.debug("dovizli sorgu: #0", query);
}
query = query.concat(" group by cn.name,cn.company");
log.info(" tum sorgu: #0", query);
log.debug(" tum sorgu: #0", query);
Query myQuery = entityManager.createNativeQuery(query);
......@@ -137,7 +139,7 @@ public class ReconciliationContactReportBean {
List l=myQuery.getResultList();
if(l.size() > 0){
log.info(" sonuc single: #0", l);
log.debug(" sonuc single: #0", l);
return new ReconciliationContactModel((Object[])myQuery.getSingleResult());
}else{
ReconciliationContactModel rcm= new ReconciliationContactModel();
......@@ -145,7 +147,7 @@ public class ReconciliationContactReportBean {
rcm.setFullname(contact.getName());
rcm.setTotallcyval(BigDecimal.ZERO);
rcm.setCurrency(currency);
log.info(" sonuc rcm: #0", rcm);
log.debug(" sonuc rcm: #0", rcm);
return rcm;
}
......@@ -170,8 +172,14 @@ public class ReconciliationContactReportBean {
params.put("pCompanyEmail", optionManager.getOption("company.Email").getAsString());
params.put("pCompanyWeb", optionManager.getOption("company.Web").getAsString());
params.put("pLogopath", systemProperties.getProperty("report.logo.file") );
params.put("pProductLabel", SystemConfiguration.PRODUCTLABEL);
params.put("pProductLabel", SystemConfiguration.PRODUCTLABEL);
if(getCurrency() != null){
params.put("pReportCurrency", getCurrency());
} else {
params.put("pReportCurrency", optionManager.getOption("systemOption.CurrencyCode").getAsString());
}
BigDecimal temp = getReconciliation().getTotallcyval();
if (temp.compareTo(BigDecimal.ZERO) < 0){
temp = temp.negate();
......@@ -190,7 +198,9 @@ public class ReconciliationContactReportBean {
params.put("person", 1);
}
/**
* printTemplate (sablonlar) altindaki dosyayi kullanir. Yazi icerigi degistirilebilsin diye.
*/
List<ReconciliationContactModel> resultList = new ArrayList<ReconciliationContactModel>();
resultList.add(getReconciliation());
......
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