Commit Graph

409 Commits

Author SHA1 Message Date
younes f0516f36e7 Added Employee Custody to Purchase Request 2025-05-06 15:21:14 +01:00
kchyounes19 4b9313d21c
Merge pull request #2964 from expsa/younes_dev_odex25_purchase
correct asset qty
2025-05-04 13:16:32 +01:00
younes c1a6a9613c correct asset qty 2025-05-04 13:15:06 +01:00
kchyounes19 0c59c64681
Merge pull request #2954 from expsa/younes_dev_odex25_purchase
correct asset qty
2025-05-04 11:32:39 +01:00
younes fd79531a53 correct asset qty 2025-05-04 11:31:32 +01:00
kchyounes19 c769d48758
Merge pull request #2950 from expsa/younes_dev_odex25_purchase
Add Employee Custody Report under Purchase Orders report
2025-05-04 07:33:09 +01:00
younes e01057753e Add Employee Custody Report under Purchase Orders report 2025-05-04 07:29:42 +01:00
Mostafa Abdo 86dd72286f
Merge pull request #2919 from expsa/ronozoro-patch-1
Update purchase_order.py
2025-04-28 18:02:09 -07:00
Mostafa Abdo ee75fd893a
Update purchase_order.py 2025-04-28 18:01:43 -07:00
ahmed-nouri051 b2e83a2a46
Merge pull request #2875 from expsa/fixing-permission-odex25-purchase
fixing permission for button
2025-04-24 08:15:32 +02:00
ahmed-nouri051 61bbd2b2ea fixing permission for button 2025-04-23 17:17:52 +02:00
mohammed-alkhazrji 59037b5db3
Merge pull request #2836 from expsa/general_supervisor_res_company
up general_supervisor_id
2025-04-22 16:49:58 +03:00
mohammed-alkhazrji a316549b28 up general_supervisor_id 2025-04-22 16:47:03 +03:00
kchyounes19 930a4bc31b
Merge pull request #2819 from expsa/younes_dev_odex25_purchase
add domain to vendors contact page
2025-04-21 13:32:18 +01:00
younes b59e75c411 add domain to vendors contact page 2025-04-21 13:31:10 +01:00
kchyounes19 669af15df9
Merge pull request #2812 from expsa/younes_dev_odex25_purchase
add domain to vendors contact page
2025-04-21 11:21:31 +01:00
younes 7b2d8f7e81 add domain to vendors contact page 2025-04-21 11:18:14 +01:00
SamirLADOUI-sa 3eee375543
Merge pull request #2782 from expsa/samir-aladawi-fix-purchase-requisition
[FIX] purchase_requisition_custom
2025-04-16 13:59:13 +01:00
Samir Ladoui ad2d5032f5 [FIX] purchase_requisition_custom 2025-04-16 13:58:26 +01:00
SamirLADOUI-sa 80f278151f
Merge pull request #2780 from expsa/samir-aladawi-fix-purchase-requisition
[FIX] purchase_requisition_custom
2025-04-16 11:47:29 +01:00
Samir Ladoui 72367c108e [FIX] purchase_requisition_custom 2025-04-16 11:46:15 +01:00
SamirLADOUI-sa bc67479608
Merge pull request #2776 from expsa/samir-aladawi-fix-purchase-requisition
[FIX] purchase_requisition_custom
2025-04-16 09:07:41 +01:00
Samir Ladoui 90adc2b7fd [FIX] purchase_requisition_custom 2025-04-16 09:06:51 +01:00
SamirLADOUI-sa 8cc36566fe
Merge pull request #2771 from expsa/samir-aladawi-fix-purchase-requisition
[FIX] purchase_requisition_custom
2025-04-16 07:49:47 +01:00
Samir Ladoui 7fe21235d9 [FIX] purchase_requisition_custom 2025-04-16 07:49:04 +01:00
SamirLADOUI-sa 2154886242
Merge pull request #2769 from expsa/samir-aladawi-fix-purchase-requisition
[FIX] purchase_requisition_custom
2025-04-16 07:40:54 +01:00
Samir Ladoui 1a2a033d06 [FIX] purchase_requisition_custom 2025-04-16 07:39:20 +01:00
SamirLADOUI-sa fa21dab8b3
Merge pull request #2767 from expsa/samir-aladawi-fix-purchase-requisition
[FIX] purchase_requisition_custom
2025-04-15 12:35:07 +01:00
Samir Ladoui 80386ed678 [FIX] purchase_requisition_custom 2025-04-15 12:34:37 +01:00
SamirLADOUI-sa 44eab66644
Merge pull request #2761 from expsa/samir-aladawi-fix-purchase-requisition
[FIX] purchase_requisition_custom
2025-04-14 14:29:42 +01:00
Samir Ladoui f8557a7c75 [FIX] purchase_requisition_custom 2025-04-14 14:29:10 +01:00
SamirLADOUI-sa 18b389b5d0
Merge pull request #2746 from expsa/samir-aladawi-fix-purchase-requisition
[FIX] purchase_requisition_custom
2025-04-13 11:51:05 +01:00
Samir Ladoui d56a93694d [FIX] purchase_requisition_custom 2025-04-13 11:50:23 +01:00
SamirLADOUI-sa f614a7bf40
Merge pull request #2743 from expsa/samir-aladawi-fix-purchase-requisition
[FIX] purchase_requisition_custom
2025-04-13 09:37:47 +01:00
Samir Ladoui 4a33952ce9 [FIX] purchase_requisition_custom 2025-04-13 09:37:15 +01:00
شركة خبير المحدودة cf96f72f60 Update github action file 2025-04-09 06:07:45 +02:00
شركة خبير المحدودة 1dbe000658
Update dev-preprod-servers.yml 2025-04-08 11:57:47 +02:00
شركة خبير المحدودة 749264641f Update github action file 2025-04-06 15:48:56 +02:00
شركة خبير المحدودة b3de42a07a Update github action file 2025-03-16 14:17:53 +03:00
SamirLADOUI-sa be457abc39
Merge pull request #2567 from expsa/samir-aladawi-retrieve-request-employee
[UPD] purchase_requisition_custom: retrieve employee from purchase re…
2025-03-04 13:39:47 +01:00
Samir Ladoui 39a13e53a1 [UPD] purchase_requisition_custom: retrieve employee from purchase requst to purchase order 2025-03-04 13:39:20 +01:00
Esraa-Exp 8705b674f9
Merge pull request #2512 from expsa/Esraa-Ensan-purchase-task
PO button create false in aprrove-done
2025-02-26 14:00:26 +02:00
Esraa-Exp 2839290011 PO button create false in aprrove-done 2025-02-26 13:59:21 +02:00
SamirLADOUI-sa 2b39e656cb
Merge pull request #2503 from expsa/samir-aladawi-retrieve-department-purchase
[UPD] purchase_requisition_custom: retrieve department from purchase …
2025-02-25 17:09:39 +01:00
Samir Ladoui 1e9443d8a0 [UPD] purchase_requisition_custom: retrieve department from purchase requst to purchase order 2025-02-25 17:08:51 +01:00
Manar416 34a21f1323
Merge pull request #2476 from expsa/manar_dev_purchase_24_2
UPDATE purchase_requisition_custom & purchase_custom_stock
2025-02-25 00:20:15 +02:00
manar a0afc882b8 UPDATE purchase_requisition_custom & purchase_custom_stock 2025-02-25 00:19:43 +02:00
SamirLADOUI-sa 797a42e59e
Merge pull request #2415 from expsa/samir-aladawi-fix-transalations
[FIX] purchase_requisition_custom: translation conflicts
2025-02-16 12:26:20 +01:00
Samir Ladoui 8cb576d955 [FIX] purchase_requisition_custom: translation conflicts 2025-02-16 12:25:52 +01:00
Esraa-Exp 57174f97f9
Merge pull request #2334 from expsa/Esraa-Ensan-purchase-task
Expected price constrain translation
2025-02-09 14:27:26 +02:00