From: garyhgohoos Date: Mon, 4 Aug 2014 18:39:06 +0000 (-0400) Subject: Issue #24224:nomalize sales reporting X-Git-Tag: v4.7.0-beta.2~60^2 X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=a149438b76ecf6d5298e99f46d734ef94c485559;p=xtuple Issue #24224:nomalize sales reporting --- diff --git a/foundation-database/public/functions/calcinvoiceamt.sql b/foundation-database/public/functions/calcinvoiceamt.sql index fb79c3f73..a60452dfd 100644 --- a/foundation-database/public/functions/calcinvoiceamt.sql +++ b/foundation-database/public/functions/calcinvoiceamt.sql @@ -37,7 +37,7 @@ BEGIN WHERE (invcitem_invchead_id=pInvcheadid); IF (pType IN ('T', 'X')) THEN - SELECT SUM(tax) INTO _tax + SELECT COALESCE(SUM(tax), 0.0) INTO _tax FROM (SELECT COALESCE(ROUND(SUM(taxdetail_tax), 2), 0.0) AS tax FROM tax JOIN calculateTaxDetailSummary('I', pInvcheadid, 'T')ON (taxdetail_tax_id=tax_id) diff --git a/foundation-database/public/functions/calcsalesorderamt.sql b/foundation-database/public/functions/calcsalesorderamt.sql index 0f4def933..cf11caba8 100644 --- a/foundation-database/public/functions/calcsalesorderamt.sql +++ b/foundation-database/public/functions/calcsalesorderamt.sql @@ -41,7 +41,7 @@ BEGIN AND (coitem_status != 'X'); IF (pType IN ('T', 'B', 'X')) THEN - SELECT SUM(tax) INTO _tax + SELECT COALESCE(SUM(tax), 0.0) INTO _tax FROM (SELECT COALESCE(ROUND(SUM(taxdetail_tax), 2), 0.0) AS tax FROM tax JOIN calculateTaxDetailSummary('S', pCoheadid, 'T')ON (taxdetail_tax_id=tax_id) diff --git a/foundation-database/public/tables/metasql/bookings-detail.mql b/foundation-database/public/tables/metasql/bookings-detail.mql index 621440373..28a6f0840 100644 --- a/foundation-database/public/tables/metasql/bookings-detail.mql +++ b/foundation-database/public/tables/metasql/bookings-detail.mql @@ -29,6 +29,21 @@ SELECT coitem_id AS id, coitem_cohead_id AS altId, (coitem_price / coitem_price_invuomratio), 2) AS extpricebalance, round((noNeg(coitem_qtyord - coitem_qtyshipped + coitem_qtyreturned) * coitem_qty_invuomratio) * (currtobase(cohead_curr_id, coitem_price, cohead_orderdate) / coitem_price_invuomratio), 2) AS baseextpricebalance, + round((coitem_qtyord * coitem_qty_invuomratio) * + (coitem_unitcost / coitem_price_invuomratio), 2) AS extcost, + (round((coitem_qtyord * coitem_qty_invuomratio) * + (currtobase(cohead_curr_id, coitem_price, cohead_orderdate) / coitem_price_invuomratio), 2) - + round((coitem_qtyord * coitem_qty_invuomratio) * + (coitem_unitcost / coitem_price_invuomratio), 2)) AS margin, + CASE WHEN (coitem_price > 0.0) THEN + (round((coitem_qtyord * coitem_qty_invuomratio) * + (currtobase(cohead_curr_id, coitem_price, cohead_orderdate) / coitem_price_invuomratio), 2) - + round((coitem_qtyord * coitem_qty_invuomratio) * + (coitem_unitcost / coitem_price_invuomratio), 2)) / + round((coitem_qtyord * coitem_qty_invuomratio) * + (currtobase(cohead_curr_id, coitem_price, cohead_orderdate) / coitem_price_invuomratio), 2) + ELSE 0.0 + END AS marginpercent, curr_abbr AS currAbbr, -- TODO - not needed, remove? (very slow) -- CASE WHEN (qtyAvailable(itemsite_id, coitem_scheddate) < 0.0) THEN 'error' @@ -43,7 +58,11 @@ SELECT coitem_id AS id, coitem_cohead_id AS altId, 'qty' AS qtyavailable_xtnumericrole, 'salesprice' AS coitem_price_xtnumericrole, 'salesprice' AS baseunitprice_xtnumericrole, + 'cost' AS coitem_unitcost_xtnumericrole, 'curr' AS extprice_xtnumericrole, + 'curr' AS extcost_xtnumericrole, + 'curr' AS margin_xtnumericrole, + 'percent' AS marginpercent_xtnumericrole, 'curr' AS baseextprice_xtnumericrole, 'curr' AS extpricebalance_xtnumericrole, 'curr' AS baseextpricebalance_xtnumericrole, diff --git a/foundation-database/public/tables/metasql/briefEarnedCommission-detail.mql b/foundation-database/public/tables/metasql/briefEarnedCommission-detail.mql index 619f50180..c4ad2f9fa 100644 --- a/foundation-database/public/tables/metasql/briefEarnedCommission-detail.mql +++ b/foundation-database/public/tables/metasql/briefEarnedCommission-detail.mql @@ -5,11 +5,20 @@ -- See www.xtuple.com/CPAL for the full text of the software license. SELECT cohist_salesrep_id, salesrep_number, salesrep_name, cust_number, cust_name, - cohist_ordernumber, cohist_invcnumber, cohist_invcdate, currAbbr, + cohist_ordernumber, cohist_orderdate, cohist_invcnumber, cohist_invcdate, currAbbr, SUM(extprice) AS sumextprice, SUM(cohist_commission) AS sumcommission, SUM(baseextprice) AS sumbaseextprice, SUM(basecommission) AS sumbasecommission, + + formatDate(cohist_orderdate) AS f_orderdate, + formatDate(cohist_invcdate) AS f_invcdate, + formatMoney(SUM(extprice)) AS f_sumextprice, + formatMoney(SUM(baseextprice)) AS f_sumbaseextprice, + formatMoney(SUM(cohist_commission)) AS f_sumcommission, + formatMoney(SUM(basecommission)) AS f_sumbasecommission, + + AS cohist_invcdate_xtnullrole, 'curr' AS sumextprice_xtnumericrole, 'curr' AS sumcommission_xtnumericrole, 'curr' AS sumbaseextprice_xtnumericrole, @@ -23,14 +32,10 @@ FROM saleshistory WHERE ((cohist_commission <> 0) AND(cohist_invcdate BETWEEN AND ) - - AND (COALESCE(cohist_misc_type, '') <> 'T') - AND (COALESCE(cohist_misc_type, '') <> 'F') - AND (cohist_salesrep_id=) ) GROUP BY cohist_salesrep_id, salesrep_number, salesrep_name, cust_number, cust_name, - cohist_ordernumber, cohist_invcnumber, cohist_invcdate, currAbbr + cohist_ordernumber, cohist_orderdate, cohist_invcnumber, cohist_invcdate, currAbbr ORDER BY salesrep_number, cust_number, cohist_invcdate; diff --git a/foundation-database/public/tables/metasql/briefSalesHistory-detail.mql b/foundation-database/public/tables/metasql/briefSalesHistory-detail.mql index 8dc7a257b..18982ae02 100644 --- a/foundation-database/public/tables/metasql/briefSalesHistory-detail.mql +++ b/foundation-database/public/tables/metasql/briefSalesHistory-detail.mql @@ -4,21 +4,57 @@ -- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple. -- See www.xtuple.com/CPAL for the full text of the software license. -SELECT - COALESCE(cohead_id,-1) AS cohead_id, cust_id, cohist_ponumber, - cust_custtype_id, custtype_code, - cohist_cust_id, SUM(extcost) AS extcost, +SELECT cohead_id, cust_id, cohist_ponumber, + custtype_id, custtype_code, + cohist_cust_id, cohist_ordernumber, + cust_number, cust_name, currAbbr, + cohist_orderdate, cohist_invcdate, + CASE WHEN (COALESCE(cohist_invcnumber, '-1') IN ('', '-1')) THEN + ELSE cohist_invcnumber + END AS invoicenumber, + SUM(extprice) AS extprice, + SUM(baseextprice) AS baseextprice, + SUM(extcost) AS extcost, + SUM(margin) AS margin, + CASE WHEN (SUM(baseextprice) > 0.0) THEN + ROUND(SUM(margin) / SUM(baseextprice), 4) + ELSE 0.0 + END AS marginpercent, + + formatDate(cohist_orderdate) AS f_orderdate, + formatDate(cohist_invcdate) AS f_invcdate, + formatMoney(SUM(extprice)) AS f_extprice, + formatMoney(SUM(baseextprice)) AS f_baseextprice, + formatMoney(SUM(extcost)) AS f_extcost, + formatMoney(SUM(margin)) AS f_margin, + + AS cohist_invcdate_xtnullrole, + 'curr' AS extprice_xtnumericrole, + 'curr' AS baseextprice_xtnumericrole, 'curr' AS extcost_xtnumericrole, + 'curr' AS margin_xtnumericrole, + 'percent' AS marginpercent_xtnumericrole, + 0 AS baseextprice_xttotalrole, 0 AS extcost_xttotalrole, - cohist_ordernumber, - cust_number, cust_name, invoicenumber, - cohist_orderdate, cohist_invcdate, - SUM(baseextprice) AS extended, - 'curr' AS extended_xtnumericrole, - 0 AS extended_xttotalrole -FROM saleshistory - LEFT OUTER JOIN cohead ON (cohead_number=cohist_ordernumber) -WHERE ((cohist_invcdate BETWEEN AND ) + 0 AS margin_xttotalrole + + FROM saleshistorymisc + + FROM saleshistory + +WHERE ( (true) + + AND (cohist_invcdate >= ) + + + AND (cohist_invcdate <= ) + + + AND (cohist_shipdate >= ) + + + AND (cohist_shipdate <= ) + AND (cohist_cust_id=) @@ -26,7 +62,7 @@ WHERE ((cohist_invcdate BETWEEN AND ) - AND (cust_custtype_id=) + AND (custtype_id=) AND (custtype_code ~ ) @@ -43,24 +79,31 @@ WHERE ((cohist_invcdate BETWEEN AND ) )) ) - AND (itemsite_warehous_id=) + AND (warehous_id=) - AND (itemsite_item_id=) + AND (item_id=) - AND (item_prodcat_id=) + AND (prodcat_id=) - AND (item_prodcat_id IN (SELECT prodcat_id - FROM prodcat - WHERE (prodcat_code ~ ))) + AND (prodcat_id IN (SELECT prodcat_id + FROM prodcat + WHERE (prodcat_code ~ ))) AND (cohist_salesrep_id=) + + + AND (cohist_shipzone_id=) + + + AND (cohist_saletype_id=) ) -GROUP BY cohead_id, cust_id,cust_number,cust_custtype_id,cohist_cust_id,custtype_code, - cust_name,cohist_ordernumber, cohist_ponumber, - invoicenumber,cohist_orderdate, cohist_invcdate +GROUP BY cohead_id, cust_id, cust_number, custtype_id, + cohist_cust_id, custtype_code, currAbbr, + cust_name, cohist_ordernumber, cohist_ponumber, + cohist_invcnumber, cohist_orderdate, cohist_invcdate ORDER BY cohist_invcdate, cohist_orderdate; diff --git a/foundation-database/public/tables/metasql/invoices-detail.mql b/foundation-database/public/tables/metasql/invoices-detail.mql index 67ee698f4..20b36482b 100644 --- a/foundation-database/public/tables/metasql/invoices-detail.mql +++ b/foundation-database/public/tables/metasql/invoices-detail.mql @@ -29,11 +29,16 @@ SELECT invchead_id, cust_id, invchead_invcnumber AS docnumber, findCustomerForm(cust_id, 'I') AS reportname, + CASE WHEN (calcInvoiceAmt(invchead_id,'S') != 0.0) + THEN calcInvoiceAmt(invchead_id,'M') + ELSE 0.0 + END AS margin, CASE WHEN (calcInvoiceAmt(invchead_id,'S') != 0.0) THEN (calcInvoiceAmt(invchead_id,'M') / calcInvoiceAmt(invchead_id,'S')) ELSE 1.0 END AS marginpercent, 'percent' AS marginpercent_xtnumericrole, + 'curr' AS margin_xtnumericrole, 'curr' AS extprice_xtnumericrole, 'curr' AS balance_xtnumericrole, CASE WHEN (aropen_id IS NULL) THEN 'Unposted' END AS balance_qtdisplayrole diff --git a/foundation-database/public/tables/metasql/opensalesorders-detail.mql b/foundation-database/public/tables/metasql/opensalesorders-detail.mql index 81385aa52..bb5808447 100644 --- a/foundation-database/public/tables/metasql/opensalesorders-detail.mql +++ b/foundation-database/public/tables/metasql/opensalesorders-detail.mql @@ -20,12 +20,17 @@ SELECT DISTINCT firstline(cohead_ordercomments) AS notes, calcSalesOrderAmt(cohead_id) AS ordertotal, + CASE WHEN (calcSalesOrderAmt(cohead_id,'S') != 0.0) + THEN calcSalesOrderAmt(cohead_id,'M') + ELSE 0.0 + END AS ordermargin, CASE WHEN (calcSalesOrderAmt(cohead_id,'S') != 0.0) THEN (calcSalesOrderAmt(cohead_id,'M') / calcSalesOrderAmt(cohead_id,'S')) ELSE 1.0 END AS ordermarginpercent, 'percent' AS ordermarginpercent_xtnumericrole, - 'extprice' AS ordertotal_xtnumericrole + 'extprice' AS ordertotal_xtnumericrole, + 'extprice' AS ordermargin_xtnumericrole FROM cohead JOIN custinfo ON (cohead_cust_id=cust_id) JOIN custtype ON (cust_custtype_id=custtype_id) diff --git a/foundation-database/public/tables/metasql/salesHistory-detail.mql b/foundation-database/public/tables/metasql/salesHistory-detail.mql index 50da06fb9..a18a18356 100644 --- a/foundation-database/public/tables/metasql/salesHistory-detail.mql +++ b/foundation-database/public/tables/metasql/salesHistory-detail.mql @@ -4,66 +4,35 @@ -- Copyright (c) 1999-2014 by OpenMFG LLC, d/b/a xTuple. -- See www.xtuple.com/CPAL for the full text of the software license. -SELECT cohist.*, - CASE WHEN (cohist_invcnumber='-1') THEN +SELECT *, + CASE WHEN (COALESCE(cohist_invcnumber, '-1') IN ('', '-1')) THEN ELSE cohist_invcnumber END AS invoicenumber, - cust_number, cust_name, salesrep_name, - saletype_code, shipzone_name, - item_id, COALESCE(item_number, cohist_misc_descrip) AS item_number, - item_descrip1, (item_descrip1 || ' ' || item_descrip2) AS itemdescription, - warehous_code, - currtobase(cohist_curr_id, cohist_unitprice, cohist_invcdate) AS baseunitprice, - round((cohist_qtyshipped * cohist_unitprice), 2) AS extprice, - round((cohist_qtyshipped * currtobase(cohist_curr_id, cohist_unitprice, cohist_invcdate)), 2) AS baseextprice, - round((cohist_qtyshipped * cohist_unitcost), 4) AS extcost, - currtobase(cohist_curr_id, cohist_commission, cohist_invcdate) AS basecommission, + formatDate(cohist_orderdate) AS f_orderdate, formatDate(cohist_invcdate) AS f_invcdate, formatQty(cohist_qtyshipped) AS f_qtyshipped, formatBoolYN(cohist_commissionpaid) AS f_commissionpaid, - formatSalesPrice(currtobase(cohist_curr_id, cohist_unitprice, cohist_invcdate)) AS f_baseunitprice, - formatMoney(round((cohist_qtyshipped * cohist_unitprice), 2)) AS f_extprice, - formatMoney(round((cohist_qtyshipped * currtobase(cohist_curr_id, cohist_unitprice, cohist_invcdate)), 2)) AS f_baseextprice, - formatMoney(round((cohist_qtyshipped * cohist_unitcost), 4)) AS f_extcost, - formatMoney(currtobase(cohist_curr_id, cohist_commission, cohist_invcdate)) AS f_basecommission, + formatSalesPrice(baseunitprice) AS f_baseunitprice, + formatMoney(extprice) AS f_extprice, + formatMoney(baseextprice) AS f_baseextprice, + formatMoney(extcost) AS f_extcost, + formatMoney(margin) AS f_margin, + formatPrcnt(marginpercent) AS f_marginpercent, + formatMoney(basecommission) AS f_basecommission, - currConcat(cohist_curr_id) AS currAbbr, AS cohist_invcdate_xtnullrole, - 'qty' AS cohist_qtyshipped_xtnumericrole, - 'salesprice' AS cohist_unitprice_xtnumericrole, - 'salesprice' AS baseunitprice_xtnumericrole, - 'curr' AS extprice_xtnumericrole, - 'curr' AS baseextprice_xtnumericrole, - 'cost' AS cohist_unitcost_xtnumericrole, - 'curr' AS extcost_xtnumericrole, - 'curr' AS cohist_commission_xtnumericrole, - 'curr' AS basecommission_xtnumericrole, 0 AS cohist_qtyshipped_xttotalrole, 0 AS baseextprice_xttotalrole, 0 AS extcost_xttotalrole, + 0 AS margin_xttotalrole, 0 AS basecommission_xttotalrole - FROM cohist JOIN custinfo ON (cust_id=cohist_cust_id) - JOIN salesrep ON (salesrep_id=cohist_salesrep_id) - LEFT OUTER JOIN saletype ON (saletype_id=cohist_saletype_id) - LEFT OUTER JOIN shipzone ON (shipzone_id=cohist_shipzone_id) - LEFT OUTER JOIN itemsite ON (itemsite_id=cohist_itemsite_id) - LEFT OUTER JOIN site() ON (warehous_id=itemsite_warehous_id) - LEFT OUTER JOIN item ON (item_id=itemsite_item_id) + FROM saleshistorymisc - JOIN itemsite ON (itemsite_id=cohist_itemsite_id) - JOIN site() ON (warehous_id=itemsite_warehous_id) - JOIN item ON (item_id=itemsite_item_id) - - - JOIN cohead ON (cohead_number=cohist_ordernumber) + FROM saleshistory WHERE ( (true) - - AND (COALESCE(cohist_misc_type, '') <> 'F') - AND (COALESCE(cohist_misc_type, '') <> 'T') - AND (cohist_invcdate >= ) @@ -89,11 +58,11 @@ WHERE ( (true) AND (cohist_cust_id=) - AND (cust_custtype_id=) + AND (custtype_id=) - AND (cust_custtype_id IN (SELECT DISTINCT custtype_id - FROM custtype - WHERE (custtype_code ~ ))) + AND (custtype_id IN (SELECT DISTINCT custtype_id + FROM custtype + WHERE (custtype_code ~ ))) AND (cust_id IN (SELECT DISTINCT custgrpitem_cust_id @@ -112,19 +81,19 @@ WHERE ( (true) - AND (itemsite_item_id=) + AND (item_id=) - AND (item_prodcat_id=) + AND (prodcat_id=) - AND (item_prodcat_id IN (SELECT DISTINCT prodcat_id - FROM prodcat - WHERE (prodcat_code ~ ))) + AND (prodcat_id IN (SELECT DISTINCT prodcat_id + FROM prodcat + WHERE (prodcat_code ~ ))) - AND (itemsite_warehous_id=) + AND (warehous_id=) AND (cohist_shipzone_id=) @@ -136,5 +105,5 @@ WHERE ( (true) AND (cohead_id=) ) -ORDER BY cohist_invcdate, item_number; +ORDER BY cohist_invcdate, itemnumber; diff --git a/foundation-database/public/tables/metasql/summarizedSalesHistory-detail.mql b/foundation-database/public/tables/metasql/summarizedSalesHistory-detail.mql index 4fc320160..6386fd8e5 100644 --- a/foundation-database/public/tables/metasql/summarizedSalesHistory-detail.mql +++ b/foundation-database/public/tables/metasql/summarizedSalesHistory-detail.mql @@ -29,19 +29,19 @@ SELECT 1 AS dummy, cust_number, cohist_cust_id AS cust_number_xtidrole, cust_name, - custtype_code, cust_custtype_id AS custtype_code_xtidrole, + custtype_code, custtype_id AS custtype_code_xtidrole, item_number, item_id AS item_number_xtidrole, itemdescription, - salesrep_number, cohist_salesrep_id AS salesrep_number_xtidrole, salesrep_name, + salesrep_number, salesrep_id AS salesrep_number_xtidrole, salesrep_name, shipzone_name, shipzone_id AS shipzone_name_xtidrole, - warehous_code, itemsite_warehous_id AS warehous_code_xtidrole, + warehous_code, warehous_id AS warehous_code_xtidrole, currAbbr, @@ -76,9 +76,8 @@ SELECT 1 AS dummy, 'curr' AS totalsales_xtnumericrole, 0 AS totalunits_xttotalrole, 0 AS totalsales_xttotalrole -FROM saleshistory -WHERE ((COALESCE(cohist_misc_type, '') <> 'F') - AND (COALESCE(cohist_misc_type, '') <> 'T') +FROM saleshistorymisc +WHERE ( (TRUE) AND (cohist_invcdate >= ) @@ -96,11 +95,11 @@ WHERE ((COALESCE(cohist_misc_type, '') <> 'F') - AND (itemsite_warehous_id=) + AND (warehous_id=) - AND (itemsite_item_id=) + AND (item_id=) @@ -112,11 +111,11 @@ WHERE ((COALESCE(cohist_misc_type, '') <> 'F') - AND (cohist_salesrep_id=) + AND (salesrep_id=) - AND (item_prodcat_id=) + AND (prodcat_id=) @@ -124,7 +123,7 @@ WHERE ((COALESCE(cohist_misc_type, '') <> 'F') - AND (cust_custtype_id=) + AND (custtype_id=) @@ -158,7 +157,7 @@ WHERE ((COALESCE(cohist_misc_type, '') <> 'F') ) GROUP BY dummy - , cohist_salesrep_id, salesrep_number, salesrep_name + , salesrep_id, salesrep_number, salesrep_name , shipzone_id, shipzone_name, shipzone_descrip @@ -167,13 +166,13 @@ GROUP BY dummy , cohist_cust_id, cust_number, cust_name - , cust_custtype_id, custtype_code, custtype_descrip + , custtype_id, custtype_code, custtype_descrip , item_id, item_number, itemdescription - , itemsite_warehous_id, warehous_code, warehous_descrip + , warehous_id, warehous_code, warehous_descrip , cust_curr_id, currAbbr diff --git a/foundation-database/public/tables/report/BriefEarnedCommissions.xml b/foundation-database/public/tables/report/BriefEarnedCommissions.xml index b0a2f9780..f7bd1f960 100644 --- a/foundation-database/public/tables/report/BriefEarnedCommissions.xml +++ b/foundation-database/public/tables/report/BriefEarnedCommissions.xml @@ -3,6 +3,12 @@ Brief Earned Commissions BriefEarnedCommissions + + + + 0.05 + 0.05 + Letter 50 @@ -22,35 +28,10 @@ formatDate(<? value("startDate") ?>) AS startdate, formatDate(<? value("endDate") ?>) AS enddate; - + detail - SELECT cohist_salesrep_id, salesrep_number, salesrep_name, cust_number, cust_name, - cohist_ordernumber, cohist_invcnumber, formatDate(cohist_invcdate) AS f_invcdate, currAbbr, - formatMoney(SUM(baseextprice)) AS f_extprice, - formatMoney(SUM(basecommission)) AS f_commission, - SUM(baseextprice) AS extprice, - SUM(basecommission) AS commission -<? if exists("includeMisc") ?> -FROM saleshistorymisc -<? else ?> -FROM saleshistory -<? endif ?> -WHERE ( (cohist_commission <> 0) - AND (cohist_invcdate BETWEEN <? value("startDate") ?> AND <? value("endDate") ?>) - -<? if exists("includeMisc") ?> - AND (COALESCE(cohist_misc_type, '') <> 'T') - AND (COALESCE(cohist_misc_type, '') <> 'F') -<? endif ?> - -<? if exists("salesrep_id") ?> - AND (cohist_salesrep_id=<? value("salesrep_id") ?>) -<? endif ?> -) -GROUP BY cohist_salesrep_id, salesrep_number, salesrep_name, cust_number, cust_name, - cohist_ordernumber, cohist_invcnumber, cohist_invcdate, currAbbr -ORDER BY salesrep_number, cust_number, cohist_invcdate - + briefEarnedCommission + detail 221 @@ -527,7 +508,7 @@ ORDER BY salesrep_number, cust_number, cohist_invcdate detail - f_extprice + f_sumbaseextprice @@ -546,7 +527,7 @@ ORDER BY salesrep_number, cust_number, cohist_invcdate detail - f_commission + f_sumbasecommission @@ -772,7 +753,7 @@ ORDER BY salesrep_number, cust_number, cohist_invcdate detail - extprice + sumbaseextprice money @@ -793,7 +774,7 @@ ORDER BY salesrep_number, cust_number, cohist_invcdate detail - commission + sumbasecommission money diff --git a/foundation-database/public/tables/report/BriefSalesHistory.xml b/foundation-database/public/tables/report/BriefSalesHistory.xml index 31b4dbb31..39762d7b4 100644 --- a/foundation-database/public/tables/report/BriefSalesHistory.xml +++ b/foundation-database/public/tables/report/BriefSalesHistory.xml @@ -95,63 +95,10 @@ <? endif ?> AS docnumber; - + detail - SELECT cohist_ordernumber AS sonumber, - cohist_invcnumber AS invnumber, - formatDate(cohist_orderdate) AS orddate, - formatDate(cohist_invcdate, 'Return') AS shipdate, - SUM(round(cohist_qtyshipped * currtobase(cohist_curr_id,cohist_unitprice,cohist_invcdate),2)) as extended, - formatMoney(SUM(round(cohist_qtyshipped * currtobase(cohist_curr_id,cohist_unitprice,cohist_invcdate),2))) as f_total, - SUM(round(cohist_qtyshipped * currtobase(cohist_curr_id,cohist_unitprice,cohist_invcdate),2)) as total -FROM saleshistory - LEFT OUTER JOIN cohead ON (cohead_number=cohist_ordernumber) -WHERE ((cohist_invcdate BETWEEN <? value("startDate") ?> AND <? value("endDate") ?>) -<? if exists("cust_id") ?> - AND (cohist_cust_id=<? value("cust_id") ?>) -<? endif ?> -<? if exists("shipto_id") ?> - AND (cohist_shipto_id=<? value("shipto_id") ?>) -<? endif ?> -<? if exists("custtype_id") ?> - AND (cust_custtype_id=<? value("custtype_id") ?>) -<? endif ?> -<? if exists("custtype_pattern") ?> - AND (custtype_code ~ <? value("custtype_pattern") ?>) -<? endif ?> -<? if exists("custgrp_id") ?> - AND (cust_id IN (SELECT DISTINCT custgrpitem_cust_id - FROM custgrpitem - WHERE (custgrpitem_custgrp_id=<? value("custgrp_id") ?>))) -<? endif ?> -<? if exists("custgrp_pattern") ?> - AND (cust_id IN (SELECT DISTINCT custgrpitem_cust_id - FROM custgrp, custgrpitem - WHERE ( (custgrpitem_custgrp_id=custgrp_id) - AND (custgrp_name ~ <? value("custgrp_pattern") ?>) )) ) -<? endif ?> -<? if exists("warehous_id") ?> - AND (itemsite_warehous_id=<? value("warehous_id") ?>) -<? endif ?> -<? if exists("item_id") ?> - AND (itemsite_item_id=<? value("item_id") ?>) -<? endif ?> -<? if exists("prodcat_id") ?> - AND (item_prodcat_id=<? value("prodcat_id") ?>) -<? endif ?> -<? if exists("prodcat_pattern") ?> - AND (item_prodcat_id IN (SELECT prodcat_id - FROM prodcat - WHERE (prodcat_code ~ <? value("prodcat_pattern") ?>))) -<? endif ?> -<? if exists("salesrep_id") ?> - AND (cohist_salesrep_id=<? value("salesrep_id") ?>) -<? endif ?> - ) -GROUP BY cohead_id, cust_id,cust_number,cust_custtype_id,cohist_cust_id,custtype_code, - cust_name,cohist_ordernumber, cohist_ponumber, - cohist_invcnumber,cohist_orderdate, cohist_invcdate -ORDER BY cohist_invcdate, cohist_orderdate; + briefSalesHistory + detail 221 @@ -185,7 +132,7 @@ ORDER BY cohist_invcdate, cohist_orderdate; - Ship Date + Invc. Date - + detail salesHistory detail @@ -515,7 +521,7 @@ detail - item_number + itemnumber @@ -800,7 +806,8 @@ detail baseextprice - qty + qty + @@ -820,7 +827,8 @@ detail basecommission - qty + qty + diff --git a/foundation-database/public/tables/report/SalesHistory.xml b/foundation-database/public/tables/report/SalesHistory.xml index e21848e45..5a54703ad 100644 --- a/foundation-database/public/tables/report/SalesHistory.xml +++ b/foundation-database/public/tables/report/SalesHistory.xml @@ -15,114 +15,10 @@ 50 50 50 - + detail - SELECT cohist_ordernumber AS sonumber, - cohist_invcnumber AS invnumber, - formatDate(cohist_orderdate) AS orddate, - formatDate(cohist_invcdate, 'Return') AS invcdate, - item_number, item_descrip1, item_descrip2, - formatQty(cohist_qtyshipped) AS shipped, - <? if exists("showPrices") ?> - formatPrice(currtobase(cohist_curr_id,cohist_unitprice,cohist_invcdate)) AS unitprice, - formatMoney(round(cohist_qtyshipped * currtobase(cohist_curr_id,cohist_unitprice,cohist_invcdate),2)) AS f_total, - <? else ?> - '' AS unitprice, - '' AS f_total, - <? endif ?> - round(cohist_qtyshipped * currtobase(cohist_curr_id,cohist_unitprice,cohist_invcdate),2) AS total - FROM cohist JOIN custinfo ON (cust_id=cohist_cust_id) - JOIN salesrep ON (salesrep_id=cohist_salesrep_id) -<? if exists("includeMisc") ?> - LEFT OUTER JOIN itemsite ON (itemsite_id=cohist_itemsite_id) - LEFT OUTER JOIN site() ON (warehous_id=itemsite_warehous_id) - LEFT OUTER JOIN item ON (item_id=itemsite_item_id) -<? else ?> - JOIN itemsite ON (itemsite_id=cohist_itemsite_id) - JOIN site() ON (warehous_id=itemsite_warehous_id) - JOIN item ON (item_id=itemsite_item_id) -<? endif ?> -<? if exists("cohead_id") ?> - JOIN cohead ON (cohead_number=cohist_ordernumber) -<? endif ?> -WHERE ( (true) -<? if exists("includeMisc") ?> - AND (COALESCE(cohist_misc_type, '') <> 'F') - AND (COALESCE(cohist_misc_type, '') <> 'T') -<? endif ?> -<? if exists("startDate") ?> - AND (cohist_invcdate >= <? value("startDate") ?>) -<? endif ?> -<? if exists("endDate") ?> - AND (cohist_invcdate <= <? value("endDate") ?>) -<? endif ?> -<? if exists("shipStartDate") ?> - AND (cohist_shipdate >= <? value("shipStartDate") ?>) -<? endif ?> -<? if exists("shipEndDate") ?> - AND (cohist_shipdate <= <? value("shipEndDate") ?>) -<? endif ?> -<? if exists("salesrep_id") ?> - AND (cohist_salesrep_id=<? value("salesrep_id") ?>) -<? endif ?> -<? if exists("shipto_id") ?> - AND (cohist_shipto_id=<? value("shipto_id") ?>) -<? endif ?> -<? if exists("billToName") ?> - AND (UPPER(cohist_billtoname) ~ UPPER(<? value("billToName") ?>)) -<? endif ?> -<? if exists("cust_id") ?> - AND (cohist_cust_id=<? value("cust_id") ?>) -<? endif ?> -<? if exists("custtype_id") ?> - AND (cust_custtype_id=<? value("custtype_id") ?>) -<? elseif exists("custtype_pattern") ?> - AND (cust_custtype_id IN (SELECT DISTINCT custtype_id - FROM custtype - WHERE (custtype_code ~ <? value("custtype_pattern") ?>))) -<? endif ?> -<? if exists("by_custgrp" ?> - AND (cust_id IN (SELECT DISTINCT custgrpitem_cust_id - FROM custgrpitem)) -<? endif ?> -<? if exists("custgrp_id") ?> - AND (cust_id IN (SELECT DISTINCT custgrpitem_cust_id - FROM custgrpitem - WHERE (custgrpitem_custgrp_id=<? value("custgrp_id") ?>))) -<? endif ?> -<? if exists("custgrp_pattern") ?> - AND (cust_id IN (SELECT DISTINCT custgrpitem_cust_id - FROM custgrp, custgrpitem - WHERE ( (custgrpitem_custgrp_id=custgrp_id) - AND (custgrp_name ~ <? value("custgrp_pattern") ?>) )) ) -<? endif ?> - -<? if exists("item_id") ?> - AND (itemsite_item_id=<? value("item_id") ?>) -<? endif ?> -<? if exists("prodcat_id") ?> - AND (item_prodcat_id=<? value("prodcat_id") ?>) -<? endif ?> -<? if exists("prodcat_pattern") ?> - AND (item_prodcat_id IN (SELECT DISTINCT prodcat_id - FROM prodcat - WHERE (prodcat_code ~ <? value("prodcat_pattern") ?>))) -<? endif ?> - -<? if exists("warehous_id") ?> - AND (itemsite_warehous_id=<? value("warehous_id") ?>) -<? endif ?> -<? if exists("shipzone_id") ?> - AND (cohist_shipzone_id=<? value("shipzone_id") ?>) -<? endif ?> -<? if exists("saletype_id") ?> - AND (cohist_saletype_id=<? value("saletype_id") ?>) -<? endif ?> -<? if exists("cohead_id") ?> - AND (cohead_id=<? value("cohead_id") ?>) -<? endif ?> - ) -ORDER BY cohist_invcdate, item_number + salesHistory + detail head @@ -496,6 +392,50 @@ ORDER BY cohist_invcdate, item_number
detail + + total + + + 39 + + + 660 + 9 + 80 + 15 + + + Arial + 8 + bold + + + + + detail + baseextprice + + money + + + + + detail @@ -536,7 +476,7 @@ ORDER BY cohist_invcdate, item_number detail - sonumber + cohist_ordernumber @@ -574,7 +514,7 @@ ORDER BY cohist_invcdate, item_number detail - unitprice + f_baseunitprice @@ -593,7 +533,7 @@ ORDER BY cohist_invcdate, item_number detail - orddate + f_orderdate @@ -612,7 +552,7 @@ ORDER BY cohist_invcdate, item_number detail - shipped + f_qtyshipped @@ -638,7 +578,7 @@ ORDER BY cohist_invcdate, item_number detail - invcdate + f_invcdate @@ -657,7 +597,7 @@ ORDER BY cohist_invcdate, item_number detail - item_number + itemnumber @@ -676,7 +616,7 @@ ORDER BY cohist_invcdate, item_number detail - f_total + f_baseextprice @@ -695,57 +635,11 @@ ORDER BY cohist_invcdate, item_number detail - invnumber + invoicenumber
-
- total - - - showPrices - - 16 - - - 665 - 0 - 80 - 15 - - - Arial - 8 - bold - - - - - detail - total - - money - - - - -
16