From 60b32b9b8e759311548758018ffe13c04c30b280 Mon Sep 17 00:00:00 2001 From: hns Date: Wed, 9 Feb 2022 12:48:41 +0530 Subject: [PATCH] report update2 --- .../variant_mapping.cpython-38.pyc | Bin 1008 -> 1013 bytes .../variant_mapping/variant_mapping.js | 1 - .../variant_mapping/variant_mapping.py | 2 +- .../__pycache__/audit_report.cpython-38.pyc | Bin 8016 -> 8022 bytes .../report/audit_report/audit_report.py | 6 +++--- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/smart_service/transactions/doctype/variant_mapping/__pycache__/variant_mapping.cpython-38.pyc b/smart_service/transactions/doctype/variant_mapping/__pycache__/variant_mapping.cpython-38.pyc index 6e86c6899f4b2c2c43349ff4247b9eb6aa1a7f82..60e7f9157ea11df64db95cb845a64bc1e9ba930b 100644 GIT binary patch delta 60 zcmeys{*|3Cl$V!_0SF>9n3EWoH}WYmF OIC=6#Ci%%s%mrQa(3i(ATsYMD&l?us4sfi_- L`FWGsnco2b$t@AC diff --git a/smart_service/transactions/doctype/variant_mapping/variant_mapping.js b/smart_service/transactions/doctype/variant_mapping/variant_mapping.js index 3e6309f..2852380 100644 --- a/smart_service/transactions/doctype/variant_mapping/variant_mapping.js +++ b/smart_service/transactions/doctype/variant_mapping/variant_mapping.js @@ -4,7 +4,6 @@ cur_frm.fields_dict['variant'].get_query = function(doc, cdt, cdn) { return { query:"smart_service.transactions.doctype.variant_mapping.variant_mapping.variant", - // filters: {'doc': doc.name} } } diff --git a/smart_service/transactions/doctype/variant_mapping/variant_mapping.py b/smart_service/transactions/doctype/variant_mapping/variant_mapping.py index e83b24f..5fde3e8 100644 --- a/smart_service/transactions/doctype/variant_mapping/variant_mapping.py +++ b/smart_service/transactions/doctype/variant_mapping/variant_mapping.py @@ -12,4 +12,4 @@ def variant(doctype, txt, searchfield, start, page_len, filters): #return frappe.db.sql("""SELECT name,variant,vehicle,vehicle_segment,active_status FROM _d6463952657fa86c.tabVariant order by creation desc""") return frappe.db.sql(""" select name,variant,vehicle,vehicle_segment,active_status FROM _d6463952657fa86c.tabVariant where - (name like "%%%(txt)s%%" or variant like "%%%(txt)s%%") limit %(start)s, %(page_len)s order by creation"""%{'txt': txt, 'start': start, 'page_len': page_len}) + (name like "%%%(txt)s%%" or variant like "%%%(txt)s%%") order by creation desc limit %(start)s, %(page_len)s """%{'txt': txt, 'start': start, 'page_len': page_len}) diff --git a/smart_service/transactions/report/audit_report/__pycache__/audit_report.cpython-38.pyc b/smart_service/transactions/report/audit_report/__pycache__/audit_report.cpython-38.pyc index 801ff6ae01e9fe638c87562752982eb20c48903d..8a93756bcaa1b7b9aa6d24c59091ff9cadbbb4b1 100644 GIT binary patch delta 1396 zcmaKs&2Jk;6u>>{di~MZvD3s}JF&Y}0_`H@s}xb7HI$}pP>li#ZAH?`+IlBp6UV!} zUAKxU$_d1=;z=O*54bh51V^qMdT1{k7O5vV_zys;5H!5EwwxA4>}r0ReQ(~^%$t2w z`L&X|mP#cf^jxuz+`hV(vSK3WKx{Ic7KDQ#(7hP~& z*|gvdS{SHi-M8<^AhsoU7VSFTN@c|iIw?cUbiPY%irqnQILGmHHcH=hU~9eM+^u=O z=}VX|2XCk-A3oa2>6SZx}ve#{CwZFx=u}k>#NDjXmd%E`G z1_g-^z^O~C1+q&e>>G(gx8fiLog;9`u*~3E+EIPQmo8k!-^M4z68=4|aaGs3hF(>Q z=YStX!EA0w2#bA>bjEnEzO%gUHO4_0KB8W^XLxp%@hYQ=n>ka=~H{3HS23{7JHZOv8&4A|fu*A|v1=KFOay!7Xg4|5H1j(~4>@6yDU1 zi&J<{D-plfzEHzLHGHY?=0cVHKze`?o*9JSX?QG;2!-Cbn4~c#z`*;34V9zA6#i4t zinnNLC_$9Ez+6~OxFGLbHybSpXK=2li3MCLmWb=cjot8OQk(TIAiT@7FvB9xbOxW1 zA%Y{W;~GO?vFIk_KN+4T*$BW<$}ng$Q?Ty8fDlr!6-0h7_*Fd26r2rV(|Gx LnBr;tv%K~%@mn@u delta 1410 zcmZux&2Jl35cjhkekhNM3&&di8B|<0iiu0kb22~P=VSo^BkNI#n%2b?>DpaX6F6g z{}iw>5NgbKkq*~u)iV)y&Z24f{TI@CmjA$xC< zyb}mvVtvOC#I~M-DseT%c^rfjz*%BcXg_5bzrEuLox!W<)01Ixn|pO0a5#$44ymi2 zCma*rP#L)qSPw*)+!8x=%a9*wBWy~#n$D)WUupN)UVn3V^S@2Q;fF44wQToc(+_wc z;2e5(GwYqr+F{L^qndlKomTLOaGIwig3Fj~|HZ+*``I-%Dxc@8b2<`XqT`uVuA0ywT%n-;bYPK| zY9>*W!;<`LWQI-4A4d!}-JKkL!3u9vKpmlxZf?7#)v|=S`=y-EE$5CG(5#DqTedGh z&pjJFHa+=8zOZm?P1)2~j!IA`O6|ic0d=uEP+Jd#2g~xWd?j&>XzHkRhnfJ@R@`?X z2nT>WZ2?81uOsOBUW2a_@fyL=K6GBae&@-0mtc-yMS2C!F3DdD_Yv#Gn``}-zGc0% z@kZLXYuV-rZ7~kRltIB6vd$ws!N*S_L|BRqvn+%2@@etP9tm7eoGOz3hANdFZ)guV zSlkJ2^`zhTH!|oz5>*?V-1`FN{~aGcix7!MS^xicDg_th*QHMrYJf%g%Gg4D1%u@M zQcgY^E3u36@mPD3DpbeQNShtcwhRz>NX&PP_L$~~?kdtfWGMkZh zxxJ!pILftmk>M&?s_Zec)FH2;rL!>Rxt<;cgZK@C6EmEZ6O{^^?JiWVF?LpdGQK#d zZih*+tMcdZ>KvuRZw21Nj;}r(`T*P|w?%M|yh+y!EZ6a2i>S9`xmvz_8_oU4v{r>K zlSSIzO@I6d6{oV@p>-D5?{Pn<-8hsyyd%Bpgsz09^q9x6aG--973f{91ZYIXZB!)8 z%O9$Lv__GD7(raQ4A*Iev9<`HK;%mVIRZ)sDlHuyqzOs{Qv}llmk3B*K*tOh31$dp J 0: others = others[0] @@ -162,7 +162,7 @@ def appendToDic3(mapData, procSize, j, indent, header, procedure): procedure = procedure[:-2]+c['lang_code'] colmodified = c['lang_code'] + '_modified' other_step_count = frappe.db.sql( - '''select count(distinct(step_name)) as count, modified as {1} from {0}.tabProcedure_Details where parent= '{2}' group by(procedure_name) order by idx;'''.format(current_db_name,colmodified,procedure), as_list=True) + '''select count(distinct(step_name)) as count, modified as {1} from {0}.`tabProcedure_Details` where parent= '{2}' group by(procedure_name) order by idx;'''.format(current_db_name,colmodified,procedure), as_list=True) for l in other_step_count: list2.append(l)