Skip to content

C
Clubphp
Commit 1c230fd3 authored by Mahmoud Aglan's avatar Mahmoud Aglan
Browse files
Options

dfhgkftgjuyl

parent 89449302
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 5 deletions
app/Modules/Accounting/Services/FinancialReportService.php
View file @ 1c230fd3
...@@ -46,7 +46,7 @@ final class FinancialReportService ...@@ -46,7 +46,7 @@ final class FinancialReportService
WHERE status = 'posted' AND entry_date >= ? AND entry_date <= ? AND is_archived = 0 WHERE status = 'posted' AND entry_date >= ? AND entry_date <= ? AND is_archived = 0
) )
{$extraWhere} {$extraWhere}
WHERE coa.account_type = 'revenue' AND coa.is_archived = 0 AND coa.is_header = 0 WHERE coa.account_type = 'revenue' AND coa.is_archived = 0
GROUP BY coa.id, coa.account_code, coa.name_ar, coa.name_en GROUP BY coa.id, coa.account_code, coa.name_ar, coa.name_en
HAVING balance != 0 HAVING balance != 0
ORDER BY coa.account_code ASC", ORDER BY coa.account_code ASC",
...@@ -64,7 +64,7 @@ final class FinancialReportService ...@@ -64,7 +64,7 @@ final class FinancialReportService
WHERE status = 'posted' AND entry_date >= ? AND entry_date <= ? AND is_archived = 0 WHERE status = 'posted' AND entry_date >= ? AND entry_date <= ? AND is_archived = 0
) )
{$extraWhere} {$extraWhere}
WHERE coa.account_type = 'expense' AND coa.is_archived = 0 AND coa.is_header = 0 WHERE coa.account_type = 'expense' AND coa.is_archived = 0
GROUP BY coa.id, coa.account_code, coa.name_ar, coa.name_en GROUP BY coa.id, coa.account_code, coa.name_ar, coa.name_en
HAVING balance != 0 HAVING balance != 0
ORDER BY coa.account_code ASC", ORDER BY coa.account_code ASC",
...@@ -130,7 +130,7 @@ final class FinancialReportService ...@@ -130,7 +130,7 @@ final class FinancialReportService
WHERE status = 'posted' AND entry_date <= ? AND is_archived = 0 WHERE status = 'posted' AND entry_date <= ? AND is_archived = 0
) )
{$extraWhere} {$extraWhere}
WHERE coa.is_archived = 0 AND coa.is_header = 0 WHERE coa.is_archived = 0
AND coa.account_type IN ('asset','liability','equity') AND coa.account_type IN ('asset','liability','equity')
GROUP BY coa.id, coa.account_code, coa.name_ar, coa.name_en, GROUP BY coa.id, coa.account_code, coa.name_ar, coa.name_en,
coa.account_type, coa.account_nature, coa.opening_balance coa.account_type, coa.account_nature, coa.opening_balance
......
app/Modules/Accounting/Services/LedgerService.php
View file @ 1c230fd3
...@@ -149,7 +149,7 @@ final class LedgerService ...@@ -149,7 +149,7 @@ final class LedgerService
WHERE status = 'posted' AND entry_date >= ? AND entry_date <= ? AND is_archived = 0 WHERE status = 'posted' AND entry_date >= ? AND entry_date <= ? AND is_archived = 0
) )
{$extraWhere} {$extraWhere}
WHERE coa.is_archived = 0 AND coa.is_header = 0 WHERE coa.is_archived = 0
GROUP BY coa.id, coa.account_code, coa.name_ar, coa.name_en, GROUP BY coa.id, coa.account_code, coa.name_ar, coa.name_en,
coa.account_type, coa.account_nature, coa.level, coa.is_header, coa.account_type, coa.account_nature, coa.level, coa.is_header,
coa.opening_balance, coa.current_balance coa.opening_balance, coa.current_balance
...@@ -192,9 +192,28 @@ final class LedgerService ...@@ -192,9 +192,28 @@ final class LedgerService
$balance = bcadd($opening, bcsub($creditMovement, $debitMovement, 2), 2); $balance = bcadd($opening, bcsub($creditMovement, $debitMovement, 2), 2);
} }
// If no journal movements, use current_balance from DB // If no journal movements, use current_balance from DB and restore opening from stored value
if (bccomp($debitMovement, '0.00', 2) === 0 && bccomp($creditMovement, '0.00', 2) === 0) { if (bccomp($debitMovement, '0.00', 2) === 0 && bccomp($creditMovement, '0.00', 2) === 0) {
$balance = (string) $acc['current_balance']; $balance = (string) $acc['current_balance'];
$opening = (string) $acc['opening_balance'];
if (bccomp($opening, '0.00', 2) >= 0) {
$acc['opening_debit'] = $opening;
$acc['opening_credit'] = '0.00';
} else {
$acc['opening_debit'] = '0.00';
$acc['opening_credit'] = bcmul($opening, '-1', 2);
}
// Derive period movement as difference between closing and opening
$closingNet = (string) $acc['current_balance'];
$periodNet = bcsub($closingNet, $opening, 2);
if (bccomp($periodNet, '0.00', 2) >= 0) {
$acc['period_debit'] = $periodNet;
$acc['period_credit'] = '0.00';
} else {
$acc['period_debit'] = '0.00';
$acc['period_credit'] = bcmul($periodNet, '-1', 2);
}
} }
// Closing debit/credit split // Closing debit/credit split
......
trial_balance_2026-01-01_to_2026-05-10.csv 0 → 100644
View file @ 1c230fd3
"كود الحساب","اسم الحساب","رصيد أول - مدين","رصيد أول - دائن","حركة الفترة - مدين","حركة الفترة - دائن","رصيد آخر - مدين","رصيد آخر - دائن"
11010303,الأصول,90265.00,0.00,0.00,0.00,4201381.70,0.00
120404,"عهد عاملين مستديمة",6000.00,0.00,0.00,0.00,6000.00,0.00
120412,"الشيكات تحت الخصم",0.00,5162167.00,0.00,0.00,0.00,3514970.21
12060202,"بنك مصر -جنيه مصري",1559957.00,0.00,0.00,0.00,15865468.00,0.00
12060204,"بنك التعمير والإسكان",9633486.36,0.00,0.00,0.00,40845305.22,0.00
12060304,"نقدية بالبنوك حسابات ودائع",26770500.00,0.00,0.00,0.00,590000.00,0.00
210201,"أرباح مرحلة",0.00,73322635.00,0.00,0.00,0.00,73322635.00
23080404,"ضريبة القيمة المضافة",4768844.00,0.00,0.00,0.00,7411841.15,0.00
23081101,"محمد عبد العزيز",0.00,0.00,0.00,0.00,0.00,1011877.00
23081102,"أحمد زكريا",0.00,0.00,0.00,0.00,0.00,195460.00
23081103,"التزامات ابراهيم كامل",0.00,0.00,0.00,0.00,0.00,190920.00
23081104,"تحويل نقدي",0.00,0.00,0.00,0.00,0.00,687610.00
23081105,"ايداع حمدي جويلي",0.00,0.00,0.00,0.00,0.00,50.00
23081106,"محمد سيد عبد الجواد",0.00,0.00,0.00,0.00,0.00,25360.00
23081107,"محمد عبد الفتاح",0.00,0.00,0.00,0.00,0.00,165000.00
23081108,"امين سامي",0.00,0.00,0.00,0.00,0.00,8963.00
23081109,"مصطفي سامي",0.00,0.00,0.00,0.00,0.00,6723.00
23081110,هيثم,0.00,0.00,0.00,0.00,0.00,42265.00
23081111,"تامينات للغير",0.00,0.00,0.00,0.00,0.00,1467514.00
23081112,"تامينات مقاولات",0.00,0.00,0.00,0.00,0.00,633784.13
23081113,"دائنة تحت التسوية",0.00,0.00,0.00,0.00,0.00,2581.00
23081114,دائنون,0.00,3003102.00,0.00,0.00,0.00,3003102.00
23081115,"ايرادات مدفوعة مقدما",0.00,2131272.00,0.00,0.00,0.00,2131272.00
23081116,"مبالغ معلاة",0.00,0.00,0.00,0.00,0.00,22460.00
23081117,"ايجار محلات - دائن",0.00,0.00,0.00,0.00,0.00,584990.00
23081118,"إيجارات - دائن",0.00,0.00,0.00,0.00,0.00,60000.00
23081201,"كسب عمل",0.00,86031.00,0.00,0.00,0.00,36623.20
23081202,"التمغه العادية",0.00,40286.40,0.00,0.00,0.00,26431.65
23081203,"التمغه الإضافية",0.00,102741.75,0.00,0.00,0.00,74044.10
23081204,"أرباح تجارية وصناعية",0.00,131442.10,0.00,0.00,0.00,82550.65
230813,"مستحقات مجلس الأمناء",0.00,0.00,0.00,0.00,1503000.00,0.00
230814,"دلتا كونكس",0.00,6910.00,0.00,0.00,393090.00,0.00
230815,"ضمان اعمال",0.00,1121712.00,0.00,0.00,304772.15,0.00
230816,"التامين النهائي",0.00,4540265.00,0.00,0.00,0.00,4698526.20
331402,"مصروفات بنكية",0.00,0.00,0.00,0.00,10636.00,0.00
332901,"مكافات و حوافز",0.00,0.00,0.00,0.00,2067250.00,0.00
332902,"مصروفات عامة",0.00,0.00,0.00,0.00,705984.72,0.00
332903,"سلف مؤقته",0.00,0.00,0.00,0.00,357000.00,0.00
332904,"مصروفات الغاز",0.00,0.00,0.00,0.00,331092.00,0.00
332905,"مستحقات العاملين بالمدينة",0.00,0.00,0.00,0.00,713750.00,0.00
332906,"مصروفات التليفون",0.00,0.00,0.00,0.00,107930.30,0.00
332907,"مصروفات المياة",0.00,0.00,0.00,0.00,551456.70,0.00
332908,"مصروفات الكهرباء",0.00,0.00,0.00,0.00,1876735.00,0.00
332909,"سلف مستديمة",0.00,0.00,0.00,0.00,80000.00,0.00
332910,العضويات,0.00,0.00,0.00,0.00,69000.00,0.00
332911,"مصاريف ضيافه",0.00,0.00,0.00,0.00,149704.51,0.00
332912,"عمولة مندوبي التسويق",0.00,0.00,0.00,0.00,221735.00,0.00
332913,"شراء احبار",0.00,0.00,0.00,0.00,14005.00,0.00
332914,"مصروفات بنكية",0.00,0.00,0.00,0.00,45661.69,0.00
332915,"مستحقات اللجنة الإعلامية",0.00,0.00,0.00,0.00,67000.00,0.00
332916,"مستحقات شركة الإدارة",0.00,0.00,0.00,0.00,171054.00,0.00
332917,"مصروفات شركة النظافة",0.00,0.00,0.00,0.00,3095076.80,0.00
332918,"مصروفات شركة الامن والحراسة",0.00,0.00,0.00,0.00,3061080.00,0.00
332919,"أدوات كتابية",0.00,0.00,0.00,0.00,123468.85,0.00
332920,"نشاط كرة اليد",0.00,0.00,0.00,0.00,26760.00,0.00
332921,"نشاط الكرة الطائرة",0.00,0.00,0.00,0.00,64580.20,0.00
332922,"نشاط الألعاب القتالية",0.00,0.00,0.00,0.00,273656.50,0.00
332923,"نشاط الاسكواش",0.00,0.00,0.00,0.00,400121.00,0.00
332924,"نشاط كرة التنس",0.00,0.00,0.00,0.00,209976.00,0.00
332925,"نشاط البادل تنس",0.00,0.00,0.00,0.00,373464.00,0.00
332926,"نشاط كرة القدم",0.00,0.00,0.00,0.00,241165.00,0.00
332927,"مصروفات نظام التشغيل",0.00,0.00,0.00,0.00,1409473.70,0.00
332928,"نشاط الجمباز",0.00,0.00,0.00,0.00,6406659.80,0.00
332929,"مستحقات شركة التشغيل",0.00,0.00,0.00,0.00,1665947.18,0.00
332930,"مستحقات المدير التنفيذي",0.00,0.00,0.00,0.00,524700.00,0.00
332931,"نشاط الرسم",0.00,0.00,0.00,0.00,3990.00,0.00
332932,"مستحقات شركة معالجة مياة حمام السباحة",0.00,0.00,0.00,0.00,65000.00,0.00
332933,"حفلات و مؤتمرات",0.00,0.00,0.00,0.00,1133812.03,0.00
332934,"نشاط كرة السلة",0.00,0.00,0.00,0.00,278936.00,0.00
332935,مطبوعات,0.00,0.00,0.00,0.00,153250.00,0.00
332936,"لوازم طباعه كارنيهات",0.00,0.00,0.00,0.00,168842.10,0.00
332937,"التامين المؤقت",0.00,0.00,0.00,0.00,160000.00,0.00
332938,"مستلزمات حمام سباحه",0.00,0.00,0.00,0.00,297650.00,0.00
332939,"مستحقات اللجان العاملة بالنادي",0.00,0.00,0.00,0.00,725250.00,0.00
332940,"مستحقات العاملين طرف شركة الإدارة",0.00,0.00,0.00,0.00,5304209.19,0.00
332941,"نشاط السباحة",0.00,0.00,0.00,0.00,1835335.00,0.00
332942,"شركة مكافحة القوارض",0.00,0.00,0.00,0.00,25438.60,0.00
332943,"مستحقات اللجنة العليا",0.00,0.00,0.00,0.00,530000.00,0.00
332944,"مصروفات ايجار جراج",0.00,0.00,0.00,0.00,315629.00,0.00
332945,"مصروفات صيانة الغاز الطبيعي",0.00,0.00,0.00,0.00,29005.00,0.00
332946,"مصروفات طابع شهيد",0.00,0.00,0.00,0.00,785.00,0.00
332947,"مستحقات المدير التنفيذي للسلسله",0.00,0.00,0.00,0.00,70000.00,0.00
332948,"رسوم نظافه الحي",0.00,0.00,0.00,0.00,10000.00,0.00
332949,"مصروف ايجار بارك الانتظار",0.00,0.11,0.00,0.00,68744.30,0.00
332952,د.هندسيه,0.00,0.00,0.00,0.00,0.00,887.00
332953,د.تطبيقه,0.00,0.00,0.00,0.00,0.00,887.00
410201,"اكاديمية البادل",0.00,0.00,0.00,0.00,0.00,754850.00
410202,"اكاديمية قدم",0.00,0.00,0.00,0.00,0.00,637300.00
410203,"اكاديمية قدم الموهبه",0.00,0.00,0.00,0.00,0.00,1600.00
410204,"اكاديمية يد",0.00,0.00,0.00,0.00,0.00,72900.00
410205,"اكاديمية تنس",0.00,0.00,0.00,0.00,0.00,428950.00
410206,"اكاديمية طائره",0.00,0.00,0.00,0.00,0.00,154065.00
410207,"اكاديمية العاب القتاليه",0.00,0.00,0.00,0.00,0.00,483600.00
410208,"اكاديمية جمباز",0.00,0.00,0.00,0.00,0.00,9739953.00
410209,"اكاديمية سله",0.00,0.00,0.00,0.00,0.00,401175.00
410210,"اكاديمية اسكواش",0.00,0.00,0.00,0.00,0.00,779325.00
410211,"اكاديمية سباحه",0.00,0.00,0.00,0.00,0.00,4292082.00
410212,"اكاديمية الشطرنج",0.00,0.00,0.00,0.00,0.00,11000.00
410213,"اكاديمية الدارتس",0.00,0.00,0.00,0.00,0.00,850.00
410214,"اكاديمية رسم",0.00,0.00,0.00,0.00,0.00,6500.00
410501,"قيمه عضويه",0.00,0.00,0.00,0.00,0.00,2327250.00
410502,"باقى قيمه عضويه",0.00,0.00,0.00,0.00,0.00,1008320.00
410503,"مقدم عضويه",0.00,0.00,0.00,0.00,0.00,1396250.00
410504,"جزء من مقدم",0.00,0.00,0.00,0.00,0.00,77500.00
410505,"باقى مقدم عضويه",0.00,0.00,0.00,0.00,0.00,180263.00
410506,"جزء من عضويه",0.00,0.00,0.00,0.00,0.00,612700.00
410507,الاضافات,0.00,0.00,0.00,0.00,0.00,238709.00
410508,"تجديد عضويه",0.00,0.00,0.00,0.00,0.00,677775.00
410509,"فوائد تاخير",0.00,0.00,0.00,0.00,0.00,4416967.00
410510,الاقساط,0.00,0.00,0.00,0.00,0.00,18508938.00
410511,"مصاريف رفض شيكات",0.00,0.00,0.00,0.00,0.00,7800.00
410512,"غرامة تاخير",0.00,0.00,0.00,0.00,0.00,711.00
410513,"بيع استمارات عضوية",0.00,0.00,0.00,0.00,0.00,34820.00
410514,"بيع كراسات شروط",0.00,0.00,0.00,0.00,0.00,4919.00
410515,"إيرادات متنوعه",0.00,0.00,0.00,0.00,0.00,20984.00
410516,"استمارات نشاط",0.00,0.00,0.00,0.00,0.00,132250.00
410517,"احداث رياضيه",0.00,0.00,0.00,0.00,0.00,218100.00
410518,"تذاكر دخول",0.00,0.00,0.00,0.00,0.00,277270.00
410519,"تذاكر بولينج",0.00,0.00,0.00,0.00,0.00,494550.00
410520,"تذاكر جراج",0.00,0.00,0.00,0.00,0.00,140460.00
410521,"ايجار محلات",0.00,0.00,0.00,0.00,0.00,5744293.00
410522,تامين,0.00,0.00,0.00,0.00,0.00,10000.00
410523,"حجز ملاعب",0.00,0.00,0.00,0.00,0.00,364020.00
410524,كاميرا,0.00,0.00,0.00,0.00,0.00,15600.00
410525,فشار,0.00,0.00,0.00,0.00,0.00,200.00
410526,ترابيزات,0.00,0.00,0.00,0.00,0.00,82150.00
410527,"جراج دراجات",0.00,0.00,0.00,0.00,0.00,15300.00
410528,لوكرات,0.00,0.00,0.00,0.00,0.00,23600.00
410529,"كارنيهات بدل فائد",0.00,0.00,0.00,0.00,0.00,550.00
410530,"ملصق سياره",0.00,0.00,0.00,0.00,0.00,2000.00
410531,"دي جي",0.00,0.00,0.00,0.00,0.00,11400.00
410532,قاعه,0.00,0.00,0.00,0.00,0.00,22500.00
410533,عرايس,0.00,0.00,0.00,0.00,0.00,1050.00
410534,لافتات,0.00,0.00,0.00,0.00,0.00,20200.00
410535,"دعم الوزارة",0.00,0.00,0.00,0.00,0.00,349980.00
410537,دعاوى,0.00,0.00,0.00,0.00,0.00,250.00
410538,"ايجار تراك",0.00,0.00,0.00,0.00,0.00,30000.00
4206,"إيجارات أخري",0.00,0.00,0.00,0.00,0.00,6355511.00
4209,غرامات,0.00,0.00,0.00,0.00,0.00,167866.00
,الإجمالي,42829052.36,89648564.36,0.00,0.00,107712858.39,153754642.14
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment