From 38b3f179a18ef74b0bfae5d3e3fd0ed8e679d45d Mon Sep 17 00:00:00 2001
From: "admin.suherdy" <suherdy.yacob@mapan.co.id>
Date: Sat, 6 Dec 2025 19:07:59 +0700
Subject: [PATCH] fix: adjust payment validation to support payments with
 `amount_substract` by relaxing line count checks for liquidity and
 counterpart lines.

---
 .../account_payment.cpython-310.pyc           | Bin 5749 -> 5845 bytes
 .../account_payment.cpython-312.pyc           | Bin 10443 -> 10702 bytes
 models/account_payment.py                     |  33 +++++++++++-------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/models/__pycache__/account_payment.cpython-310.pyc b/models/__pycache__/account_payment.cpython-310.pyc
index 2836babaa6e4f55897642f72895be4d6ff0d9681..44437afbfd5aec7973f599b2e45598eaadcaedc5 100644
GIT binary patch
delta 1434
zcmZ8hTWB0r7@l+HvbWjU`_-hoF*UkWO9gFBjkVE|YS6y4P}zXPWX~j--PudeOdu^2
zi`{@NO1&J>mlo59`dUixRS-pdt5E90Jk=-hLBt22r0Dt2#$<KieEj$GpZ_v{KK<Ys
zqn}L1CH{T>!KAZz_+w+jJkB{H5#&l;)I?p}#9g^5ca^4sK#pCtt2H$wotB79lr4!U
zHfl$Pax+TQvr<F*6~Z-?Q0w-I?RufM;@B?nLfINPAu{h?nZ_u_zQhkuZYPiv7-iU1
z9<t88Xqx?{p41KkS!eUwhuQ%kYwRa&8P(Zrq*0B6AO(=;5X#hEp#@+|EQnZ%3XoOM
z9AMWXlT3}yq(zKFps0ajn*FU!v$vz4pl8`1(Qi3^6??L_=SZIeOW`xR9DHirXOflU
zZy7pgWBkbcct5ar;&pVNeG#8W_t?+z(q&9yL)>2oa9bZCiFcIESP=7UKN)C4L=qjD
zp7$eul<0xnHimeJt{|?92%SW2p-YbGQtwGCh!`Zb6}>8*l7?uA=!URL|KI8|$^6Ic
zePNc}Hwz-|bUQ<G9ZWwZ`OSC_lfq^^(AwF}M4)WvIF)Y~I2PLlQoMn0AtVLrcFr#a
zi6IKW67&$|U#rp$RahlRxpQ8j-+?))kg9_~+)D(Ykm$W#`C}t_Aa9rXsRVMM+!|ej
zcO^JbN0JK$!F-}7F3q!tsK8F?=PGl&?6l6IA&1Jc)$4>x%ktJ}hTYW{D`DE|_Sbv9
z>8&q&KDAmtMd0uRd!&DaZnNvjvr)^hySC-|?6)LCQ|w)1vasLh*xah!vo{9x#Aj^B
z`2OfTc)tSIp)fwMsNb`x=@9xV$QJ<ieCcbPy$Pb%*`3tZ5^Pli(<zWF0<DJHC_4)C
zBNSng*q-n7EZ^z(Osmxr$@BQ&u*#44sF?YuI87ht(5SNO>Ep-hz>7uDfKmZo<`AY#
z&$c_}N}rmp)3d!WvSxXf?^Ak`tJ&}AHxeSL5_l}Kh0LL{PGS5*qqS!BR&8RAHkMY|
zwanVFFv<PLDhk<$Y1g^1?hwbnXzo5r6hf3lY*~r@Xq4EItcrYgG+Rqo6$R@^K^Q4m
zd!$F1l|3!rxirJRF=jBG-MOEA9#t}s(%wTC&NSkp*EGeZ@<(c-46|^1c3@rX+Pu$W
zCDYj;zf{;?W0B9OJM3ZpAo`lAh1)OX;D#3fUIcIe`W(WfX|`O;^IEp+n&#O4Pk;$L
ziALBjg<4`Mi)e(iXBsh<DHhI&%7>{w>Gu!Y8!dYPz4RzFB~;&pU!X7_i?}y3VRVlF
SBiCK~1Wc(1E@eqaMfo4-fL_4>

delta 1331
zcmZWo&u<$=6yBNr;q~r%{o9R0V>?Po<QA$51T9SoiKvnYN+m?a!5}S;XPwwy?>e)N
z)JAJX!mXeZG_6MB)I)LrsYo191qjqbB~UM%IE2GW{R0r^O65?AdF$XtVx{@^&G)`}
z@6F7cgO{JYWO|8&Ch+gz$<vL;r|y`?-+rCXh(M4dbWsg;aSeCHnuvhIj?|TFG7?q<
zA`<DkKqMQrm7!RR5%~k5s{93^s^Xo^{P#C!FjCof_yA?@4@DiL6x)@%N|_62l3`_0
znE|uRR+U|43d|CFtgN9jTZ~mFV?dYySq`B{?Iz8^w7`b3x;_DB5j-V!J2u4(bykmJ
zoCHUSy{Z0!&akKIuN)u5=O)K``YH$_>0!=i@oiJ*WSkF?5C2<sL#v?Q*f-kJ&ci@#
z$8QP&-qZGlkHvv9hz-=f9w<XZ;vJE$_G5jOXk29s@eqBAxG#3-`!Mq9M|_FTgeD>e
zNnBSy7cL4zG(@x&sm%YWlAzid%YsOjdM*oMZL^&u=?<nhNM;asG06_%fznP5v_RTR
zb1T!%a?G`}BzG6@BP0a!Ub>$Tv>^&W34Vz3pDKS>j#L^cbR_x%SHGVo$H+tr0qyDm
zI0X6-!f?Jg;sbH7z{jyb45a;08hps$KpruhCc(TtCbySZGM8s9<4SQJ?g5&iDu&Wp
z-R*=@qwa6e6#LV72h$Vmjl^wqk1Zq!J89lR751|^l^<OhUlhhKtlO@AwMQ3r+27`)
z`L`h4B7{Ss)~nOLYg4O5=o0W30mf_TGM|10)Cz~~HJ;;Lwv$Y<<<yJQ&;?aYE8t!Q
zTMm_a*V}UYR0XcWzDOM}foGkM=%Z1u&T*SgbEr<RN2&93QJ+T*EORnM7F~dU((-M)
zV>LZ$IW5=r+1d0Zy}~`T0I<q#rB6-h6#6wZ8yj_Z-6mGEWjn;DMfOK}V<xI2OgXL1
ztrltZuUUuXMf;0(T4J5dH0rT0GiAfT62eHr$}>Y@4>Bv_kK42CA9EJdbN5eYUqi(d
zq#YN(e7UMcw?a)8<j$0%t(}8nGQIk>uI=`%dZPiy0f(!z-*X@3pTDiBgwZ*(`TPm=
z6Z<6p^-cydoCP=!&;)QegbB-PICbA|*p6daM;_%1ASnST9N_$XI2~1xkcLfU<Ta$e
z!bjS;l0lK?a#al_k9Z!%ungWYl{kb+?-FNE+gBTQuix@qpGMaqzvmI#iIyJ8J8qFs
Vz0mc@mSZm<9>j+#a)N;h;=e3&FNOdB

diff --git a/models/__pycache__/account_payment.cpython-312.pyc b/models/__pycache__/account_payment.cpython-312.pyc
index 1ba693a2fe373e74f1cf89763e986960f30c7617..3560ac75e84c01b2d0f04abd9ac6129214ebf2a7 100644
GIT binary patch
delta 2242
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
OGxf~x2oyLZc>M`3st`{A

delta 1946
zcmZ8iU2Gdg5Wc<hUHsqJXZy}hoH%v<u4&SyMMSMa<&d^OLlRO7qQSykeQx8#Kgpg$
zl**xnR)QiS5(cRc6p0Fi63RnSBoHr9Bpw<HsBWl&Ec)}nLwTwptyJFFJv+s8CC|<7
z%zQJm-u?EM=dX-7uQ(i5hK%d?AB^4TSa8ZahREzJqcIvvF=;f4((EXk=0-V0*VvRP
z&5!bkVVS2GjXTX~rUZhEZqLG`rKx6?SA;()n!*)@bXH5G^rCPynMi4Rky9s=Uw$;h
zAuD)IsqnD2J32X=8_Q<m#4noFvf1vQXnb1FWz(vrWixsdzBh^W(K1X_jmNXonOtmA
zolPe)xvt4s?1hr4$NwQo_uwRR&(2t!XKD)Ou3ydD*9FES!+!o0N50EH^QTNmgb{06
zXd=$o4L?{TLMv69z-s%fwvnhsb8kvbAJNo3$M=Hj*a3grr1n4=`|1>4o0=(1&6F4>
z!X9A%B9Z6-i$labq}U0{PP-DYkQsJS;Ul8R;lxoa(WxI^v#UZKRqNq~{b{L-sCo?%
zA!9_aQ9u|b9bt$$cG=faxg{&D{&UA2L=__&-U+vw{L5c$vLj(90Vw*Q*5!knwf0~c
zpC);n!gFQ#GIS$>4nni5$99-3pJdi4AWXQ1c>@@}bNPjXJj1+YgPSfD<sjnzCW!EA
zo*Q?QfJeqVwmb{(TIykk=(PzKNU?Ni7WhJ}<E<n{hM&Y1FYVnJ`I<+3Y!#m_>)W=Y
zNVA_dpRvI!9))-O-{7nmIuS)|X7e>r@_5+s2AE>S&f1A~(k!RB<}4XjbI)1w!g#2X
zvg$Ku&6~!<(8P(HFy0L3SrN6;8NA{35se@{A)aG5Dnv}49}icBSJYg`##-LG;hU!!
zs}ND8yhq^cJm>h05CU)2yc2s#;U1cZrf>9VQWE{=k&z7_miUMpKB7;Pt9{5mbs8;k
z<J*j86iG(aD;`Kml4Zuk%(9CAcpnUNUN|ou@<&J;nBD?%Lrq82%tX-?SM@P0f>S0Z
zx(%k}d9(yS1_ofzZ-y1w1xNgs&}Ik+!n|=zVIZ)t`#pl7D?~iFLoeS|-)P~v!<S9-
zxizV+Ahj*-x;V1byVlWP=;*&L^%EO>8@S!EkLE>1>!gZvnFNj{HN2k!mCx!)<E-KX
zWaaoSxZThSck4u$5AYo=Rf%3&NnX<Cb7xO1oLE#Y_APB)+tOFq(sy0zTS@+d2cWzD
z^viadhsB%82M<!6FA8d!(g&toXBdh;EurU<88w&8W?~!cLMoyG$H>nZ*tpbNh>n|y
zP-LhL?iLLeF>bm*7K<o``ym$e!kfVXn~~H{0|w!@V25nS^kNpB@i8@XETP59Y)FWp
zu3_vkqnu)GDmgWs)RMW`Sf$EmNQh3mC=*0AOGt3HL4unNo#=hAH*V$D#Ao5j#@FRP
zMBn_0Rk3Zc`<l4*_dxj5z7mW4qX<3@$q_=19_gyozA7q<BiF>Pik<auD+!E0xF#zF
zSy{L6ExvVzuaim)@0IR3NzAJ8$F4#ww2fOyt}ZWxBFOOq%XkJ+nU8vxZ#7-u{331m
z;Wq6bQmn=y!!G!wWqY%+iM@0i+!gw+-f$;1v_n&?44Yc_xF7PEPHq6%0Ne<%)<d;l
zlZie|xQ0-@!Hbt$_n``Xx!a$Nc!?eFreY5j6I5U#ijG(;o>Fx^o=Bx)F$LiUvZ_<k
zD)TNjQ&%&5&^}jl5b+05X$)kgr6FW26EUQiizfO$VR}xni3%QGRlJ9df1e+u@0@|M
z#FRIs@}7{FYdV$KgXc&D&8LTmC~*j(TTF9-X}-a<+!Ka5)HDC$+2}&_K0|c_;a|nG
B+rt0=

diff --git a/models/account_payment.py b/models/account_payment.py
index bef1a2b..aed736c 100644
--- a/models/account_payment.py
+++ b/models/account_payment.py
@@ -125,20 +125,27 @@ class AccountPayment(models.Model):
                 all_lines = move.line_ids
                 liquidity_lines, counterpart_lines, writeoff_lines = pay._seek_for_lines()
 
-                if len(liquidity_lines) != 1:
-                    raise UserError(_(
-                        "Journal Entry %s is not valid. In order to proceed, the journal items must "
-                        "include one and only one outstanding payments/receipts account.",
-                        move.display_name,
-                    ))
+                # Skip validation if payment has amount_substract (from vendor_payment_diff_amount module)
+                # This module creates additional lines that don't fit the standard pattern
+                has_substract = hasattr(pay, 'amount_substract') and pay.amount_substract and pay.amount_substract > 0
+                
+                if not has_substract:
+                    if len(liquidity_lines) != 1:
+                        raise UserError(_(
+                            "Journal Entry %s is not valid. In order to proceed, the journal items must "
+                            "include one and only one outstanding payments/receipts account.",
+                            move.display_name,
+                        ))
 
-                if len(counterpart_lines) != 1:
-                    raise UserError(_(
-                        "Journal Entry %s is not valid. In order to proceed, the journal items must "
-                        "include one and only one receivable/payable account (with an exception of "
-                        "internal transfers).",
-                        move.display_name,
-                    ))
+                    # Allow for additional lines (like substract account from vendor_payment_diff_amount)
+                    # Check if we have at least one counterpart line, not exactly one
+                    if len(counterpart_lines) < 1:
+                        raise UserError(_(
+                            "Journal Entry %s is not valid. In order to proceed, the journal items must "
+                            "include at least one receivable/payable account (with an exception of "
+                            "internal transfers).",
+                            move.display_name,
+                        ))
 
                 if any(line.currency_id != all_lines[0].currency_id for line in all_lines):
                     raise UserError(_(