641 Commits

Author SHA1 Message Date
5e602f563f Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend 2025-06-22 20:14:25 +03:00
979e82b071 update 2025-06-22 20:08:26 +03:00
50db32600b formating and lintitng 2025-06-22 20:07:52 +03:00
7b3fc15efd update on the po and bill 2025-06-22 20:06:26 +03:00
10cb1235d6 update 2025-06-22 13:40:18 +03:00
a9b4186df7 update 2025-06-22 13:25:54 +03:00
04122cda2c update 2025-06-22 13:21:46 +03:00
39ed2620cd Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend 2025-06-22 13:21:11 +03:00
366df0135a update 2025-06-22 13:20:46 +03:00
Marwan Alwali
ebd2f06eb6 update car list cards 2025-06-20 21:11:51 +03:00
Marwan Alwali
190efbe72e update car list with images 2025-06-19 20:56:51 +03:00
8f5472ec52 ordered the txns based on debit listed first 2025-06-19 17:15:18 +03:00
9d6bd24937 chnage the custome filter logic for the Transaction bills 2025-06-18 20:41:15 +03:00
0859bb3255 update3 2025-06-18 14:47:16 +03:00
91db23e063 Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend 2025-06-18 13:21:38 +03:00
b75534b601 update1 2025-06-18 13:21:25 +03:00
55a7ec1158 reformat html templates 2025-06-18 13:20:58 +03:00
0c81022e7c update on the bulk update 2025-06-18 13:13:50 +03:00
2c0e40598a Merge pull request 'New Update' (#75) from frontend into main
Reviewed-on: #75
Reviewed-by: ismail <ismail.mosa.ibrahim@gmail.com>
2025-06-18 13:13:21 +03:00
f776b5377e Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend 2025-06-17 21:27:26 +03:00
3793c93365 update 2025-06-17 21:27:19 +03:00
Marwan Alwali
004c85b814 update 2025-06-17 21:08:33 +03:00
Marwan Alwali
5f970e9dd8 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	inventory/templatetags/custom_filters.py
#	templates/inventory/car_list_view.html
2025-06-17 20:56:51 +03:00
Marwan Alwali
ffb770bfe2 update 2025-06-17 20:48:46 +03:00
253c11a118 Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend 2025-06-17 20:01:14 +03:00
5cd5636740 update 2025-06-17 20:00:59 +03:00
02885f2e5b add bill transaction table 2025-06-17 20:00:03 +03:00
Marwan Alwali
c94c0e0de4 update 2025-06-17 19:54:20 +03:00
45c13c815a update 2025-06-17 16:21:58 +03:00
0b4a2d5498 update 2025-06-17 16:18:25 +03:00
de38df6a7c update the item model additional info 2025-06-17 16:17:57 +03:00
34d7645442 this the edit link in the footer 2025-06-17 16:05:36 +03:00
38e52d5e30 update 2025-06-17 14:52:49 +03:00
c7bd1d7761 ui changes in usermanagemment 2025-06-17 14:45:58 +03:00
0a3d8d3871 add bulk insert + po item insert 2025-06-17 14:44:28 +03:00
Marwan Alwali
4184dfce85 update 2025-06-15 21:29:49 +03:00
82090ff820 few more changes to pagination for arabic name to First and Last explicitly 2025-06-15 20:21:53 +03:00
391176f0ed Merge pull request 'phoenix btn and new pagination logic' (#72) from frontend into main
Reviewed-on: #72
2025-06-15 20:12:22 +03:00
f6d59da008 new 2025-06-15 20:10:42 +03:00
90fea4d256 update po 2025-06-15 20:03:43 +03:00
116110aced new changes 2025-06-15 20:01:11 +03:00
830575406b chnaged the pagination logic 2025-06-15 19:55:40 +03:00
Marwan Alwali
6e0808402a update 2025-06-15 19:30:59 +03:00
Marwan Alwali
27006a16c1 update 2025-06-15 18:45:53 +03:00
Marwan Alwali
08628da712 update 2025-06-15 18:41:19 +03:00
975c5b8c2c font awessome icons 2025-06-15 18:28:31 +03:00
e8b569ccad email page ui chnage 2025-06-15 17:56:42 +03:00
5880de54cd phoenix in opportunity 2025-06-15 16:50:47 +03:00
ceb6ddf902 Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend 2025-06-15 16:47:38 +03:00
f1277a2ed4 phoenix btn added 2025-06-15 16:40:40 +03:00