diff --git a/build.xml b/build.xml
index 5cdcaf708db22c40df07d801fc1679d9c6e97cbf..14657ea5ba0b04f796308cbf7f64a6edcf75b94c 100644
--- a/build.xml
+++ b/build.xml
@@ -77,14 +77,14 @@
<!-- Generate Doxygen documentation -->
<target name="doxygen" description="Dolibarr documentation" >
<exec executable="doxygen" dir="${basedir}" failonerror="false">
- <arg value="${basedir}/build/doxygen/hudson-doxygen.doxyfile"/>
+ <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
</exec>
</target>
<!-- Run unit tests and generate junit.xml and clover.xml -->
<target name="phpunit">
<exec executable="phpunit" dir="${basedir}" failonerror="true">
- <arg line=" --configuration ${basedir}/test/phpunit/hudson_phpunittest.xml
+ <arg line=" --configuration ${basedir}/test/phpunit/jenkins_phpunittest.xml
--log-junit ${basedir}/hudson/logs/junit.xml
--coverage-clover ${basedir}/hudson/coverage/clover.xml
--coverage-html ${basedir}/hudson/coverage/
diff --git a/build/doxygen/hudson-doxygen.doxyfile b/build/doxygen/jenkins_doxygen.doxyfile
similarity index 100%
rename from build/doxygen/hudson-doxygen.doxyfile
rename to build/doxygen/jenkins_doxygen.doxyfile
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 74bed303f0db5a76bc126a54613cc1818fdd8aa4..665db98c8faa5c1440bf305d536784082e9d02eb 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -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";
@@ -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]."<br>\n";
+print '<br>';
-$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]."<br>\n";
+print $langs->trans("VATRoundedByLine").' ('.$langs->trans("DolibarrDefault").')<br><br>';
-$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";
+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."<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";
+print '<br>'.$langs->trans("VATRoundedOnTotal").'<br><br>';
-$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";
+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."<br>\n";
+ }
+}
+
+llxFooter();
$db->close();
-llxFooter();
?>
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index 3a9ba77db04f568d17e6f859056e11151530d021..6963695c78e48ad9f09c3ce972cc3d5286ff1419 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -1,27 +1,29 @@
<?php
+/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
+ * Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2011 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
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
$langs->load("main");
$langs->load("bills");
$langs->load("cashdesk");
-?>
-<!--
-Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
-Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
-Copyright (C) 2011 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
-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 <http://www.gnu.org/licenses/>.
+?>
--->
<script type="text/javascript" src="javascript/facturation1.js"></script>
<script type="text/javascript" src="javascript/dhtml.js"></script>
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
index c9fbce6644bc7a286c6519f7afdddab574f98fac..79e7359cc10d556f54305a050b7162377daae2aa 100644
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -1,30 +1,31 @@
<?php
+/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
+ * Copyright (C) 2011 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
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+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");
-?>
-<?php
-/** add Ditto */
-require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
-require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
-/** end add Ditto */
+
?>
-<!--Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
- Copyright (C) 2011 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
-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 <http://www.gnu.org/licenses/>.
--->
<div class="liste_articles_haut">
<div class="liste_articles_bas">
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index 6ed13b6c0c8b6b09dfd606643b3d3fb69b21f32e..040f0f8fd4b8da1d3138758b023e054a873a2720 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -1,22 +1,26 @@
<?php
+/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
+ * Copyright (C) 2011 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
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
$langs->load("main");
+
?>
-<!--Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
- Copyright (C) 2011 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
-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 <http://www.gnu.org/licenses/>.
--->
+
<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Summary"); ?></legend>
<table class="table_resume">
diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php
index f186a070fb08da76867064b9fc06211db128a339..bddaadc9f2f5cb623d1886bc5e136d0f42b0f1d4 100644
--- a/htdocs/cashdesk/tpl/validation2.tpl.php
+++ b/htdocs/cashdesk/tpl/validation2.tpl.php
@@ -1,21 +1,25 @@
<?php
-$langs->load("main");
-?>
-<!--Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
-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.
+$langs->load("main");
-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 <http://www.gnu.org/licenses/>.
--->
<h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3>
<div class="cadre_facturation">
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index b0c9021324146e7897441d8a200e6bac63c1e9b8..61df125cbef1129cfadea12d482f9fbde6018246 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -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");
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+
// 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);
+$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&id='.$product->id.'">'.$langs->trans("UpdatePrice").'</a>';
+ print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit_price&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&id='.$product->id.'&lineid='.$objp->rowid.'">';
+ print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$object->id.'&lineid='.$objp->rowid.'">';
print img_delete();
print '</a>';
}
@@ -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 aa78b02cb1cbb638123c7708ca67646de2533279..43c4093ae80186c0dd8454c54037052b3b5f2a20 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -15,16 +15,7 @@
<directory suffix=".php">../../htdocs/products/canvas/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory>
- <directory suffix=".php">../../htdocs/includes/adodbtime/</directory>
- <directory suffix=".php">../../htdocs/includes/ckeditor/</directory>
- <directory suffix=".php">../../htdocs/includes/fpdfi/</directory>
- <directory suffix=".php">../../htdocs/includes/geoip/</directory>
- <directory suffix=".php">../../htdocs/includes/jquery/</directory>
- <directory suffix=".php">../../htdocs/includes/jsgantt/</directory>
- <directory suffix=".php">../../htdocs/includes/nusoap/</directory>
- <directory suffix=".php">../../htdocs/includes/odtphp/</directory>
- <directory suffix=".php">../../htdocs/includes/phpexcel/</directory>
- <directory suffix=".php">../../htdocs/includes/tcpdf/</directory>
+ <directory suffix=".php">../../htdocs/includes/</directory>
</blacklist>
<whitelist>
<directory suffix=".class.php">../../htdocs/</directory>
@@ -49,16 +40,7 @@
<directory suffix=".php">../../htdocs/products/canvas/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory>
- <directory suffix=".php">../../htdocs/includes/adodbtime/</directory>
- <directory suffix=".php">../../htdocs/includes/ckeditor/</directory>
- <directory suffix=".php">../../htdocs/includes/fpdfi/</directory>
- <directory suffix=".php">../../htdocs/includes/geoip/</directory>
- <directory suffix=".php">../../htdocs/includes/jquery/</directory>
- <directory suffix=".php">../../htdocs/includes/jsgantt/</directory>
- <directory suffix=".php">../../htdocs/includes/nusoap/</directory>
- <directory suffix=".php">../../htdocs/includes/odtphp/</directory>
- <directory suffix=".php">../../htdocs/includes/phpexcel/</directory>
- <directory suffix=".php">../../htdocs/includes/tcpdf/</directory>
+ <directory suffix=".php">../../htdocs/includes/</directory>
</exclude>
</whitelist>
</filter>