363 Commits

Author SHA1 Message Date
Marwan Alwali
6af5249454 update 2025-03-06 23:27:04 +03:00
Marwan Alwali
7dd5791d14 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	inventory/views.py
2025-03-05 02:35:37 +03:00
Marwan Alwali
b54634b2a1 update 2025-03-05 02:35:00 +03:00
540f9cbe3c update1 2025-03-04 23:24:29 +00:00
76fbb4a69b fix conflict issue 2025-03-04 21:50:29 +00:00
4cd61f6a84 temp 2025-03-04 21:25:33 +00:00
c5ba624585 p 2025-03-04 21:21:03 +00:00
034d0a9501 update 2025-03-04 21:14:47 +00:00
c11fc359bd add permissions 2025-03-04 21:13:23 +00:00
Marwan Alwali
31fa1b8011 update 2025-03-04 21:55:50 +03:00
Marwan Alwali
9c55bdbe92 update 2025-03-04 00:03:29 +03:00
Marwan Alwali
1580e2ad26 update 2025-03-02 21:21:15 +03:00
a96b1131d3 update customer and organization & staffmember 2025-03-02 12:18:32 +00:00
21089f8995 Merge branch 'main' of http://10.10.1.120:3000/tenhal_admin/haikal 2025-02-27 16:16:07 +00:00
cf89b54df1 update 2025-02-27 16:16:03 +00:00
Marwan Alwali
a7987c283b update 2025-02-27 18:56:59 +03:00
1a98cfc7bc Merge branch 'main' of http://10.10.1.120:3000/tenhal_admin/haikal 2025-02-27 15:02:46 +00:00
86d3c3d586 update 2025-02-27 15:02:41 +00:00
Marwan Alwali
00c07b5442 update 2025-02-27 15:01:32 +03:00
91ef0da13b update 2025-02-26 16:01:58 +00:00
12d480659e update 2025-02-26 13:01:22 +00:00
0ecbee79f2 update 2025-02-26 12:26:30 +00:00
219a3e9426 update 2025-02-26 12:25:46 +00:00
Marwan Alwali
9e54207395 update 2025-02-26 15:23:38 +03:00
Marwan Alwali
218fea7a26 update 2025-02-26 13:32:26 +03:00
Marwan Alwali
f3cd624851 update 2025-02-25 14:43:25 +03:00
a266c99028 update 2025-02-24 14:51:46 +00:00
2557ac12c5 update 2025-02-24 14:50:52 +00:00
8714162a58 update 2025-02-24 14:50:13 +00:00
Marwan Alwali
2671db939a update 2025-02-24 14:35:10 +03:00
8ae17c9560 Merge branch 'main' of http://10.10.1.120:3000/tenhal_admin/haikal 2025-02-24 11:31:26 +00:00
bc77e6c79d changes 2025-02-24 11:31:24 +00:00
Marwan Alwali
27530ab096 update 2025-02-23 22:12:16 +03:00
Marwan Alwali
3458671826 update 2025-02-23 13:17:11 +03:00
Marwan Alwali
5ce971b4bd update 2025-02-20 17:46:28 +03:00
6e598dfce5 update 2025-02-20 14:43:45 +00:00
475518c37e Merge branch 'user_group' 2025-02-20 14:19:07 +00:00
68652d17e5 update 2025-02-20 14:18:39 +00:00
ddc13aadab update 2025-02-20 11:18:47 +00:00
Marwan Alwali
6419070c86 update 2025-02-20 13:52:24 +03:00
1bd663446b update the perms 2025-02-20 10:30:10 +00:00
Marwan Alwali
ed3e79e35f update 2025-02-20 11:41:44 +03:00
fe0f0d836d update 2025-02-19 13:56:19 +00:00
Marwan Alwali
7d93bfde9f update 2025-02-19 07:46:29 +03:00
d937f9f684 Merge branch 'main' of http://10.10.1.120:3000/tenhal_admin/haikal 2025-02-18 13:32:56 +00:00
87cac68e8b update on the appointment and lead and more 2025-02-18 13:32:40 +00:00
Marwan Alwali
f72f3ff9d1 update 2025-02-18 12:10:51 +03:00
491d60b34f update 2025-02-18 08:29:08 +00:00
Marwan Alwali
7423fa9878 update 2025-02-18 09:57:19 +03:00
Marwan Alwali
9b282154b0 update 2025-02-17 21:46:27 +03:00