merge conflict fixed

2026-05-19 21:19:19 +00:00 · 2014-01-08 19:42:17 +05:30
parent 5c119a7e95 dbf5e54eab
commit efc2a45835
26 changed files with 200 additions and 155 deletions
--- a/accounts/doctype/pos_setting/pos_setting.js
+++ b/accounts/doctype/pos_setting/pos_setting.js
@@ -7,7 +7,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){
 	});
 	
 	cur_frm.set_query("selling_price_list", function() {
-		return { filters: { buying_or_selling: "Selling" } };
+		return { filters: { selling: 1 } };
 	});
 }