s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 06:00:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103 from exciler/subscriptioncycle-zahlzyklus

Browse Source 
Enable "Zahlzyklus" in "Abolauf"
This commit is contained in:
OpenXE-ERP 2023-12-10 10:22:24 +01:00 committed by GitHub
commit 33aa53b7c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Modules/SubscriptionCycle/SubscriptionModule.php
View File

@ -31,14 +31,14 @@ class SubscriptionModule implements SubscriptionModuleInterface
aa.id, aa.id,
@start := GREATEST(aa.startdatum, aa.abgerechnetbis) as start, @start := GREATEST(aa.startdatum, aa.abgerechnetbis) as start,
@end := IF(aa.enddatum = '0000-00-00' OR aa.enddatum > :calcdate, :calcdate, aa.enddatum) as end, @end := IF(aa.enddatum = '0000-00-00' OR aa.enddatum > :calcdate, :calcdate, aa.enddatum) as end,
@cycles := CASE @cycles := GREATEST(aa.zahlzyklus, CASE
WHEN aa.preisart = 'monat' THEN WHEN aa.preisart = 'monat' THEN
TIMESTAMPDIFF(MONTH, @start, @end) TIMESTAMPDIFF(MONTH, @start, @end)
WHEN aa.preisart = 'jahr' THEN WHEN aa.preisart = 'jahr' THEN
TIMESTAMPDIFF(YEAR, @start, @end) TIMESTAMPDIFF(YEAR, @start, @end)
WHEN aa.preisart = '30tage' THEN WHEN aa.preisart = '30tage' THEN
FLOOR(TIMESTAMPDIFF(DAY, @start, @end) / 30) FLOOR(TIMESTAMPDIFF(DAY, @start, @end) / 30)
END+1 as cycles, END+1) as cycles,
CASE CASE
WHEN aa.preisart = 'monat' THEN WHEN aa.preisart = 'monat' THEN
DATE_ADD(@start, INTERVAL @cycles MONTH) DATE_ADD(@start, INTERVAL @cycles MONTH)

4
www/pages/rechnungslauf.php
View File

@ -94,7 +94,7 @@ class Rechnungslauf {
DATE_ADD(@start, INTERVAL (FLOOR(TIMESTAMPDIFF(DAY, @start, IF(aa.enddatum = '0000-00-00' OR aa.enddatum > '$scalcdate', '$scalcdate', aa.enddatum)) / 30)+1)*30 DAY ) DATE_ADD(@start, INTERVAL (FLOOR(TIMESTAMPDIFF(DAY, @start, IF(aa.enddatum = '0000-00-00' OR aa.enddatum > '$scalcdate', '$scalcdate', aa.enddatum)) / 30)+1)*30 DAY )
END, '%d.%m.%Y') SEPARATOR '<br>') as end, END, '%d.%m.%Y') SEPARATOR '<br>') as end,
SUM((100-aa.rabatt)/100 * aa.preis * aa.menge * SUM((100-aa.rabatt)/100 * aa.preis * aa.menge *
(CASE (GREATEST(aa.zahlzyklus, CASE
WHEN aa.preisart = 'monat' THEN WHEN aa.preisart = 'monat' THEN
TIMESTAMPDIFF(MONTH, @start, @end) TIMESTAMPDIFF(MONTH, @start, @end)
WHEN aa.preisart = 'jahr' THEN WHEN aa.preisart = 'jahr' THEN
@ -102,7 +102,7 @@ class Rechnungslauf {
WHEN aa.preisart = '30tage' THEN WHEN aa.preisart = '30tage' THEN
FLOOR(TIMESTAMPDIFF(DAY, @start, @end) / 30) FLOOR(TIMESTAMPDIFF(DAY, @start, @end) / 30)
END END
) ))
) as amount, ) as amount,
adr.id adr.id
FROM abrechnungsartikel aa FROM abrechnungsartikel aa