401 Commits

Author SHA1 Message Date
Marwan Alwali
b0c234b59a update 2025-03-26 23:29:32 +03:00
Marwan Alwali
2752026692 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	inventory/views.py
2025-03-26 22:15:46 +03:00
Marwan Alwali
4aadba8c62 update 2025-03-26 22:10:32 +03:00
=
e5d09b6e0d update 2025-03-23 21:03:17 +03:00
=
3f89935d1b update 2025-03-23 21:03:17 +03:00
Marwan Alwali
62813388d7 update 2025-03-21 11:54:22 +03:00
Marwan Alwali
410bf91f84 update 2025-03-20 20:20:57 +03:00
Marwan Alwali
fa2beb772b update 2025-03-20 04:08:27 +03:00
Marwan Alwali
0efe67fa9e update 2025-03-20 03:56:50 +03:00
Marwan Alwali
c4f42d9958 update 2025-03-20 03:23:55 +03:00
Marwan Alwali
20f8093fe5 Merge remote-tracking branch 'origin/main' 2025-03-20 01:50:17 +03:00
Marwan Alwali
d9ef0a35c3 update 2025-03-20 01:46:42 +03:00
909094ca98 update in accounting 2025-03-20 01:18:16 +03:00
ed7e9623f9 Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into main 2025-03-18 00:24:30 +03:00
6a43c10c89 update ledgers 2025-03-18 00:24:27 +03:00
Marwan Alwali
294ccd58a9 update 2025-03-18 00:24:14 +03:00
Marwan Alwali
32cf1a63f8 update 2025-03-16 23:58:01 +03:00
Marwan Alwali
f17975540a update 2025-03-16 21:44:36 +03:00
Marwan Alwali
da1619b874 update 2025-03-16 03:28:04 +03:00
Marwan Alwali
61fa47a35e Fixed inventory/apps.py 2025-03-16 00:10:12 +03:00
Marwan Alwali
9288141a1e update 2025-03-15 23:36:58 +03:00
Marwan Alwali
52dad03524 update 2025-03-14 04:20:08 +03:00
Marwan Alwali
2ab21be831 update 2025-03-14 02:23:27 +03:00
Marwan Alwali
9e9bc3298f update 2025-03-14 02:13:44 +03:00
Marwan Alwali
e9c9445377 Revert "fixup! update"
This reverts commit 5e5eec299a4432784a9114264f6e7d39402a9812.
2025-03-14 02:12:50 +03:00
Marwan Alwali
5e5eec299a fixup! update 2025-03-14 02:04:21 +03:00
Marwan Alwali
aa3abdb91e update 2025-03-14 01:43:30 +03:00
d0e21d013f update 2025-03-14 01:24:59 +03:00
036e1dd82d Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into main 2025-03-13 23:59:39 +03:00
b955ce4aa3 o 2025-03-13 23:57:14 +03:00
bcba9569cf Delete README.md 2025-03-13 23:52:31 +03:00
4914dcbee6 Delete .gitignore 2025-03-13 23:52:14 +03:00
ff2a80740d Initial commit 2025-03-13 22:45:01 +03:00
68fb46cf65 add ledger and journalentry 2025-03-11 21:36:19 +00:00
Marwan Alwali
dd41c388db update 2025-03-12 00:12:12 +03:00
Marwan Alwali
e8e2da284e update 2025-03-09 21:42:12 +03:00
55167f2cc1 Merge branch 'main' of http://10.10.1.120:3000/tenhal_admin/haikal 2025-03-07 00:37:23 +00:00
bada43ba64 change 2025-03-07 00:23:02 +00:00
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