çoğaltma yolu ile üretilen cari fişlerinde cari hesap seçiminde sorun…

… oluyordu, düzeltidi, closes #87. sağ üst köşedeki kısayol menüsünden aktif olan kullanıcının bilgileri düzeltilemiyordu, çözüldü, closes #90. cari hareket raporunda 'cari bazlı' seçeneğinin dışındakiler hata veriyordu, düzeltildi, closes #89. chrome browser da cari seçme sorunu vardı, düzeltildi, closes #88. profil tanımlarında aktif kasa seçme kısmı çalışmıyordu, düzeltildi, closes #91.
seyhanp · Mar 19, 2017 · 2168058 · 2168058
1 parent dd28e13
commit 2168058
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 22 deletions.
diff --git a/app/controllers/admin/Users.java b/app/controllers/admin/Users.java
@@ -339,6 +339,8 @@ public static Result saveRestricted() {
 			model.passwordHash = AuthManager.md5Hash(resModel.password);
 
 			model.update();
+
+			CacheUtils.setUser(model);
 
 			return ok(Messages.get("saved", model.username));
 		}
@@ -348,9 +350,10 @@ public static Result saveRestricted() {
 	public static Result editRestricted() {
 		if (! CacheUtils.isLoggedIn()) return Application.login();
 
+		AdminUser user = CacheUtils.getUser();
 		UserData data = new UserData();
-		data.title = CacheUtils.getUser().title;
-		data.email = data.email;
+		data.title = user.title;
+		data.email = user.email;
 
 		return ok(restricted_form.render(form(UserData.class).fill(data)));
 	}

diff --git a/app/controllers/contact/reports/TransReport.java b/app/controllers/contact/reports/TransReport.java
@@ -110,6 +110,15 @@ public static Map<String, String> reportTypes() {
 			return options;
 		}
 
+		public static Map<String, String> showTypes() {
+			LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();
+
+			options.put("Summary", Messages.get("report.show.summary"));
+			options.put("Detailed", Messages.get("report.show.detail"));
+
+			return options;
+		}
+
 	}
 
 	private static String getQueryString(Parameter params) {

diff --git a/app/controllers/global/Profiles.java b/app/controllers/global/Profiles.java
@@ -130,6 +130,7 @@ public static Result save() {
 		} else {
 
 			ProfileData modelData = filledForm.get();
+			modelData.gnel_safe = modelData.safe; 
 
 			GlobalProfile model = new GlobalProfile();
 			model.id = modelData.id;
@@ -194,6 +195,7 @@ public static Result edit(Integer id) {
 				flash("error", Messages.get("not.found", Messages.get("profile")));
 			} else {
 				ProfileData modelData = StringUtils.fromJson(model.jsonData, ProfileData.class);
+				modelData.safe = modelData.gnel_safe;
 				modelData.id = model.id;
 				modelData.name = model.name;
 				modelData.description = model.description;

diff --git a/app/models/AbstractBaseTrans.java b/app/models/AbstractBaseTrans.java
@@ -85,7 +85,7 @@ public abstract class AbstractBaseTrans extends BaseModel {
 
 	@Transient public Module refOldModule;
 	@Transient public Contact refContact;
-	@Transient public Safe refSafe;
+	@Transient public Safe refSafe = Profiles.chosen().safe;
 	@Transient public Bank refBank;
 
 	@Transient public ContactTransSource refContactTransSource;

diff --git a/app/models/temporal/ProfileData.java b/app/models/temporal/ProfileData.java
@@ -129,6 +129,7 @@ public class ProfileData {
 	public Integer gnel_pageRowNumber;
 	public GlobalTransPoint gnel_transPoint;
 	public GlobalPrivateCode gnel_privateCode;
+	public Safe safe; //it is used for setting gnel_safe field
 	public Safe gnel_safe;
 	public TransListingType gnel_listingType;
 	public Boolean kasa_isSearchFormShowed;

diff --git a/app/views/contacts/reports/trans_report.scala.html b/app/views/contacts/reports/trans_report.scala.html
@@ -52,4 +52,10 @@
 		'_label -> Messages("report.type")
 	)
 
+	@select(_form("showType"),
+		options(contact.reports.TransReport.Parameter.showTypes),
+		'class -> "input-small",
+		'_label -> Messages("report.show")
+	)
+
 }
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import play.Project._
 
 name := "seyhan"
 
-version := "1.0.17"
+version := "1.0.18"
 
 libraryDependencies ++= Seq(
   jdbc,

diff --git a/public/javascripts/autocomplete/contact.js b/public/javascripts/autocomplete/contact.js
@@ -81,8 +81,10 @@ $(document).ready(function() {
 	        $(baseID + '_inv').show();
 	        $(document).trigger('selectContactEvent', row);
 
-	        $('#excCode').val(row.excCode);
-	        setRate();
+	        if (typeof setRate == 'function') { 
+		        $('#excCode').val(row.excCode);
+		        setRate();
+	        }
 
 	        if (isContinuouslyAddedForContact)
 	        	return '';

diff --git a/public/javascripts/exchange_man.js b/public/javascripts/exchange_man.js
@@ -27,12 +27,18 @@ function findEquivalent() {
 }
 
 function setRate() {
-	if (isBuying) {
-		$('#excRate').val(exchange_rates[$('#excCode').val()].buying.roundup(5));
-	} else {
-		$('#excRate').val(exchange_rates[$('#excCode').val()].selling.roundup(5));
+	var code = "";
+	if ($('#excCode')) {
+		code = $('#excCode').val();
+	}
+	if (code && code != "") {
+		if (isBuying) {
+			$('#excRate').val(exchange_rates[code].buying.roundup(5));
+		} else {
+			$('#excRate').val(exchange_rates[code].selling.roundup(5));
+		}
+		findEquivalent();
 	}
-	findEquivalent();
 }
 
 $('#excCode').keyup(function(event) {
@@ -67,12 +73,18 @@ function findRefEquivalent() {
 }
 
 function setRefRate() {
-	if(isBuying) {
-		$('#refExcRate').val(exchange_rates[$('#refExcCode').val()].buying.roundup(5));
-	} else {
-		$('#refExcRate').val(exchange_rates[$('#refExcCode').val()].selling.roundup(5));
+	var code = "";
+	if ($('#excCode')) {
+		code = $('#refExcCode').val();
+	}
+	if (code && code != "") {
+		if(isBuying) {
+			$('#refExcRate').val(exchange_rates[code].buying.roundup(5));
+		} else {
+			$('#refExcRate').val(exchange_rates[code].selling.roundup(5));
+		}
+		findRefEquivalent();
 	}
-	findRefEquivalent();
 }
 
 $('#excEquivalent').change(function(){

diff --git a/reports/contact/TransReportXBasedSummary.jrxml b/reports/contact/TransReportXBasedSummary.jrxml
@@ -47,7 +47,7 @@ $P!{TRANS_POINT_SQL}
 $P!{PRIVATE_CODE_SQL}
 where 1=1
 $P!{QUERY_STRING}
-group by $P!{GROUP_FIELD}, c.name, c.phone, c.mobile_phone, t.exc_code
+group by $P!{GROUP_FIELD}, c.name, c.phone, c.mobile_phone, t.exc_code, t.trans_dir
 order by $P!{GROUP_FIELD}, c.name, c.phone, c.mobile_phone, t.exc_code, t.trans_dir]]>
 	</queryString>
 	<field name="group_field" class="java.lang.Object"/>
@@ -242,7 +242,7 @@ order by $P!{GROUP_FIELD}, c.name, c.phone, c.mobile_phone, t.exc_code, t.trans_
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font fontName="DejaVu Serif" size="8" isBold="false" pdfFontName="Helvetica" pdfEncoding="Cp1254" isPdfEmbedded="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$V{SUM_DEBT}.doubleValue() - $V{SUM_CREDIT}.doubleValue()]]></textFieldExpression>
+					<textFieldExpression class="java.lang.Double"><![CDATA[$V{SUM_DEBT}.doubleValue() - $V{SUM_CREDIT}.doubleValue()]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
 					<reportElement key="textField-2" x="521" y="2" width="12" height="14" uuid="34140b3d-f42b-4e26-a726-b7402fe44c1e"/>
@@ -255,7 +255,7 @@ order by $P!{GROUP_FIELD}, c.name, c.phone, c.mobile_phone, t.exc_code, t.trans_
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="DejaVu Serif" size="8" isBold="false" pdfFontName="Helvetica" pdfEncoding="Cp1254" isPdfEmbedded="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[($V{SUM_DEBT}.doubleValue() - $V{SUM_CREDIT}.doubleValue() > 0 ? $R{symbol.debit} :
+					<textFieldExpression class="java.lang.String"><![CDATA[($V{SUM_DEBT}.doubleValue() - $V{SUM_CREDIT}.doubleValue() > 0 ? $R{symbol.debit} :
     ($V{SUM_DEBT}.doubleValue() - $V{SUM_CREDIT}.doubleValue() < 0 ? $R{symbol.credit} : ""))]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
@@ -425,7 +425,7 @@ order by $P!{GROUP_FIELD}, c.name, c.phone, c.mobile_phone, t.exc_code, t.trans_
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="DejaVu Serif" size="8" isBold="false" pdfFontName="Helvetica" pdfEncoding="Cp1254" isPdfEmbedded="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sumDebt}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{sumDebt}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00" isBlankWhenNull="true">
 				<reportElement key="textField-5" x="390" y="0" width="59" height="15" isPrintWhenDetailOverflows="true" uuid="4839c61e-ecc9-41b8-b1cd-db8f680e896c"/>
@@ -438,7 +438,7 @@ order by $P!{GROUP_FIELD}, c.name, c.phone, c.mobile_phone, t.exc_code, t.trans_
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="DejaVu Serif" size="8" isBold="false" pdfFontName="Helvetica" pdfEncoding="Cp1254" isPdfEmbedded="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sumCredit}]]></textFieldExpression>
+				<textFieldExpression class="java.lang.Double"><![CDATA[$F{sumCredit}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement key="textField-2" x="59" y="0" width="158" height="15" uuid="6cdb39a5-8204-44a2-b215-554be3c62e72"/>

diff --git a/version.txt b/version.txt
@@ -1,4 +1,11 @@
-sürüm 1.0.17 - 16/01/2017
+sürüm 1.0.18 - 20/03/2017
+	- çoğaltma yolu ile üretilen cari fişlerinde cari hesap seçiminde sorun oluyordu, düzeltidi
+	- sağ üst köşedeki kısayol menüsünden aktif olan kullanıcının bilgileri düzeltilemiyordu, çözüldü
+	- cari hareket raporunda "cari bazlı" seçeneğinin dışındakiler hata veriyordu, düzeltildi
+	- chrome browser da cari seçme sorunu vardı, düzeltildi
+	- profil tanımlarında aktif kasa seçme kısmı çalışmıyordu, düzeltildi
+
+sürüm 1.0.17 - 16/01/2017
 	- stok ve cari kartları için içe aktarım yapısı getirildi
 	- yazıcıdan dökülen faturada iskonto hatalı olarak genel toplama yansıyordu, düzeltildi
 	- cari tanıtımdaki para birimine girilen değerin hareketlerde seçili olarak getirilmesi sağlandı