337 Commits

Author SHA1 Message Date
Marwan Alwali
d94c5adef7 update 2025-04-28 17:21:41 +03:00
ismail
18dd7829d9 clean base V1-update 2025-04-28 14:40:08 +03:00
Marwan Alwali
8556078b59 update 2025-04-28 13:27:08 +03:00
Marwan Alwali
e551064560 update 2025-04-24 19:12:18 +03:00
Marwan Alwali
780eb1b35c update 2025-04-24 17:24:20 +03:00
ismail
0224c2be0d update 2025-03-26 23:39:34 +03:00
=
e03fded3a4 update 2025-03-26 23:38:38 +03:00
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
c4f42d9958 update 2025-03-20 03:23:55 +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
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
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
68fb46cf65 add ledger and journalentry 2025-03-11 21:36:19 +00: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
76fbb4a69b fix conflict issue 2025-03-04 21:50:29 +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