Skip to content

Corrected contribution margin #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sawaneh1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Corrected contribution margin #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 48 additions & 58 deletions debitor/kassespor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,45 +521,35 @@ function udskriv($fakturadatoer,$logtimes,$afdelinger,$sort,$nysort,$idnumre,$fa
$dkksum[$x]=dkdecimal($sum[$x]+$moms[$x],2);


$q_dg = db_fetch_array(db_select("
SELECT
COALESCE(SUM(pris * antal), 0) AS total_sales,
COALESCE(SUM(
CASE
WHEN LOWER(TRIM(COALESCE(rabatart, ''))) = 'amount' THEN rabat * antal
ELSE (pris * rabat / 100) * antal
END
), 0) AS discount,
COALESCE(SUM(kostpris * antal), 0) AS kostpris,
COALESCE(SUM(
(
pris -
CASE
WHEN LOWER(TRIM(COALESCE(rabatart, ''))) = 'amount' THEN rabat
ELSE (pris * rabat / 100)
END
- kostpris
) * antal
), 0) AS dg
FROM ordrelinjer
WHERE ordre_id = '{$id[$x]}'

", __FILE__ . ' linje ' . __LINE__));


$q_dg = db_fetch_array(db_select("
SELECT
COALESCE(SUM(pris * antal), 0) AS total_sales,
COALESCE(SUM(
CASE
WHEN LOWER(TRIM(COALESCE(rabatart, ''))) = 'amount' THEN rabat * antal
ELSE (pris * rabat / 100) * antal
END
), 0) AS discount,
COALESCE(SUM(kostpris * antal), 0) AS kostpris,
COALESCE(SUM(
(
pris -
CASE
WHEN LOWER(TRIM(COALESCE(rabatart, ''))) = 'amount' THEN rabat
ELSE (pris * rabat / 100)
END
- kostpris
) * antal
), 0) AS dg
FROM ordrelinjer
WHERE ordre_id = '{$id[$x]}'
AND NOT (pris = 0 AND kostpris > 0)
", __FILE__ . ' linje ' . __LINE__));
$discount[$x] = $q_dg['discount'];
$gross_profit[$x] = $q_dg['dg'];
$kostpris[$x] = $q_dg['kostpris'];
$total_discount += $discount[$x];
$total_gross_profit += $gross_profit[$x];








$x++;
}
for ($x=0;$x<count($id);$x++) {
Expand Down Expand Up @@ -641,30 +631,30 @@ function udskriv($fakturadatoer,$logtimes,$afdelinger,$sort,$nysort,$idnumre,$fa
print "<td align=right>".dkdecimal($retur,2)."<br></td>\n";
$retursum+=$retur;

$q_dg = db_fetch_array(db_select("
SELECT
COALESCE(SUM(pris * antal), 0) AS total_sales,
COALESCE(SUM(
CASE
WHEN LOWER(TRIM(COALESCE(rabatart, ''))) = 'amount' THEN rabat * antal
ELSE (pris * rabat / 100) * antal
END
), 0) AS discount,
COALESCE(SUM(kostpris * antal), 0) AS kostpris,
COALESCE(SUM(
(
pris -
CASE
WHEN LOWER(TRIM(COALESCE(rabatart, ''))) = 'amount' THEN rabat
ELSE (pris * rabat / 100)
END
- kostpris
) * antal
), 0) AS dg
FROM ordrelinjer
WHERE ordre_id = '{$id[$x]}'
", __FILE__ . ' linje ' . __LINE__));

$q_dg = db_fetch_array(db_select("
SELECT
COALESCE(SUM(pris * antal), 0) AS total_sales,
COALESCE(SUM(
CASE
WHEN LOWER(TRIM(COALESCE(rabatart, ''))) = 'amount' THEN rabat * antal
ELSE (pris * rabat / 100) * antal
END
), 0) AS discount,
COALESCE(SUM(kostpris * antal), 0) AS kostpris,
COALESCE(SUM(
(
pris -
CASE
WHEN LOWER(TRIM(COALESCE(rabatart, ''))) = 'amount' THEN rabat
ELSE (pris * rabat / 100)
END
- kostpris
) * antal
), 0) AS dg
FROM ordrelinjer
WHERE ordre_id = '{$id[$x]}'
AND NOT (pris = 0 AND kostpris > 0)
", __FILE__ . ' linje ' . __LINE__));

$discount_val = $q_dg['discount'];
$gross_profit_val = $q_dg['dg'];
Expand Down