From a9b8ba9915b05c69a1a9350a7931ba9fd3feba0f Mon Sep 17 00:00:00 2001
From: Chaithat Bunneramit <chaithat.bun@nstda.or.th>
Date: Wed, 8 Apr 2020 14:13:00 +0700
Subject: [PATCH] =?UTF-8?q?#4402=5Fadd=5Ffilter=5Fon=5Fexpense=20Module=20?=
 =?UTF-8?q?:=20pabi=5Fhr=5Fexpense=20FI=20:=20=E0=B9=80=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1=20filter=20=E0=B8=AB=E0=B8=99=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=20Expense=20=E0=B9=81=E0=B8=A5=E0=B8=B0=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88=E0=B8=A2=E0=B8=99=20Defaul?=
 =?UTF-8?q?t=20=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99=20Wait=20for=20Accept?=
 =?UTF-8?q?=20(Current=20Year)=20Issues=20:=20https://mobileapp.nstda.or.t?=
 =?UTF-8?q?h/redmine/issues/4402?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pabi_hr_expense/views/hr_expense_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 pabi_hr_expense/views/hr_expense_view.xml

diff --git a/pabi_hr_expense/views/hr_expense_view.xml b/pabi_hr_expense/views/hr_expense_view.xml
old mode 100755
new mode 100644
index 9b0a3035d..778d019a1
--- a/pabi_hr_expense/views/hr_expense_view.xml
+++ b/pabi_hr_expense/views/hr_expense_view.xml
@@ -248,11 +248,14 @@
 				<field name="date" position="after">
 					<filter name="draft" domain="[('state','=','draft')]" string="Draft"/>
 					<filter name="confirm" domain="[('state','=','confirm')]" string="Wait for Accept"/>
+					<filter name="confirm_current" domain="[('state','=','confirm'),('date','&lt;',(context_today()+relativedelta(years=1)).strftime('%%Y-%%m-01')), ('date','&gt;=',time.strftime('%%Y-%%m-01'))]" string="Wait for Accept (Current Year)"/>
+					<filter name="confirm_Past" domain="[('state','=','confirm'),('date','&lt;',time.strftime('%%Y-01-01'))]" string="Wait for Accept (Past Year)"/>
 					<filter name="accepted" domain="[('state','=','accepted')]" string="Accepted"/>
 					<filter name="done" domain="[('state','=','done')]" string="Waiting Payment"/>
 					<filter name="paid" domain="[('state','=','paid')]" string="Paid"/>
 					<filter name="cancelled" domain="[('state','=','cancelled')]" string="Rejected"/>
 				</field>
+				
 				<field name="department_id" position="replace"/>
 				<group position="replace">
 					<group expand="0" string="Group By">
@@ -268,7 +271,7 @@
 		</record>
 
 		<record id="hr_expense.expense_all" model="ir.actions.act_window">
-			<field name="context">{ 'is_advance_clearing':False, 'is_employee_advance':False, 'default_is_advance_clearing':False, 'default_is_employee_advance':False, 'search_default_confirm': True, }</field>
+			<field name="context">{ 'is_advance_clearing':False, 'is_employee_advance':False, 'default_is_advance_clearing':False, 'default_is_employee_advance':False, 'search_default_confirm_current': True, }</field>
 		</record>
 
 		<record id="hr_expense_advance_clearing.action_expense_clearing" model="ir.actions.act_window">