Commit Graph

725 Commits

Author SHA1 Message Date
Mohamed Eltayar 50f9025fc9
Merge pull request #5409 from expsa/fix/remove-branch-short-name-20251113-162601
fix: remove non-existent branch_short_name field causing KeyError
2025-11-13 16:28:24 +03:00
Mohamed Eltayar 6f239f39b8 fix: remove non-existent branch_short_name field
- Removed branch_short_name field that references non-existent field
- This field was causing KeyError during module loading
- Resolves registry setup error in purchase_order model

Files modified:
- odex25_purchase/purchase_requisition_custom/models/purchase_order.py

Error fixed: KeyError: 'branch_short_name' during field setup
2025-11-13 16:26:15 +03:00
Mohamed Eltayar 9000c4d360
Merge pull request #5404 from expsa/feature/purchase-branch-correct-paths-20251113-144925
feat: add branch field to purchase modules with correct paths
2025-11-13 16:00:15 +03:00
Mohamed Eltayar ed295ddb30 feat: add branch field to purchase request and order modules with correct paths
- Added branch_id field to purchase.request model with auto-computation
- Added branch_id field to purchase.order model with auto-computation
- Updated purchase request form, tree, and search views with branch field
- Updated purchase order form, tree, and search views with branch field
- Added Arabic translations for branch field
- Branch propagates from request to purchase order during creation
- Uses context for short branch name display

Files modified with correct paths:
- odex25_purchase/purchase_requisition_custom/models/purchase_request.py
- odex25_purchase/purchase_requisition_custom/models/purchase_order.py
- odex25_purchase/purchase_requisition_custom/views/purchase_request.xml
- odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
- odex25_purchase/purchase_requisition_custom/i18n/ar_001.po

Synced with latest dev_odex25_purchase on Thu Nov 13 14:50:06 +03 2025
2025-11-13 14:50:06 +03:00
Mohamed Eltayar 394b75da0b
Merge pull request #5402 from expsa/revert/purchase-wrong-merge-20251113-144448
Revert "Merge pull request #5399 - Wrong file paths"
2025-11-13 14:46:32 +03:00
Mohamed Eltayar 753d55d700 Revert "Merge pull request #5399 from expsa/feature/purchase-branch-display-20251113-124523"
This reverts commit 3035a307c0, reversing
changes made to 0434e7f892.
2025-11-13 14:44:48 +03:00
Mohamed Eltayar 3035a307c0
Merge pull request #5399 from expsa/feature/purchase-branch-display-20251113-124523
feat: add branch field to purchase request and order modules
2025-11-13 12:47:05 +03:00
Mohamed Eltayar 07481846f1 feat: add branch field to purchase request and order modules
- Added branch_id field to purchase.request model with auto-computation
- Added branch_id field to purchase.order model with auto-computation
- Updated purchase request form, tree, and search views with branch field
- Updated purchase order form, tree, and search views with branch field
- Added Arabic translations for branch field
- Branch propagates from request to purchase order during creation
- Uses context for short branch name display

Synced with latest dev_odex25_purchase on Thu Nov 13 12:45:38 +03 2025
2025-11-13 12:45:38 +03:00
Mohamed Eltayar 0434e7f892
Merge pull request #5396 from expsa/feature/add-branch-field-purchase-request-20251113-104552
feat: Add Branch Field to Purchase Request
2025-11-13 11:02:34 +03:00
Mohamed Eltayar 3e0d541ba4 feat: add branch field to purchase.request
- Add branch_id computed field to purchase.request model
- Auto-populate branch from employee department
- Add branch field to form view (readonly)
- Add branch field to tree and search views
- Add branch group by filter in search view
- Add Arabic translation for branch field

Synced with latest dev_odex25_purchase on Thu Nov 13 10:46:18 +03 2025
2025-11-13 10:46:19 +03:00
esam-sermah 68a9c946da
Merge pull request #5390 from expsa/transl_pruchase
sdk
2025-11-12 16:45:00 +03:00
esam d8eed34be6 sdk 2025-11-12 16:44:19 -05:00
esam f1e32ce601 annual 2025-11-12 16:27:14 -05:00
esam-sermah b4ed8b0ccc
Merge pull request #5387 from expsa/transl_pruchase
annual
2025-11-12 16:28:52 +03:00
Mohamed Eltayar 89e6e52914
Merge pull request #5314 from expsa/feature/purchase-request-search-view-20251110
feat: Add comprehensive search view for purchase.request model
2025-11-10 15:22:33 +03:00
Mohamed Eltayar c2adaddd91 fix: Simplify date filters in search view to avoid XML parsing issues
- Replaced complex datetime expressions with simpler domain filters
- Fixed XML encoding issues with comparison operators
- Improved compatibility and reduced parsing complexity
2025-11-10 15:19:15 +03:00
Mohamed Eltayar 21518f5eb5
Merge pull request #5313 from expsa/feature/purchase-request-search-view-20251110
feat: Add comprehensive search view for purchase.request model
2025-11-10 15:15:38 +03:00
Mohamed Eltayar b22d8c0252 feat: Add comprehensive search view for purchase.request model
- Added purchase_request_search view with product search capability
- Included logical search fields: employee, department, vendor, products, categories
- Added useful filters: state-based, time-based, type-based, vendor-based
- Added group-by options: state, employee, department, vendor, type, date
- Full Arabic translations for all new search elements
- Linked search view to purchase_request_action
2025-11-10 15:12:43 +03:00
mohammed-alkhazrji 947a3f49ac
Merge pull request #5286 from expsa/khazraji_account
fix
2025-11-09 00:54:48 -08:00
mohammed-alkhazrji f0d29d797f fix 2025-11-09 11:53:57 +03:00
mohammed-alkhazrji dfb24de476
Merge pull request #5284 from expsa/khazraji_account
fix
2025-11-09 00:48:56 -08:00
mohammed-alkhazrji 49093d9694 fix 2025-11-09 11:46:36 +03:00
mohammed-alkhazrji 708a0508a0
Merge pull request #5282 from expsa/khazraji_account
scope product
2025-11-09 00:31:54 -08:00
mohammed-alkhazrji f3b785bf37 scope product 2025-11-09 11:24:08 +03:00
mohammed-alkhazrji b0a5a974f5
Merge pull request #5214 from expsa/khazraji_account
multi committe
2025-11-04 05:53:57 -08:00
mohammed-alkhazrji c54942357c multi committe 2025-11-04 16:51:17 +03:00
mohammed-alkhazrji e7d2c3f2c1
Merge pull request #5211 from expsa/khazraji_account
multi committe
2025-11-04 05:47:07 -08:00
mohammed-alkhazrji e4135b1d36 multi committe 2025-11-04 16:46:18 +03:00
mohammed-alkhazrji 86c414767b
Merge pull request #5209 from expsa/khazraji_account
multi committe
2025-11-04 05:43:10 -08:00
mohammed-alkhazrji 88bd1269eb multi committe 2025-11-04 16:42:00 +03:00
mazenmuhamad 70147afc66
Merge pull request #5207 from expsa/fix_purchase_security_file
fix secuity_file
2025-11-04 15:05:21 +02:00
Mazen Abdo 38e09b0ca0 fix secuity_file 2025-11-04 14:46:03 +02:00
mohammed-alkhazrji 5e73f2f0f5
Merge pull request #5142 from expsa/khazraji_account
chenge group
2025-11-02 00:26:15 -08:00
mohammed-alkhazrji 4a1a413754 chenge group 2025-11-02 11:24:07 +03:00
mohammed-alkhazrji 91b61a3e86
Merge pull request #5129 from expsa/khazraji_account
v4-po
2025-10-30 03:06:33 -08:00
mohammed-alkhazrji 799b6b54d5 v4-po 2025-10-30 14:05:45 +03:00
mohammed-alkhazrji 0e6208cda0
Merge pull request #5128 from expsa/khazraji_account
v4-po
2025-10-30 02:57:11 -08:00
mohammed-alkhazrji 8c60af366e v4-po 2025-10-30 13:56:24 +03:00
mohammed-alkhazrji 67ba2c11a5
Merge pull request #5125 from expsa/khazraji_account
v4-po
2025-10-30 02:49:21 -08:00
mohammed-alkhazrji 529ea8b2b6 v4-po 2025-10-30 13:48:32 +03:00
mohammed-alkhazrji 85da69ddd0
Merge pull request #5124 from expsa/khazraji_account
v4-po
2025-10-30 02:43:48 -08:00
mohammed-alkhazrji cfdd71ecf6 v4-po 2025-10-30 13:42:37 +03:00
mohammed-alkhazrji ad215f5f7f
Merge pull request #5122 from expsa/khazraji_account
v3-annual
2025-10-29 23:55:30 -08:00
mohammed-alkhazrji c738cfbae1 v3-annual 2025-10-30 10:54:14 +03:00
mohammed-alkhazrji 91a360aa74
Merge pull request #5119 from expsa/khazraji_account
v3-annual
2025-10-29 12:57:43 -08:00
mohammed-alkhazrji 89ef7eb956 v3-annual 2025-10-29 23:57:01 +03:00
mohammed-alkhazrji fa40c715bc
Merge pull request #5118 from expsa/khazraji_account
v3-annual
2025-10-29 12:54:12 -08:00
mohammed-alkhazrji a2f3f75ea9 v3-annual 2025-10-29 23:52:26 +03:00
mazenmuhamad 767f0048a4
Merge pull request #5109 from expsa/Ekram-3844
fix
2025-10-29 15:00:21 +02:00
Mazen Abdo 224476ffaa fix 2025-10-29 15:54:39 +03:00