From 5a54d632ccc13f61ad5f128a6b56918145460bb0 Mon Sep 17 00:00:00 2001 From: Kitti U Date: Sat, 30 Oct 2021 16:13:21 +0700 Subject: [PATCH] ADD l10n_th_account_tax_advance_clearing --- l10n_th_account_tax/models/account_move.py | 14 +++- .../wizard/account_payment_register.py | 2 +- .../__init__.py | 3 + .../__manifest__.py | 19 +++++ .../models/__init__.py | 4 + .../models/account_move.py | 34 ++++++++ .../models/hr_expense_sheet.py | 75 ++++++++++++++++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/hr_expense_view.xml | 27 +++++++ .../wizard/account_payment_register.py | 2 +- .../l10n_th_account_tax_advance_clearing | 1 + .../setup.py | 6 ++ 14 files changed, 183 insertions(+), 6 deletions(-) create mode 100644 l10n_th_account_tax_advance_clearing/__init__.py create mode 100644 l10n_th_account_tax_advance_clearing/__manifest__.py create mode 100644 l10n_th_account_tax_advance_clearing/models/__init__.py create mode 100644 l10n_th_account_tax_advance_clearing/models/account_move.py create mode 100644 l10n_th_account_tax_advance_clearing/models/hr_expense_sheet.py create mode 100644 l10n_th_account_tax_advance_clearing/readme/CONTRIBUTORS.rst create mode 100644 l10n_th_account_tax_advance_clearing/readme/DESCRIPTION.rst create mode 100644 l10n_th_account_tax_advance_clearing/static/description/icon.png create mode 100644 l10n_th_account_tax_advance_clearing/views/hr_expense_view.xml create mode 120000 setup/l10n_th_account_tax_advance_clearing/odoo/addons/l10n_th_account_tax_advance_clearing create mode 100644 setup/l10n_th_account_tax_advance_clearing/setup.py diff --git a/l10n_th_account_tax/models/account_move.py b/l10n_th_account_tax/models/account_move.py index deff09044..faab25612 100644 --- a/l10n_th_account_tax/models/account_move.py +++ b/l10n_th_account_tax/models/account_move.py @@ -271,7 +271,7 @@ def write(self, vals): self.mapped("tax_invoice_ids").unlink() return super().write(vals) - def _prepare_deduction_list(self, currency, date): + def _prepare_deduction_list(self, currency=False, date=False): def add_deduction( wht_lines, wht_tax, partner_id, amount_deduct, currency, date ): @@ -288,6 +288,11 @@ def add_deduction( deductions.append(deduct) return amount_deduct + if not currency: + currency = self.env.company.currency_id + if not date: + date = fields.Date.context_today(self) + deductions = [] amount_deduct = 0 wht_taxes = self.mapped("wht_tax_id") @@ -298,10 +303,11 @@ def add_deduction( "expense_id" ): # From expense, group by bill_partner_id of expense, or default partner partner_ids = list( - { - x.bill_partner_id.id or x.partner_id.id + [ + x.bill_partner_id.id + or x.employee_id.sudo().address_home_id.commercial_partner_id.id for x in wht_tax_lines.mapped("expense_id") - } + ] ) for partner_id in partner_ids: partner_wht_lines = wht_tax_lines.filtered( diff --git a/l10n_th_account_tax/wizard/account_payment_register.py b/l10n_th_account_tax/wizard/account_payment_register.py index cf7cfe04c..2c1b25485 100644 --- a/l10n_th_account_tax/wizard/account_payment_register.py +++ b/l10n_th_account_tax/wizard/account_payment_register.py @@ -104,7 +104,7 @@ def _compute_amount(self): # Case WHT only, ensure only 1 wizard self.ensure_one() deduction_list, _ = wht_move_lines._prepare_deduction_list( - self.currency_id, self.payment_date + currency=self.currency_id, date=self.payment_date ) # Support only case single WHT line in this module # Use l10n_th_account_tax_mult if there are mixed lines diff --git a/l10n_th_account_tax_advance_clearing/__init__.py b/l10n_th_account_tax_advance_clearing/__init__.py new file mode 100644 index 000000000..8ebc8a7c5 --- /dev/null +++ b/l10n_th_account_tax_advance_clearing/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +from . import models diff --git a/l10n_th_account_tax_advance_clearing/__manifest__.py b/l10n_th_account_tax_advance_clearing/__manifest__.py new file mode 100644 index 000000000..7e902ee82 --- /dev/null +++ b/l10n_th_account_tax_advance_clearing/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright 2020 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +{ + "name": "Thai Localization - Advance Clearing Withholding Tax", + "version": "14.0.1.0.0", + "author": "Ecosoft,Odoo Community Association (OCA)", + "license": "AGPL-3", + "website": "https://github.com/OCA/l10n-thailand", + "category": "Localization / Accounting", + "depends": ["l10n_th_account_tax_expense", "hr_expense_advance_clearing"], + "data": [ + "views/hr_expense_view.xml", + ], + "installable": True, + "auto_install": True, + "development_status": "Beta", + "maintainers": ["kittiu"], +} diff --git a/l10n_th_account_tax_advance_clearing/models/__init__.py b/l10n_th_account_tax_advance_clearing/models/__init__.py new file mode 100644 index 000000000..5acbc5015 --- /dev/null +++ b/l10n_th_account_tax_advance_clearing/models/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +from . import hr_expense_sheet +from . import account_move diff --git a/l10n_th_account_tax_advance_clearing/models/account_move.py b/l10n_th_account_tax_advance_clearing/models/account_move.py new file mode 100644 index 000000000..4dc02f2c4 --- /dev/null +++ b/l10n_th_account_tax_advance_clearing/models/account_move.py @@ -0,0 +1,34 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) +from odoo import models + + +class AccountMove(models.Model): + _inherit = "account.move" + + def _post(self, soft=True): + """After post, for wht_tax JV case only, recompute the reconciliation + to ensure that the wht_tax JV is taken into account first""" + res = super()._post(soft=soft) + for move in self: + clearing = self.env["hr.expense.sheet"].search( + [("wht_move_id", "=", move.id)] + ) + if not clearing: + continue + clearing.ensure_one() + emp_advance = self.env.ref( + "hr_expense_advance_clearing.product_emp_advance" + ) + adv_account = emp_advance.property_account_expense_id + # Find clearing and advance moves to reconcile + cl_lines = clearing.account_move_id.line_ids.filtered( + lambda l: l.account_id == adv_account + ) + av_lines = cl_lines.mapped("matched_debit_ids.debit_move_id") + # Removes reconcile + res = (cl_lines + av_lines).remove_move_reconcile() + # reconcile again this time with the wht_tax JV + wht_lines = move.line_ids.filtered(lambda l: l.account_id == adv_account) + res = (cl_lines + wht_lines + av_lines).reconcile() + return res diff --git a/l10n_th_account_tax_advance_clearing/models/hr_expense_sheet.py b/l10n_th_account_tax_advance_clearing/models/hr_expense_sheet.py new file mode 100644 index 000000000..f8ac69711 --- /dev/null +++ b/l10n_th_account_tax_advance_clearing/models/hr_expense_sheet.py @@ -0,0 +1,75 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) +from odoo import fields, models + + +class HrExpenseSheet(models.Model): + _inherit = "hr.expense.sheet" + + wht_move_id = fields.Many2one( + comodel_name="account.move", + string="Withholding Tax JV", + ondelete="restrict", + copy=False, + readonly=True, + help="For case clear advance, a JV can be created to record withholding tax", + ) + has_wht = fields.Boolean( + compute="_compute_has_wht", + ) + + def _compute_has_wht(self): + for rec in self: + rec.has_wht = len(rec.expense_line_ids.mapped("wht_tax_id")) > 0 + + def action_create_withholding_tax_entry(self): + """From expense sheet with WHT lines, this action + helps create new JV with default withholding entries""" + self.ensure_one() + action = self.env.ref("account.action_move_journal_line") + result = action.sudo().read()[0] + view = self.env.ref("account.view_move_form", False) + result["views"] = [(view and view.id or False, "form")] + # Prepare Dr. Advance, Cr. WHT lines + line_vals_list = [] + # Cr. WHT Lines + wht_move_lines = self.account_move_id.mapped("line_ids").filtered("wht_tax_id") + currency = self.env.company.currency_id + deduction_list, amount_deduct = wht_move_lines._prepare_deduction_list( + currency=currency + ) + for deduction in deduction_list: + line_vals_list.append( + { + "name": deduction["name"], + "amount_currency": -deduction["amount"], + "currency_id": currency.id, + "debit": 0.0, + "credit": deduction["amount"], + "partner_id": deduction["partner_id"], + "account_id": deduction["account_id"], + } + ) + emp_advance = self.env.ref("hr_expense_advance_clearing.product_emp_advance") + adv_account = emp_advance.property_account_expense_id + # Dr. Advance + line_vals_list.append( + { + "name": adv_account.name, + "amount_currency": amount_deduct, + "currency_id": currency.id, + "debit": amount_deduct, # Sum of all credit + "credit": 0.0, + "partner_id": self.employee_id.sudo().address_home_id.commercial_partner_id.id, + "account_id": adv_account.id, + } + ) + # Create JV + move_vals = { + "move_type": "entry", + "line_ids": [(0, 0, line_vals) for line_vals in line_vals_list], + } + move = self.env["account.move"].create(move_vals) + self.wht_move_id = move + result["res_id"] = move.id + return result diff --git a/l10n_th_account_tax_advance_clearing/readme/CONTRIBUTORS.rst b/l10n_th_account_tax_advance_clearing/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..deec0f703 --- /dev/null +++ b/l10n_th_account_tax_advance_clearing/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Kitti Upariphutthiphong. diff --git a/l10n_th_account_tax_advance_clearing/readme/DESCRIPTION.rst b/l10n_th_account_tax_advance_clearing/readme/DESCRIPTION.rst new file mode 100644 index 000000000..cd8c5db49 --- /dev/null +++ b/l10n_th_account_tax_advance_clearing/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module provide addition step to create withholding tax journal entry. diff --git a/l10n_th_account_tax_advance_clearing/static/description/icon.png b/l10n_th_account_tax_advance_clearing/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/l10n_th_account_tax_advance_clearing/views/hr_expense_view.xml b/l10n_th_account_tax_advance_clearing/views/hr_expense_view.xml new file mode 100644 index 000000000..d9f7c9d80 --- /dev/null +++ b/l10n_th_account_tax_advance_clearing/views/hr_expense_view.xml @@ -0,0 +1,27 @@ + + + + view.hr.expense.sheet.form + hr.expense.sheet + + + + + + + + + diff --git a/l10n_th_account_tax_multi/wizard/account_payment_register.py b/l10n_th_account_tax_multi/wizard/account_payment_register.py index 298557053..f75b2610d 100644 --- a/l10n_th_account_tax_multi/wizard/account_payment_register.py +++ b/l10n_th_account_tax_multi/wizard/account_payment_register.py @@ -30,7 +30,7 @@ def _onchange_payment_difference_handling(self): # Case WHT only, ensure only 1 wizard self.ensure_one() (deduction_list, amount_deduct) = move_lines._prepare_deduction_list( - self.currency_id, self.payment_date + currency=self.currency_id, date=self.payment_date ) deductions = [(5, 0, 0)] for deduct in deduction_list: diff --git a/setup/l10n_th_account_tax_advance_clearing/odoo/addons/l10n_th_account_tax_advance_clearing b/setup/l10n_th_account_tax_advance_clearing/odoo/addons/l10n_th_account_tax_advance_clearing new file mode 120000 index 000000000..ca6206d68 --- /dev/null +++ b/setup/l10n_th_account_tax_advance_clearing/odoo/addons/l10n_th_account_tax_advance_clearing @@ -0,0 +1 @@ +../../../../l10n_th_account_tax_advance_clearing \ No newline at end of file diff --git a/setup/l10n_th_account_tax_advance_clearing/setup.py b/setup/l10n_th_account_tax_advance_clearing/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/l10n_th_account_tax_advance_clearing/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)