Keep examples i used for debug purpose as comments
This commit is contained in:
parent
5343dfab6a
commit
28a0e00de1
@ -1,21 +1,21 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2009-2012 Regis Houssin <regis@dolibarr.fr>
|
* Copyright (C) 2009-2012 Regis Houssin <regis@dolibarr.fr>
|
||||||
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
|
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/admin/limits.php
|
* \file htdocs/admin/limits.php
|
||||||
@ -82,7 +82,7 @@ if ($action == 'update')
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* View
|
* View
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$form=new Form($db);
|
$form=new Form($db);
|
||||||
|
|
||||||
@ -167,6 +167,7 @@ else
|
|||||||
print '</div>';
|
print '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$vat_rates=array();
|
$vat_rates=array();
|
||||||
|
|
||||||
// TODO move to DAO class
|
// TODO move to DAO class
|
||||||
@ -198,56 +199,57 @@ print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
|
|||||||
print " x ".$langs->trans("Quantity").": ".$qty;
|
print " x ".$langs->trans("Quantity").": ".$qty;
|
||||||
print " - ".$langs->trans("VAT").": ".$vat.'%';
|
print " - ".$langs->trans("VAT").": ".$vat.'%';
|
||||||
print " -> ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
|
print " -> ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
|
||||||
print '<br>';
|
|
||||||
|
|
||||||
print $langs->trans("VATRoundedByLine").' ('.$langs->trans("DolibarrDefault").')<br><br>';
|
|
||||||
|
|
||||||
foreach($vat_rates as $vat)
|
foreach($vat_rates as $vat)
|
||||||
{
|
{
|
||||||
for ($qty=1; $qty<=2; $qty++)
|
for ($qty=1; $qty<=2; $qty++)
|
||||||
{
|
{
|
||||||
$s1=10/3;
|
$s=10/3;
|
||||||
$s2=2/7;
|
$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0);
|
||||||
|
print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
|
||||||
// Round by line
|
|
||||||
$tmparray1=calcul_price_total(1,$qty*price2num($s1,'MU'),0,$vat,0,0,0,'HT',0);
|
|
||||||
$tmparray2=calcul_price_total(1,$qty*price2num($s2,'MU'),0,$vat,0,0,0,'HT',0);
|
|
||||||
$total_ht = $tmparray1[0] + $tmparray2[0];
|
|
||||||
$total_tva = $tmparray1[1] + $tmparray2[1];
|
|
||||||
$total_ttc = $tmparray1[2] + $tmparray2[2];
|
|
||||||
|
|
||||||
print $langs->trans("UnitPriceOfProduct").": ".(price2num($s1,'MU') + price2num($s2,'MU'));
|
|
||||||
print " x ".$langs->trans("Quantity").": ".$qty;
|
print " x ".$langs->trans("Quantity").": ".$qty;
|
||||||
print " - ".$langs->trans("VAT").": ".$vat.'%';
|
print " - ".$langs->trans("VAT").": ".$vat.'%';
|
||||||
print " -> ".$langs->trans("TotalPriceAfterRounding").": ".$total_ht.' / '.$total_tva.' / '.$total_ttc."<br>\n";
|
print " -> ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<br>'.$langs->trans("VATRoundedOnTotal").'<br><br>';
|
|
||||||
|
|
||||||
foreach($vat_rates as $vat)
|
// More examples
|
||||||
{
|
// This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
|
||||||
for ($qty=1; $qty<=2; $qty++)
|
// were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.
|
||||||
{
|
|
||||||
$s1=10/3;
|
|
||||||
$s2=2/7;
|
|
||||||
|
|
||||||
// Global round
|
/*
|
||||||
$subtotal_ht = (($qty*price2num($s1,'MU')) + ($qty*price2num($s2,'MU')));
|
$s=10/3;$qty=1;$vat=0;
|
||||||
$tmparray3=calcul_price_total(1,$subtotal_ht,0,$vat,0,0,0,'HT',0);
|
$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0);
|
||||||
$total_ht = $tmparray3[0];
|
print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
|
||||||
$total_tva = $tmparray3[1];
|
print " x ".$langs->trans("Quantity").": ".$qty;
|
||||||
$total_ttc = $tmparray3[2];
|
print " - ".$langs->trans("VAT").": ".$vat.'%';
|
||||||
|
print " -> ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
|
||||||
|
|
||||||
|
$s=10/3;$qty=2;$vat=0;
|
||||||
|
$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0);
|
||||||
|
print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
|
||||||
|
print " x ".$langs->trans("Quantity").": ".$qty;
|
||||||
|
print " - ".$langs->trans("VAT").": ".$vat.'%';
|
||||||
|
print " -> ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
|
||||||
|
|
||||||
|
$s=10/3;$qty=1;$vat=10;
|
||||||
|
$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0);
|
||||||
|
print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
|
||||||
|
print " x ".$langs->trans("Quantity").": ".$qty;
|
||||||
|
print " - ".$langs->trans("VAT").": ".$vat.'%';
|
||||||
|
print " -> ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
|
||||||
|
|
||||||
|
$s=10/3;$qty=2;$vat=10;
|
||||||
|
$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0);
|
||||||
|
print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU');
|
||||||
|
print " x ".$langs->trans("Quantity").": ".$qty;
|
||||||
|
print " - ".$langs->trans("VAT").": ".$vat.'%';
|
||||||
|
print " -> ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
|
||||||
|
*/
|
||||||
|
|
||||||
print $langs->trans("UnitPriceOfProduct").": ".price2num($s1+$s2,'MU');
|
|
||||||
print " x ".$langs->trans("Quantity").": ".$qty;
|
|
||||||
print " - ".$langs->trans("VAT").": ".$vat.'%';
|
|
||||||
print " -> ".$langs->trans("TotalPriceAfterRounding").": ".$total_ht.' / '.$total_tva.' / '.$total_ttc."<br>\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
llxFooter();
|
llxFooter();
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user