From 44038538288215e3638a9e6cde0a879d730bbc8c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sat, 27 Feb 2016 16:24:34 +0530 Subject: [PATCH] [minor] fix notification for material request, splash icon, cleanup project form layout --- erpnext/projects/doctype/project/project.json | 263 ++++++------------ erpnext/public/images/splash.png | Bin 16595 -> 11328 bytes erpnext/startup/notifications.py | 5 +- .../stock_reconciliation.py | 2 +- 4 files changed, 91 insertions(+), 179 deletions(-) diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json index e1a60a267a4..af2d71edc63 100644 --- a/erpnext/projects/doctype/project/project.json +++ b/erpnext/projects/doctype/project/project.json @@ -88,29 +88,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "column_break_5", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -137,6 +114,29 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "column_break_5", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -163,29 +163,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "section_break_12", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -211,29 +188,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "column_break_11", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -262,14 +216,14 @@ { "allow_on_submit": 0, "bold": 0, - "collapsible": 0, + "collapsible": 1, "fieldname": "customer_details", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "", + "label": "Customer Details", "length": 0, "no_copy": 0, "oldfieldtype": "Section Break", @@ -434,14 +388,14 @@ { "allow_on_submit": 0, "bold": 0, - "collapsible": 0, + "collapsible": 1, "fieldname": "section_break0", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "", + "label": "Notes", "length": 0, "no_copy": 0, "oldfieldtype": "Section Break", @@ -484,13 +438,14 @@ { "allow_on_submit": 0, "bold": 0, - "collapsible": 0, + "collapsible": 1, "fieldname": "section_break_18", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "label": "Start and End Dates", "length": 0, "no_copy": 0, "permlevel": 0, @@ -603,17 +558,19 @@ { "allow_on_submit": 0, "bold": 0, - "collapsible": 0, - "fieldname": "section_break_26", + "collapsible": 1, + "fieldname": "project_details", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, + "label": "Costing and Billing", "length": 0, "no_copy": 0, + "oldfieldtype": "Section Break", + "options": "icon-money", "permlevel": 0, - "precision": "", "print_hide": 0, "print_hide_if_no_value": 0, "read_only": 0, @@ -633,7 +590,7 @@ "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 1, - "label": "Estimated Costing", + "label": "Estimated Cost", "length": 0, "no_copy": 0, "oldfieldname": "project_value", @@ -649,102 +606,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "column_break_22", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "company", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Company", - "length": 0, - "no_copy": 0, - "options": "Company", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "cost_center", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Default Cost Center", - "length": 0, - "no_copy": 0, - "options": "Cost Center", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "project_details", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "", - "length": 0, - "no_copy": 0, - "oldfieldtype": "Section Break", - "options": "icon-money", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -795,6 +656,54 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "company", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Company", + "length": 0, + "no_copy": 0, + "options": "Company", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "fieldname": "cost_center", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Default Cost Center", + "length": 0, + "no_copy": 0, + "options": "Cost Center", + "permlevel": 0, + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_on_submit": 0, "bold": 0, @@ -870,14 +779,14 @@ { "allow_on_submit": 0, "bold": 0, - "collapsible": 0, + "collapsible": 1, "fieldname": "margin", "fieldtype": "Section Break", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, "in_list_view": 0, - "label": "", + "label": "Margin", "length": 0, "no_copy": 0, "oldfieldtype": "Column Break", @@ -978,7 +887,7 @@ "issingle": 0, "istable": 0, "max_attachments": 4, - "modified": "2016-02-03 01:11:27.184994", + "modified": "2016-02-19 05:44:20.345170", "modified_by": "Administrator", "module": "Projects", "name": "Project", diff --git a/erpnext/public/images/splash.png b/erpnext/public/images/splash.png index 36cc3c4c30aa36fa668a644358e528d3a24881d0..45255937aea180698dd59a993b54ddae24872242 100644 GIT binary patch literal 11328 zcmeHtbx>VflkY)7a1HM62X}{qYjAgWIk-b`36kK15G({I=)r>q3GSAJK(OGhvvcpA znLGE*S2cgUSFc{xJ5{Il+P%7WukPL5YxS>ooQ9e_1}X_E2n51VRDfs#*K-gEP8t~r z7%`*dk^vV)J1JEu5UB1Y+MUG{;GW7#K~oh33Sa<%!d`$tHvlPY8wB#^1c7$VK_KBQ z5Qxw{5B6LXm_Tt?Fz^C_(C~i$;XpZgL?94?f`hg`R9{s^*vicXY+>zYX#@6iaR<0T zAW=VIVCZ54wV?8Iad!0*_7kJ|gF_e?|0Z+LQ2oIIbrPe|SJj}Bar3mH;sf)7IcdaE zsi>$#J*{npH6e0;i34|HH1<%ayD$fbudgrImj~?TX~)4OBqYSa$<4vd%?@y|d-=OU zE&SMBy=eb@$iF`aV&i4y>EI4^aC4>l{ag!6H*csI4b5*w|MB~4oi6VGp~%(iFRK9i zIQ%T!Ik>=_9RHmV)WP;Ym-kJICLIf7>Cf?&)9yIQX|4#R2yJh4xQ=O&c#aXYb$aI<5{-aqhoF{z3ky zl#H8;yQhtp*KaL+e~J8^_Ba0DZW8{(4t6|Dng=U+VeW%wLkC9KU1jZ?X4hVE;h{B3m34@c6%Hi8yNgydM+9q)sn;- zyBmI6W0S!KhyhIl#P$vz{skn>`i1A0DJ{@urI^`e+u`}y+349BbbMv!GXDcg@a@3i zn;JLaOP}JHG`;nK}c9}DJFLKD{4v2vPx+K zG8#!ut*5b)!`M{iTDpa7m^f7B

Ze8|0K3<_Zmh7~nbsN0Y*hsIdD=hbch@P`?ZM z-=Kb?on$1E@Cl#8RLUu>JjCY!d$GZw*rz$LoHnraOhK(5TTfPTaD1sKtZk z*RlXFnQ7>xrV_)e*?xik~gI z=+fwNkZh#v$WfTdMv%=V^J9j&IX9`AKMMI38XPYbmB7H-Sfi7;Lz>81)9Zz~G?Fm5 zp>c7%Yy)|FZJHHk$Xi@wNlI#}3lpXNikc=b_$qL&tF6m5zsUi;azoS`u;)qf@)Mdu zm-52l&7!mo{cTDp-VJicix84`dYGyEuc~PIBxU+tR@p3!JHh;i=7aM-cb z6_!otZMe!{7|1$;5W+Y|k{G`+2h&J9!;g;PbdmDF%TcQDl8r-WwYDo%`Yb8a10@CfPGAllFU(hU2>81vJ))awp@N1)=Y6K&j$BiJ>Mb9iS zv|5M_PVzH7In@w_Co*$e`09GeE)H#{uB7I>kg>X@Q;~AXa*idm9mudnd|N|xeqeIY z`Jj|JOQLDji)4#6!Z)c=4P`OuiJGcGB1@59K8?E*su1`v_?o~;O?T`khZ8`&D zqg^G0@w4d|&>3NXu>-K$tb6ear;w(X`798ltRDeVbWxP$B!y6cfsAiS zu@;4N;{rLa%o4Fk1@8e=jln3o4QludDoITvO`K6AoLDrV@_^}xv2bb;;nJ4U;?4PE zC5?fy;X(b`FE)%G7-eW9ew0G|E*(~!jHWmsgUBWoR@_uflZ8QpO$d}RV+C#s8gmqQ zx<-2Z9%tp;;3m31Pli0%-pk3SbKgg;!|rOw!VkUD)s-@Z&VNF~6~ zBU5R>lS;t8qM5$(c}`q0pRH4EUt_mOe)Roj89%BU8?dfmI!H58RB94Q-vN#nBAQq1oy$<=~A zM!#x>6$%&e6<4qBRb!jWcDLx*#qE#qDY}^D7xT*##b@b+(I=R2d)ecL zdhZQW_sbzlf*Q;AxkA1szob69!-8aR;5n@3C>w$`k3-UDj=vKdIY)!)WbLIOPcdUh3plvlstp%* zZp7$`fy}UWPkP2`$UnX7vihMd_Z8x-_|^-XRqEA}MwhlB$JL4FZObl&#}nM_{&clO zOpHL3tJy2H7p{)IkEp&}c1vJ;&@46)X;kQ~&tl{@8(;F0k9((Q+C?ld_C(a5PCHBZ zvG9J*27V4&ws-Ne$Xm{TbmCL`lZPZ6Alc+NdETAiFm9NJqczNpHPAa%^Yp3-7}xaR z$h^NHSnbma?e%sy47^{4td8f@GDtAc;PLmEm66r@>Un8QBfu3ZCM5{E&zUL#sUgJr?5qGtfV3kqVzq3-H>i^z+1(;edxC7 z@dd}Y;bg#sP#E)KHo|-wwKd`-aPBDjHlP9NHUz4SQ$;i}E&Tt4Rw_z-n)5P)QMNRV z7jW(rvJr)ZOF4VZTjWLBa@w!~DoD32@W5QB7=K!L96$+e7y%3N7(}KAqJB&ZRI!)k zq_ks@bm@#^0?DvqFbLZXFWeD0Bvm(&ScSw%!U3y>2Oaa{yypi-jul*6naI!n&R7;_ zXlTW`-gn%6g<&;p&=nCav6k)I5j{)v-91E^-OWTaHhRv!BqCeIFHM-(SUDNL#=n2h zRLYqwmQt?!Cl%bF$M{{qJyCt&>dC$D_lcntj&`xWcBvPL<1vQ*hp980{UT6Dv4GgK z!^6&Z3@jEA3W?}MzK=DZ^E?FR8PG$H-39%pg1?f@%s?YULwXzxnh$9APW zyTxXCW=3+DK11!)NH+X}m&*RhVY}9k3lU@7*6NF($Qi0r)8N6gT^-<5W>P`GFM1w52ISBw#-4GdFgdI%R5) z3?!M-_tb^CGKt2B&b#RSmNlA#;T9TF%TDcWKHFN9C1W`nb>D3v&ikFOUn0_H3aOR* zXchC3E0cIMd5rDzN}9`N=o-bmpPvi$^bs36Oq18#!0R}`DeSUT36g&7a4T@ilGfB~ z@&V%RsD_75ktM+B`+0J~e6K zma_Q<6+XSpuYX4Z*@eGWbu_s0^Ty3NO^u2-hPt_nE(TU{`&YedRlqFNhSx+x^W|DJ z^2xFLE6nvltwUvww-`luIk8KHDs+wH=U;!ozmVFCG5BHd5i(afN3K!TxS7x30h_?Rkyee)viYS~RTncS;wWuZJO@YOI7oqC;^^`0P4x8>dB=XD;R80xdY0xFQY z9bji_ZgbJ1_y}^b#-#Js#5aZP{Tzpnjm*G$(UdeZRN-qc$$jfob23loy}3ul`P8nV z5y@hdaRQG#P7(xfT!smvCty6x;>$oLM!`Xj0V$GWGTzX@>qG*jm`|ra5jWf&$j@)? z?>J~Q_<)g)md+^C|AdjcVmM1a`b^CYg|_=<2!m5GpENg7#B_Qnk+l6iGJNIBmD==~ z);i{2YA8+XCG?{cN#sB!W5#%!ZLc}Ry#^2HdIE|M%4PSq-X^N$1#)icXoNh6-P_gK zkMTKh3;AaA1M>C`;M*L`W5x}K0F4S>RAwq(_zB>!OiHg(1w>p~pvie=DyN1x{1PxI zWHg%wN8uTu=eZxT5Dt?BP$)FBrmyIjt%=?KOmNvw)s6I_2`+O7NGaPnZ{2U3Tv=Q=eM8d~e1X>0_S z8|@`LDmY6792*1s%~v8PHmXlqb#-zE$3sUq%SH0CbJaN6Jo473w!ucWq`~G#s@Zk( z7>eW~#U=8{nq@BgaRSzJGqLDx($-%kQ|;bNHV0H|Tka)*rgi70_}(@UY4T!dkzhAP zA=Pc%nXA0v5a+QK2tmCTcsO$E+uM4?`u;tVpe?C$?DS2btgtVxkpI+JW?W=f$!~`y zTj=zC{bp(&;vo_FHoP-}93wpP5LP{aW$2t((&mjvEV@AM7C1dd`1CLeNEXZ(t>aGA zy7yN^T7>U>-F!bMuO9kUWE3Y8j^8Y(?Iv>2OThDyuh@XogeBDa*XYX=WZ7PXLK(5h z+}pCR)JrgsF!tv51D;xG#j`4!pa#HM)Riu)JYOwxs@MNiIE56Z{S$iU*Bi;v%(2Ey z0G9^S??b&BggK!#=6qOXueWO3%VziHw7c;h$jwe!*VvxAgv zZx)_lAvulMURXz@GLOA324i$}Pw3Y>6wPTWXU4M`ZnJ<5omvF8bV+Rnh50A~YMG2W z42$uT)Zx9~Ka)3n^*X}zO|5-?Vf%DxoVm-za0Q8|0KaGM0pAgbAO%)c{D2O%c^!ALKI(-bks_F zf1TeFiKLvN63flLgXtA|z=`wuLtUe7;d}O1#8DFo(%(8RJ04X$OjRMsQ|2KZ}$d|KEW2ziSN z-wDoJYi+2k;c0B4Ny<=s71p;_a8?i$e2|B|!aocvQ@rp;uPBe2;NHXYsKoB&@P~qd5E5-qpKYjn; zd9fUGHZij55jWoY+@wAeIK5^fXcc>0Ph6c+(91a)I$C$WOqNH&^fYr@($8!bEW?&f zI*n1p)!JrWL*qZfoiz(q&%v<7D91P|l52IV>-H9UQ_HUnf2xs>EGbb~W~Y{rNbxJ9 zXWN5b*&3r94tuR`rmJh{=vz`-V|B4K=dUB=EZu-Uh5Yk_pSv{}7^!^4NUxAm_6Fmi z2m4=`_~%^x{AS;cD^YkkXDAY!U+on9jzCo6jk#Gr`{|$V-hG#Z|4dIJ}JdZ6?iKk`N_Sk5} zK~rChf3o5n>afC>N=f;WQgRe}U{U7w8EPWXanuR8KFbzYwSEjq1#lNbuiS2H)2SE` z3H~kGa?!-PwZlq>B(L2LD#*()A) zo4OLr`2HDX?G)mU-c*=#lz}S`b9BA`{i3EWqgj(r*FBZgBt~p5e;k`WRlQ}aGAJx$ z_mwhK2KjXFWz0OJ`(@Z9>z$>23>ObI9xw08x9D`=H;-I?nX^oBJfaji-2!rSM+n$U;vOZ}HT0G+PVbm_5ZSC^Q(1}3EtOGn^26JH>D0XDpD>P?3~c4EUy6uJ)l!~ z+LdX{D|wSQFT%9MCXjNlLso==y!xHyr9>JhSCI-|Sb_Ae^2mFdwJ=qfRvSL3GSf@y7whLvNNAHqeYIMrQ@vYm* z7xh>2Ib8f1qymY(9Ugf)qIxqCmi9BbO)j*V7%)Lj73#qaMzx_bGq5)@Mpv8TCT}tRvnSsad z&Et7GYBFll%9rrJ&@(pZV5AiZcZRs`st5)0Z-ZAosl(*Hz0P*~T*|&|vv-lteOh(7 zxm~x>+OD^>R}?jH|*wvdG6fJG+CblWJ>Wz?2W z8FJFMBJ{K>1QQuHRls3Ty1K?g z{QPZ9*weZ96)`p~gfRWKko3_vU6QWtu2AZlcC(mnSW@m@47t0sQ-{Z?ZvM}fZl%OZ zhVy>H3*TqW#zPhnEcO{hc!LMUI*hGv3zUodLyf?p{{C`Ei<}krH_Ki>j$;lnUT>DF zMow2atg9XM^et@4AfZyYaOSZP3ERh}#`68XAyPEW>&r#o1UW%uLuM>Y24QoF> z4&{Wmd({_mEMa|r$?ET-dfApn1yKxKu!;Q9lv_Q53bR>GW^2|Ymt2ykY&TkBo$QGC z+{U*j5Rec5C@^`>6_jZH1`dnvMOiU$N`bu)?l^`y73)-tHoA|tPznW9zR-`1e7D(o zn&Dv}5E%^@qCS=@knUk6Z!37X)FE#>8X(bIMMjt<`{;P>n0Bzwz~_UWfYucF*mjRAbWqh3HV@SwD~(?YeWel2!o%75eYW$4Azf}zm6%flyFsX;H~$OfUh*CzBc zU5_`-^&!(4d6OaS+i3aWK7o*|A;^lwFEVrdpY*)AQim3&O~2Fv7}fKqW)oj};R@T8 zo(){&w|V1R8;Ennt&hy4^rb7C!E^SXDNo?$tgF9rf~ro^pT&3G9(MeEd^sD|#;}qF zbPN*~cDUePu2Qtb#mBR|3Soai5xZuR^mHjth12s~3DKIp6Q@X5rwUPOr)0R1c>5kS z6b5otG?zQe)y1>w904b=%W?x(bNoYpu_HbGX`RXEJZ+05s>NiJY<7CvaWsQWS@zvz zlSX1?*4VNvdXXzikzJPSfLTL>LP}ard#MrMu~^n5Ew(QGWfPdQjhrzMTl2^F$aWVU z&6p-jO#bFV%`!%UDW20AF6R&G4hh#&4Fa2HkH?4gug71Auljx*kK3W`UtbT9v!NZe6O@AvwN@c<@xML7Il(SdNd%%cTd@}HQ zvgq>Xs!$AU0CACmo^q5s=`A4_P`ABT#h16pN8{=|^H_YIOJ{t7ihB`R#>-aq7V$aas@Q_StwfgKV)G+uI3K~Q zUwZ1IJI*PbRdI@F1af*9Z8OFL7j4FE!=Zi`uPeQ6_N5aXXI~@{6?qpW=+zEj_P)}5 z5-ntli{?>i6i@uE*2sc!)u#x$uc1|dq4J_bpr(+ox~ni$a`bRr!eHr^f4`g4uE4H* z_ue0^UYEIcG)9%%0j~l`PIGw^#sPE}ZMdFNmCma7Ux~^Z&&K3v;TK3`s4w>z;%js( zJ?Av{Y&r8VqR`1o`HV>g$8-L>+l+O5GoUG1VHTa zjwu!Tf!mracDHO&kW*XiYxW5#Css*ZPiBPYQzq(rzU3#s0!a zSH#s5->p$!hCTE5mWWlt1C#peYDN00yUghf?}I%r1X=WC%~kSeMn6iZsxVp1L1$)V z$OGLU?~AMJqRxQrC*x|~JuRQR4ySi`3ggs*4O(6 z!L%8FN8A{6@lrW-PQ5d=hOb1FSrQLdbx)N{r^nKR7Tqj_Fz0O7@QmG?mYf^UNP-kw zN+=(va1G~~(_L8u#(iIXvf9BpPjhRY0X8$Ct+$*|#R^_kr=IUDgq3gIam&o+-h0op z@~mHo=-r<`Yb+mFiO{p{cno)5+jaFhf<3)ITw}il$%zsTQxk#BWukEGG*uXH?`|h7 zly*&e`5&fFlr>}CE3z3R5ofy)CV6Y`qp77gOnSSGVn$-iO(1o0UL@o@vmzYOrFjfN5F#W8L-l)^eUa_B0OF z+X|n@$d_@SuCCR`yD}`K6FN4q9Ndbc7_n;KoVw{|S8OzF9tCvvhCJx?`-b?oBQ? zvy;HwDT(-y`2Z!Sk(&h(|%VBJCdGBaX*w zMuV7Z`6R;IOv-jU%Q@Zl4%jz@TyV%uWDM?d05RYA^WJY7PoNg}Cd-`1JutL%r!_(} zbGC$4BfrKe?0nT251c7U0g7CYCf8-=0`_Yq_mCVt&Q7eQqQs23^{T;TW%nD$lF=el+_e7db;)yXNr4r@~Cr?@V7ryu{Ds%K68Qe#rh} z5r-c3phgR&KBP4L^kALfyrX>~FyE43VxAN5o_qZdxhf8jg*L>2$a$S(T9}N_?#ff2>w$Fl9ytBZga)t zcN?qbg4*lIhF+C1gdb$CdJSAcmJeG41QF2nJW;;9#cFFZ*-b$9+N7=w{1~c*vL~b% zT5BJ%Ll3i9*ujgD#F1*}qOF;t&lx3hI-{7&;Yx_(;@#cn-J`#n)grz z8h0q{B5S-`?oAss>ubR`{^RRV3vj%aDkrbxC20r$D4g;0?l0ta9UD@S7_?F&7TqW& zk1hPmSEu9`u()J9R28EaNgssoEeP<`e^HU{*V0Qrv8sPUU>^lL7tA5R%H{tMtB5vG zx(fU5S8^q6&AAk2Dc=}8m?HrDVs!T2GHczE8(kl&xi9Qp=`q)mknJ7gO=(+Jl!5c@ zIYAe_aVM-tjuM^HeV@zrYw+j!ehfa01)|N4#P|C|I_}Z4~`yjv%kt6c4~M0{!Uj>Rt-`uZ65J&Gy<;q literal 16595 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

VHdv1Ok%m~6Bi-zW0;7F8q>@5r3G6>OV*jX_) z74cP?NobCZ3U}%KNL(N9Q(G#ueWg5t3A)yUxxom#$v4h}40WlLL*luoDwKZsN~L(M zM&go$RWc=+gSeD!i@lF6MGG|rE;D}&H!K~{sy08kRBNXZQ>U3EkMZs$&R!{Yu&QW; zk4`rarteSIY{L#M*X}zxh;7^?F179SKPS5FLLAgLQc?CEQ)yua#nGiSLF{F46PXkl zG{Sh#cIv5G)YuA0tj<~%-y|@dzrP~Q#IHw_)#>f`j%WM0yp;s6ZTikF^@I5(9y8Ut$h&U0rw*a$sx_5-d1kDjmjA#e zjIVZj_2#T;oi@?^>rG7n<*2XqEz{z1?yv_bzhO5sQQa}?xsjYakv;)qJ4;yRo^G#N zyT;s(d_1WJOE5=T2hMq#ky+T#7hMRfpA-X}9J3Gh5f>!n4$tuycE-17nW|h37`cVI zF;KLx^UI?xr10%bdBz?LX?6keMC57Ei}aJnRcg+2pRj1+^qg2^h;GTrU+v9Mh&w-K zZR4#kH!m%%anvANuJ5$t$Uw>1o7chPKh8hF`9Dwb_|J!}^kOLIB_}75fN`TofByRr z>?ZJWC2Y=c_Rn3@-nG12MVth^K-&luq;IYr3!+Oe_dZG}wQc617jvBfFl*d?tV)+I z08RJGA1w6xYzdH9IAhKW(k1ad+$%V!aEpEow)YijNquGvT}l9&Ua(?KqJQS}pYQ4R zRN;GH`HAP>GWs)nE8z4N$magO(T8(p0l_|@_slE$O&kpPa+R|$v4>ukzPoqX+2So? zPG8tR%LGIJu_g%ekJEzi|C~)6@*fC7{)4o@$4LKQ2Nas{G48L8Ry7F~AmHb`uF2V= IGfvn450;H`Z2$lO diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py index 181a969aaff..45f7b8122af 100644 --- a/erpnext/startup/notifications.py +++ b/erpnext/startup/notifications.py @@ -27,7 +27,10 @@ def get_notification_config(): "Purchase Receipt": {"docstatus": 0}, "Delivery Note": {"docstatus": 0}, "Stock Entry": {"docstatus": 0}, - "Material Request": {"docstatus": 0}, + "Material Request": { + "status": ("not in", ("Stopped",)), + "per_ordered": ("<", 100) + }, "Purchase Order": { "status": ("not in", ("Completed", "Closed")), "docstatus": ("<", 2) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 1dc55784367..68540b7f190 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -176,7 +176,7 @@ class StockReconciliation(StockController): row.valuation_rate = previous_sle.get("valuation_rate", 0) if row.qty and not row.valuation_rate: - frappe.throw(_("Valuation Rate required for Item {0}").format(row.item_code)) + frappe.throw(_("Valuation Rate required for Item in row {0}").format(row.idx)) if ((previous_sle and row.qty == previous_sle.get("qty_after_transaction") and row.valuation_rate == previous_sle.get("valuation_rate"))