diff --git a/build.xml b/build.xml index 5cdcaf708db..14657ea5ba0 100644 --- a/build.xml +++ b/build.xml @@ -77,14 +77,14 @@ - + - - * Copyright (C) 2009 Regis Houssin - * Copyright (C) 2010 Juanjo Menent +/* Copyright (C) 2007-2010 Laurent Destailleur + * Copyright (C) 2009-2012 Regis Houssin + * Copyright (C) 2010 Juanjo Menent * * 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 "
\n"; if ($mesg) print $mesg.'
'; -if (isset($_GET["action"]) && $_GET["action"] == 'edit') +if ($action == 'edit') { - print '
'; + print ''; print ''; print ''; @@ -167,6 +167,27 @@ else print ''; } +$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 ''.$langs->trans("ExamplesWithCurrentSetup").":
\n"; @@ -177,36 +198,56 @@ 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]."
\n"; +print '
'; -$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 "   ->   ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."
\n"; +print $langs->trans("VATRoundedByLine").' ('.$langs->trans("DolibarrDefault").')

'; -$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]."
\n"; +foreach($vat_rates as $vat) +{ + for ($qty=1; $qty<=2; $qty++) + { + $s1=10/3; + $s2=2/7; + + // 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 " - ".$langs->trans("VAT").": ".$vat.'%'; + print "   ->   ".$langs->trans("TotalPriceAfterRounding").": ".$total_ht.' / '.$total_tva.' / '.$total_ttc."
\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]."
\n"; +print '
'.$langs->trans("VATRoundedOnTotal").'

'; -$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]."
\n"; +foreach($vat_rates as $vat) +{ + for ($qty=1; $qty<=2; $qty++) + { + $s1=10/3; + $s2=2/7; + + // Global round + $subtotal_ht = (($qty*price2num($s1,'MU')) + ($qty*price2num($s2,'MU'))); + $tmparray3=calcul_price_total(1,$subtotal_ht,0,$vat,0,0,0,'HT',0); + $total_ht = $tmparray3[0]; + $total_tva = $tmparray3[1]; + $total_ttc = $tmparray3[2]; + + 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."
\n"; + } +} + +llxFooter(); $db->close(); -llxFooter(); ?> diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index 3a9ba77db04..6963695c78e 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -1,27 +1,29 @@ + * Copyright (C) 2011 Laurent Destailleur + * Copyright (C) 2011 Juanjo Menent + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + $langs->load("main"); $langs->load("bills"); $langs->load("cashdesk"); + ?> - diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php index c9fbce6644b..79e7359cc10 100644 --- a/htdocs/cashdesk/tpl/liste_articles.tpl.php +++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php @@ -1,30 +1,31 @@ + * Copyright (C) 2011 Juanjo Menent + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); + $langs->load("main"); $langs->load("bills"); $langs->load("cashdesk"); -?> - -
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index 6ed13b6c0c8..040f0f8fd4b 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -1,22 +1,26 @@ + * Copyright (C) 2011 Juanjo Menent + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + $langs->load("main"); + ?> -
trans("Summary"); ?> diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php index f186a070fb0..bddaadc9f2f 100644 --- a/htdocs/cashdesk/tpl/validation2.tpl.php +++ b/htdocs/cashdesk/tpl/validation2.tpl.php @@ -1,21 +1,25 @@ + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + $langs->load("main"); + ?> -

trans("SellFinished"); ?>

diff --git a/htdocs/product/price.php b/htdocs/product/price.php index b0c90213241..61df125cbef 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1,9 +1,9 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005 Eric Seigne - * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2006 Andre Cianfarani +/* Copyright (C) 2001-2007 Rodolphe Quiedeville + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2005 Eric Seigne + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2006 Andre Cianfarani * * 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 = '
'.$langs->trans("RecordSaved").'
'; } else { - $_GET["action"] = 'edit_price'; - $mesg = '
'.$product->error.'
'; + $action = 'edit_price'; + $mesg = '
'.$object->error.'
'; } } - -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='
'.$productstatic->error.'
'; + $result=$object->log_price_delete($user,$_GET["lineid"]); + if ($result < 0) $mesg='
'.$object->error.'
'; } @@ -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 '
'; // Ref print ''; print ''; print ''; // Label -print ''; +print ''; -$isphoto=$product->is_photo_available($conf->product->dir_output); +$isphoto=$object->is_photo_available($conf->product->dir_output); $nblignes=5; if ($isphoto) { // Photo print ''; } @@ -158,39 +154,39 @@ if ($conf->global->PRODUIT_MULTIPRICES) print ''; - if ($product->multiprices_base_type["$soc->price_level"] == 'TTC') + if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') { - print ''; // Prix mini print ''; // TVA - print ''; + print ''; } else { @@ -199,39 +195,39 @@ if ($conf->global->PRODUIT_MULTIPRICES) // TVA if ($i == 1) // We show only price for level 1 { - print ''; + print ''; } print ''; - if ($product->multiprices_base_type["$i"] == 'TTC') + if ($object->multiprices_base_type["$i"] == 'TTC') { - print ''; // Prix mini print ''; } @@ -240,36 +236,36 @@ if ($conf->global->PRODUIT_MULTIPRICES) else { // TVA - print ''; + print ''; // Price print ''; // Price minimum print ''; } // Status (to sell) print ''; print "
'.$langs->trans("Ref").''; -print $form->showrefnav($product,'ref','',1,'ref'); +print $form->showrefnav($object,'ref','',1,'ref'); print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("Label").''.$object->libelle.''; - 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 '
'.$langs->trans("SellingPrice").''.price($product->multiprices_ttc["$soc->price_level"]); + print ''.price($object->multiprices_ttc["$soc->price_level"]); } else { - print ''.price($product->multiprices["$soc->price_level"]); + print ''.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 '
'.$langs->trans("MinPrice").''; - 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 '
'.$langs->trans("VATRate").''.vatrate($product->multiprices_tva_tx["$soc->price_level"],true).'
'.$langs->trans("VATRate").''.vatrate($object->multiprices_tva_tx["$soc->price_level"],true).'
'.$langs->trans("VATRate").''.vatrate($product->multiprices_tva_tx[1],true).'
'.$langs->trans("VATRate").''.vatrate($object->multiprices_tva_tx[1],true).'
'.$langs->trans("SellingPrice").' '.$i.''.price($product->multiprices_ttc["$i"]); + print ''.price($object->multiprices_ttc["$i"]); } else { - print ''.price($product->multiprices["$i"]); + print ''.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 '
'.$langs->trans("MinPrice").' '.$i.''; - 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 '
'.$langs->trans("VATRate").''.vatrate($product->tva_tx.($product->tva_npr?'*':''),true).'
'.$langs->trans("VATRate").''.vatrate($object->tva_tx.($object->tva_npr?'*':''),true).'
'.$langs->trans("SellingPrice").''; - 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 '
'.$langs->trans("MinPrice").''; - 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 '
'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.''; -print $product->getLibStatut(2,0); +print $object->getLibStatut(2,0); print '
\n"; @@ -285,13 +281,13 @@ if ($mesg) print $mesg; /* */ /* ************************************************************************** */ -if (empty($_GET["action"]) || $_GET["action"]=='delete') +if ($action == 'delete') { - print "\n
\n"; + print "\n".'
'."\n"; if ($user->rights->produit->creer || $user->rights->service->creer) { - print ''.$langs->trans("UpdatePrice").''; + print ''.$langs->trans("UpdatePrice").''; } print "\n
\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 ''; + print ''; print ''; print ''; - print ''; + print ''; print ''; // VAT print ''; // Price base @@ -324,7 +320,7 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user-> print $langs->trans('PriceBase'); print ''; print ''; print ''; @@ -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 ''; @@ -347,13 +343,13 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user-> print ''; @@ -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 ''; + print ''; print ''; print ''; - print ''; + print ''; print '
'.$langs->trans("VATRate").''; - 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 '
'; - print $form->select_PriceBaseType($product->price_base_type, "price_base_type"); + print $form->select_PriceBaseType($object->price_base_type, "price_base_type"); print '
'; - if ($product->price_base_type == 'TTC') + if ($object->price_base_type == 'TTC') { - print ''; + print ''; } else { - print ''; + print ''; } print '
' ; $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 ''; + print ''; } else { - print ''; + print ''; } print '
'; // VAT if ($i == 1) { print ''; } else { // We always use the vat rate of price level 1 (A vat rate does not depends on customer) - print ''; + print ''; } // 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 ''; // Min price print ''; @@ -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 '
'.$langs->trans("VATRate").''; - 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 '
'; - if ($product->multiprices_base_type["$i"] == 'TTC') + if ($object->multiprices_base_type["$i"] == 'TTC') { - print ''; + print ''; } else { - print ''; + print ''; } - 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 '
'; $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 ''; + print ''; } else { - print ''; + print ''; } print '
'; if ($i > 0) { - print 'id.'&lineid='.$objp->rowid.'">'; + print 'id.'&lineid='.$objp->rowid.'">'; print img_delete(); print ''; } @@ -532,8 +528,8 @@ else dol_print_error($db); } +llxFooter(); $db->close(); -llxFooter(); ?> diff --git a/test/phpunit/hudson_phpunittest.xml b/test/phpunit/jenkins_phpunittest.xml similarity index 100% rename from test/phpunit/hudson_phpunittest.xml rename to test/phpunit/jenkins_phpunittest.xml diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml index aa78b02cb1c..43c4093ae80 100644 --- a/test/phpunit/phpunittest.xml +++ b/test/phpunit/phpunittest.xml @@ -15,16 +15,7 @@ ../../htdocs/products/canvas/ ../../htdocs/contact/canvas/ ../../htdocs/societe/canvas/ - ../../htdocs/includes/adodbtime/ - ../../htdocs/includes/ckeditor/ - ../../htdocs/includes/fpdfi/ - ../../htdocs/includes/geoip/ - ../../htdocs/includes/jquery/ - ../../htdocs/includes/jsgantt/ - ../../htdocs/includes/nusoap/ - ../../htdocs/includes/odtphp/ - ../../htdocs/includes/phpexcel/ - ../../htdocs/includes/tcpdf/ + ../../htdocs/includes/ ../../htdocs/ @@ -49,16 +40,7 @@ ../../htdocs/products/canvas/ ../../htdocs/contact/canvas/ ../../htdocs/societe/canvas/ - ../../htdocs/includes/adodbtime/ - ../../htdocs/includes/ckeditor/ - ../../htdocs/includes/fpdfi/ - ../../htdocs/includes/geoip/ - ../../htdocs/includes/jquery/ - ../../htdocs/includes/jsgantt/ - ../../htdocs/includes/nusoap/ - ../../htdocs/includes/odtphp/ - ../../htdocs/includes/phpexcel/ - ../../htdocs/includes/tcpdf/ + ../../htdocs/includes/