Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: test limits with vat rates of current country

Browse Source 
Fix: uniform code
This commit is contained in:
Regis Houssin 2012-01-08 10:53:05 +01:00
parent f3e5774469
commit f7c61369d4
2 changed files with 132 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
htdocs/admin/limits.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -30,11 +30,11 @@ $langs->load("companies");
$langs->load("products");
$langs->load("admin");
if (!$user->admin)
accessforbidden();
if (! $user->admin) accessforbidden();
$action = GETPOST('action','alpha');
if (isset($_POST["action"]) && $_POST["action"] == 'update')
if ($action == 'update')
{
$error=0;
$MAXDEC=8;
@ -96,9 +96,9 @@ print "<br>\n";
if ($mesg) print $mesg.'<br>';
if (isset($_GET["action"]) && $_GET["action"] == 'edit')
if ($action == 'edit')
{
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update">';
@ -167,6 +167,27 @@ else
print '</div>';
}
$vat_rates=array();
// TODO move to DAO class
$sql.="SELECT taux as vat_rate";
$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
$sql.=" WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$mysoc->country_code."'";
$sql.=" ORDER BY t.taux ASC";
$resql=$db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
if ($num)
{
for ($i = 0; $i < $num; $i++)
{
$obj = $db->fetch_object($resql);
$vat_rates[$i] = $obj->vat_rate;
}
}
}
// Show examples
print '<b>'.$langs->trans("ExamplesWithCurrentSetup").":</b><br>\n";
@ -178,35 +199,21 @@ print " x ".$langs->trans("Quantity").": ".$qty;
print " - ".$langs->trans("VAT").": ".$vat.'%';
print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
$s=10/3;$qty=1;$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 " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
foreach($vat_rates as $vat)
{
for ($qty=1; $qty<=2; $qty++)
{
$s=10/3;
$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 " &nbsp; -> &nbsp; ".$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 " &nbsp; -> &nbsp; ".$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 " &nbsp; -> &nbsp; ".$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 " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
llxFooter();
$db->close();
llxFooter();
?>

184
htdocs/product/price.php
View File

@ -1,9 +1,9 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
*
* 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
@ -32,25 +32,25 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
$langs->load("products");
$langs->load("bills");
// Security check
if (isset($_GET["id"]) || isset($_GET["ref"]))
{
$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
}
$fieldid = isset($_GET["ref"])?'ref':'rowid';
$socid=$user->societe_id?$user->societe_id:0;
$result=restrictedArea($user,'produit|service',$id,'product','','',$fieldid);
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'alpha');
// Security check
$fieldid = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
$socid = ($user->societe_id ? $user->societe_id : 0);
$result=restrictedArea($user,'produit|service',$fieldid,'product','','',$fieldtype);
$object = new Product($db);
/*
* Actions
*/
if ($_POST["action"] == 'update_price' && ! $_POST["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer))
if ($action == 'update_price' && ! $_POST["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer))
{
$product = new Product($db);
$result = $product->fetch($_GET["id"]);
$result = $object->fetch($id);
// MultiPrix
if($conf->global->PRODUIT_MULTIPRICES)
@ -84,23 +84,21 @@ if ($_POST["action"] == 'update_price' && ! $_POST["cancel"] && ($user->rights->
$newvat=str_replace('*','',$_POST["tva_tx"]);
}
if ($product->update_price($product->id, $newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr) > 0)
if ($object->update_price($object->id, $newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr) > 0)
{
$_GET["action"] = '';
$action = '';
$mesg = '<div class="ok">'.$langs->trans("RecordSaved").'</div>';
}
else
{
$_GET["action"] = 'edit_price';
$mesg = '<div class="error">'.$product->error.'</div>';
$action = 'edit_price';
$mesg = '<div class="error">'.$object->error.'</div>';
}
}
if ($_GET["action"] == 'delete' && $user->rights->produit->supprimer)
else if ($action == 'delete' && $user->rights->produit->supprimer)
{
$productstatic = new Product($db);
$result=$productstatic->log_price_delete($user,$_GET["lineid"]);
if ($result < 0) $mesg='<div class="error">'.$productstatic->error.'</div>';
$result=$object->log_price_delete($user,$_GET["lineid"]);
if ($result < 0) $mesg='<div class="error">'.$object->error.'</div>';
}
@ -110,15 +108,13 @@ if ($_GET["action"] == 'delete' && $user->rights->produit->supprimer)
$form = new Form($db);
$product = new Product($db);
if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]);
if ($_GET["id"]) $result = $product->fetch($_GET["id"]);
if (! empty($id) || ! empty($ref)) $result = $object->fetch($id, $ref);
llxHeader("","",$langs->trans("CardProduct".$product->type));
llxHeader("","",$langs->trans("CardProduct".$object->type));
$head=product_prepare_head($product, $user);
$titre=$langs->trans("CardProduct".$product->type);
$picto=($product->type==1?'service':'product');
$head=product_prepare_head($object, $user);
$titre=$langs->trans("CardProduct".$object->type);
$picto=($object->type==1?'service':'product');
dol_fiche_head($head, 'price', $titre, 0, $picto);
@ -127,21 +123,21 @@ print '<table class="border" width="100%">';
// Ref
print '<tr>';
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="2">';
print $form->showrefnav($product,'ref','',1,'ref');
print $form->showrefnav($object,'ref','',1,'ref');
print '</td>';
print '</tr>';
// Label
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->libelle.'</td>';
$isphoto=$product->is_photo_available($conf->product->dir_output);
$isphoto=$object->is_photo_available($conf->product->dir_output);
$nblignes=5;
if ($isphoto)
{
// Photo
print '<td valign="middle" align="center" width="30%" rowspan="'.$nblignes.'">';
print $product->show_photos($conf->product->dir_output,1,1,0,0,0,80);
print $object->show_photos($conf->product->dir_output,1,1,0,0,0,80);
print '</td>';
}
@ -158,39 +154,39 @@ if ($conf->global->PRODUIT_MULTIPRICES)
print '<tr><td>'.$langs->trans("SellingPrice").'</td>';
if ($product->multiprices_base_type["$soc->price_level"] == 'TTC')
if ($object->multiprices_base_type["$soc->price_level"] == 'TTC')
{
print '<td>'.price($product->multiprices_ttc["$soc->price_level"]);
print '<td>'.price($object->multiprices_ttc["$soc->price_level"]);
}
else
{
print '<td>'.price($product->multiprices["$soc->price_level"]);
print '<td>'.price($object->multiprices["$soc->price_level"]);
}
if ($product->multiprices_base_type["$soc->price_level"])
if ($object->multiprices_base_type["$soc->price_level"])
{
print ' '.$langs->trans($product->multiprices_base_type["$soc->price_level"]);
print ' '.$langs->trans($object->multiprices_base_type["$soc->price_level"]);
}
else
{
print ' '.$langs->trans($product->price_base_type);
print ' '.$langs->trans($object->price_base_type);
}
print '</td></tr>';
// Prix mini
print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
if ($product->multiprices_base_type["$soc->price_level"] == 'TTC')
if ($object->multiprices_base_type["$soc->price_level"] == 'TTC')
{
print price($product->multiprices_min_ttc["$soc->price_level"]).' '.$langs->trans($product->multiprices_base_type["$soc->price_level"]);
print price($object->multiprices_min_ttc["$soc->price_level"]).' '.$langs->trans($object->multiprices_base_type["$soc->price_level"]);
}
else
{
print price($product->multiprices_min["$soc->price_level"]).' '.$langs->trans($product->multiprices_base_type["$soc->price_level"]);
print price($object->multiprices_min["$soc->price_level"]).' '.$langs->trans($object->multiprices_base_type["$soc->price_level"]);
}
print '</td></tr>';
// TVA
print '<tr><td>'.$langs->trans("VATRate").'</td><td>'.vatrate($product->multiprices_tva_tx["$soc->price_level"],true).'</td></tr>';
print '<tr><td>'.$langs->trans("VATRate").'</td><td>'.vatrate($object->multiprices_tva_tx["$soc->price_level"],true).'</td></tr>';
}
else
{
@ -199,39 +195,39 @@ if ($conf->global->PRODUIT_MULTIPRICES)
// TVA
if ($i == 1) // We show only price for level 1
{
print '<tr><td>'.$langs->trans("VATRate").'</td><td>'.vatrate($product->multiprices_tva_tx[1],true).'</td></tr>';
print '<tr><td>'.$langs->trans("VATRate").'</td><td>'.vatrate($object->multiprices_tva_tx[1],true).'</td></tr>';
}
print '<tr><td>'.$langs->trans("SellingPrice").' '.$i.'</td>';
if ($product->multiprices_base_type["$i"] == 'TTC')
if ($object->multiprices_base_type["$i"] == 'TTC')
{
print '<td>'.price($product->multiprices_ttc["$i"]);
print '<td>'.price($object->multiprices_ttc["$i"]);
}
else
{
print '<td>'.price($product->multiprices["$i"]);
print '<td>'.price($object->multiprices["$i"]);
}
if ($product->multiprices_base_type["$i"])
if ($object->multiprices_base_type["$i"])
{
print ' '.$langs->trans($product->multiprices_base_type["$i"]);
print ' '.$langs->trans($object->multiprices_base_type["$i"]);
}
else
{
print ' '.$langs->trans($product->price_base_type);
print ' '.$langs->trans($object->price_base_type);
}
print '</td></tr>';
// Prix mini
print '<tr><td>'.$langs->trans("MinPrice").' '.$i.'</td><td>';
if ($product->multiprices_base_type["$i"] == 'TTC')
if ($object->multiprices_base_type["$i"] == 'TTC')
{
print price($product->multiprices_min_ttc["$i"]).' '.$langs->trans($product->multiprices_base_type["$i"]);
print price($object->multiprices_min_ttc["$i"]).' '.$langs->trans($object->multiprices_base_type["$i"]);
}
else
{
print price($product->multiprices_min["$i"]).' '.$langs->trans($product->multiprices_base_type["$i"]);
print price($object->multiprices_min["$i"]).' '.$langs->trans($object->multiprices_base_type["$i"]);
}
print '</td></tr>';
}
@ -240,36 +236,36 @@ if ($conf->global->PRODUIT_MULTIPRICES)
else
{
// TVA
print '<tr><td>'.$langs->trans("VATRate").'</td><td>'.vatrate($product->tva_tx.($product->tva_npr?'*':''),true).'</td></tr>';
print '<tr><td>'.$langs->trans("VATRate").'</td><td>'.vatrate($object->tva_tx.($object->tva_npr?'*':''),true).'</td></tr>';
// Price
print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
if ($product->price_base_type == 'TTC')
if ($object->price_base_type == 'TTC')
{
print price($product->price_ttc).' '.$langs->trans($product->price_base_type);
print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
}
else
{
print price($product->price).' '.$langs->trans($product->price_base_type);
print price($object->price).' '.$langs->trans($object->price_base_type);
}
print '</td></tr>';
// Price minimum
print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
if ($product->price_base_type == 'TTC')
if ($object->price_base_type == 'TTC')
{
print price($product->price_min_ttc).' '.$langs->trans($product->price_base_type);
print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
}
else
{
print price($product->price_min).' '.$langs->trans($product->price_base_type);
print price($object->price_min).' '.$langs->trans($object->price_base_type);
}
print '</td></tr>';
}
// Status (to sell)
print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
print $product->getLibStatut(2,0);
print $object->getLibStatut(2,0);
print '</td></tr>';
print "</table>\n";
@ -285,13 +281,13 @@ if ($mesg) print $mesg;
/* */
/* ************************************************************************** */
if (empty($_GET["action"]) || $_GET["action"]=='delete')
if ($action == 'delete')
{
print "\n<div class=\"tabsAction\">\n";
print "\n".'<div class="tabsAction">'."\n";
if ($user->rights->produit->creer || $user->rights->service->creer)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/price.php?action=edit_price&amp;id='.$product->id.'">'.$langs->trans("UpdatePrice").'</a>';
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit_price&amp;id='.$object->id.'">'.$langs->trans("UpdatePrice").'</a>';
}
print "\n</div>\n";
@ -302,21 +298,21 @@ if (empty($_GET["action"]) || $_GET["action"]=='delete')
/*
* Edition du prix
*/
if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->rights->service->creer))
if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->service->creer))
{
print_fiche_titre($langs->trans("NewPrice"),'','');
if (empty($conf->global->PRODUIT_MULTIPRICES))
{
print '<form action="price.php?id='.$product->id.'" method="post">';
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update_price">';
print '<input type="hidden" name="id" value="'.$product->id.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<table class="border" width="100%">';
// VAT
print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
print $form->load_tva("tva_tx",$product->tva_tx,$mysoc,'',$product->id,$product->tva_npr);
print $form->load_tva("tva_tx",$object->tva_tx,$mysoc,'',$object->id,$object->tva_npr);
print '</td></tr>';
// Price base
@ -324,7 +320,7 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
print $langs->trans('PriceBase');
print '</td>';
print '<td>';
print $form->select_PriceBaseType($product->price_base_type, "price_base_type");
print $form->select_PriceBaseType($object->price_base_type, "price_base_type");
print '</td>';
print '</tr>';
@ -333,13 +329,13 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
$text=$langs->trans('SellingPrice');
print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
print '</td><td>';
if ($product->price_base_type == 'TTC')
if ($object->price_base_type == 'TTC')
{
print '<input name="price" size="10" value="'.price($product->price_ttc).'">';
print '<input name="price" size="10" value="'.price($object->price_ttc).'">';
}
else
{
print '<input name="price" size="10" value="'.price($product->price).'">';
print '<input name="price" size="10" value="'.price($object->price).'">';
}
print '</td></tr>';
@ -347,13 +343,13 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
print '<tr><td>' ;
$text=$langs->trans('MinPrice');
print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
if ($product->price_base_type == 'TTC')
if ($object->price_base_type == 'TTC')
{
print '<td><input name="price_min" size="10" value="'.price($product->price_min_ttc).'">';
print '<td><input name="price_min" size="10" value="'.price($object->price_min_ttc).'">';
}
else
{
print '<td><input name="price_min" size="10" value="'.price($product->price_min).'">';
print '<td><input name="price_min" size="10" value="'.price($object->price_min).'">';
}
print '</td></tr>';
@ -368,22 +364,22 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
{
for ($i=1; $i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
{
print '<form action="price.php?id='.$product->id.'" method="post">';
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update_price">';
print '<input type="hidden" name="id" value="'.$product->id.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<table class="border" width="100%">';
// VAT
if ($i == 1)
{
print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
print $form->load_tva("tva_tx_".$i,$product->multiprices_tva_tx["$i"],$mysoc,'',$product->id);
print $form->load_tva("tva_tx_".$i,$object->multiprices_tva_tx["$i"],$mysoc,'',$object->id);
print '</td></tr>';
}
else
{ // We always use the vat rate of price level 1 (A vat rate does not depends on customer)
print '<input type="hidden" name="tva_tx_'.$i.'" value="'.$product->multiprices_tva_tx[1].'">';
print '<input type="hidden" name="tva_tx_'.$i.'" value="'.$object->multiprices_tva_tx[1].'">';
}
// Selling price
@ -391,28 +387,28 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
$text=$langs->trans('SellingPrice').' '.$i;
print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
print '</td><td>';
if ($product->multiprices_base_type["$i"] == 'TTC')
if ($object->multiprices_base_type["$i"] == 'TTC')
{
print '<input name="price_'.$i.'" size="10" value="'.price($product->multiprices_ttc["$i"]).'">';
print '<input name="price_'.$i.'" size="10" value="'.price($object->multiprices_ttc["$i"]).'">';
}
else
{
print '<input name="price_'.$i.'" size="10" value="'.price($product->multiprices["$i"]).'">';
print '<input name="price_'.$i.'" size="10" value="'.price($object->multiprices["$i"]).'">';
}
print $form->select_PriceBaseType($product->multiprices_base_type["$i"], "multiprices_base_type_".$i);
print $form->select_PriceBaseType($object->multiprices_base_type["$i"], "multiprices_base_type_".$i);
print '</td></tr>';
// Min price
print '<tr><td>';
$text=$langs->trans('MinPrice').' '.$i;
print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
if ($product->multiprices_base_type["$i"] == 'TTC')
if ($object->multiprices_base_type["$i"] == 'TTC')
{
print '<td><input name="price_min_'.$i.'" size="10" value="'.price($product->multiprices_min_ttc["$i"]).'">';
print '<td><input name="price_min_'.$i.'" size="10" value="'.price($object->multiprices_min_ttc["$i"]).'">';
}
else
{
print '<td><input name="price_min_'.$i.'" size="10" value="'.price($product->multiprices_min["$i"]).'">';
print '<td><input name="price_min_'.$i.'" size="10" value="'.price($object->multiprices_min["$i"]).'">';
}
print '</td></tr>';
@ -432,7 +428,7 @@ $sql.= " p.price_level, p.price_min, p.price_min_ttc,";
$sql.= " p.date_price as dp, u.rowid as user_id, u.login";
$sql.= " FROM ".MAIN_DB_PREFIX."product_price as p,";
$sql.= " ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE fk_product = ".$product->id;
$sql.= " WHERE fk_product = ".$object->id;
$sql.= " AND p.fk_user_author = u.rowid";
if ($socid && $conf->global->PRODUIT_MULTIPRICES) $sql.= " AND p.price_level = ".$soc->price_level;
$sql.= " ORDER BY p.date_price DESC, p.price_level ASC";
@ -449,7 +445,7 @@ if ($result)
// Il doit au moins y avoir la ligne de prix initial.
// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
$product->update_price($product->id, $product->price, 'HT', $user, $newprice_min);
$object->update_price($object->id, $object->price, 'HT', $user, $newprice_min);
$result = $db->query($sql);
$num = $db->num_rows($result);
@ -511,7 +507,7 @@ if ($result)
print '<td align="right">';
if ($i > 0)
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$product->id.'&amp;lineid='.$objp->rowid.'">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
print img_delete();
print '</a>';
}
@ -532,8 +528,8 @@ else
dol_print_error($db);
}
llxFooter();
$db->close();
llxFooter();
?>