Skip to content
Snippets Groups Projects
Commit 5343dfab authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop

parents f6de981e 1d144b3b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 247 additions and 217 deletions
build.xml
+ 2
− 2
View file @ 5343dfab
...@@ -77,14 +77,14 @@ ...@@ -77,14 +77,14 @@
<!-- Generate Doxygen documentation --> <!-- Generate Doxygen documentation -->
<target name="doxygen" description="Dolibarr documentation" > <target name="doxygen" description="Dolibarr documentation" >
<exec executable="doxygen" dir="${basedir}" failonerror="false"> <exec executable="doxygen" dir="${basedir}" failonerror="false">
<arg value="${basedir}/build/doxygen/hudson-doxygen.doxyfile"/> <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
</exec> </exec>
</target> </target>
<!-- Run unit tests and generate junit.xml and clover.xml --> <!-- Run unit tests and generate junit.xml and clover.xml -->
<target name="phpunit"> <target name="phpunit">
<exec executable="phpunit" dir="${basedir}" failonerror="true"> <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 --log-junit ${basedir}/hudson/logs/junit.xml
--coverage-clover ${basedir}/hudson/coverage/clover.xml --coverage-clover ${basedir}/hudson/coverage/clover.xml
--coverage-html ${basedir}/hudson/coverage/ --coverage-html ${basedir}/hudson/coverage/
......
htdocs/admin/limits.php
+ 74
− 33
View file @ 5343dfab
<?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 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
...@@ -30,11 +30,11 @@ $langs->load("companies"); ...@@ -30,11 +30,11 @@ $langs->load("companies");
$langs->load("products"); $langs->load("products");
$langs->load("admin"); $langs->load("admin");
if (!$user->admin) if (! $user->admin) accessforbidden();
accessforbidden();
$action = GETPOST('action','alpha');
if (isset($_POST["action"]) && $_POST["action"] == 'update') if ($action == 'update')
{ {
$error=0; $error=0;
$MAXDEC=8; $MAXDEC=8;
...@@ -96,9 +96,9 @@ print "<br>\n"; ...@@ -96,9 +96,9 @@ print "<br>\n";
if ($mesg) print $mesg.'<br>'; 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="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
...@@ -167,6 +167,27 @@ else ...@@ -167,6 +167,27 @@ else
print '</div>'; 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 // Show examples
print '<b>'.$langs->trans("ExamplesWithCurrentSetup").":</b><br>\n"; print '<b>'.$langs->trans("ExamplesWithCurrentSetup").":</b><br>\n";
...@@ -177,36 +198,56 @@ print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU'); ...@@ -177,36 +198,56 @@ 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 " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n"; print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
print '<br>';
$s=10/3;$qty=1;$vat=0; print $langs->trans("VATRoundedByLine").' ('.$langs->trans("DolibarrDefault").')<br><br>';
$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; foreach($vat_rates as $vat)
$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0); {
print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU'); for ($qty=1; $qty<=2; $qty++)
print " x ".$langs->trans("Quantity").": ".$qty; {
print " - ".$langs->trans("VAT").": ".$vat.'%'; $s1=10/3;
print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n"; $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 " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$total_ht.' / '.$total_tva.' / '.$total_ttc."<br>\n";
}
}
$s=10/3;$qty=1;$vat=10; print '<br>'.$langs->trans("VATRoundedOnTotal").'<br><br>';
$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; foreach($vat_rates as $vat)
$tmparray=calcul_price_total(1,$qty*price2num($s,'MU'),0,$vat,0,0,0,'HT',0); {
print $langs->trans("UnitPriceOfProduct").": ".price2num($s,'MU'); for ($qty=1; $qty<=2; $qty++)
print " x ".$langs->trans("Quantity").": ".$qty; {
print " - ".$langs->trans("VAT").": ".$vat.'%'; $s1=10/3;
print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n"; $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 " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$total_ht.' / '.$total_tva.' / '.$total_ttc."<br>\n";
}
}
llxFooter();
$db->close(); $db->close();
llxFooter();
?> ?>
htdocs/cashdesk/tpl/facturation1.tpl.php
+ 20
− 18
View file @ 5343dfab
<?php <?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("main");
$langs->load("bills"); $langs->load("bills");
$langs->load("cashdesk"); $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/facturation1.js"></script>
<script type="text/javascript" src="javascript/dhtml.js"></script> <script type="text/javascript" src="javascript/dhtml.js"></script>
......
htdocs/cashdesk/tpl/liste_articles.tpl.php
+ 22
− 21
View file @ 5343dfab
<?php <?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("main");
$langs->load("bills"); $langs->load("bills");
$langs->load("cashdesk"); $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_haut">
<div class="liste_articles_bas"> <div class="liste_articles_bas">
......
htdocs/cashdesk/tpl/validation1.tpl.php
+ 20
− 16
View file @ 5343dfab
<?php <?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"); $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> <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Summary"); ?></legend>
<table class="table_resume"> <table class="table_resume">
......
htdocs/cashdesk/tpl/validation2.tpl.php
+ 18
− 14
View file @ 5343dfab
<?php <?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 $langs->load("main");
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/>.
-->
<h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3> <h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3>
<div class="cadre_facturation"> <div class="cadre_facturation">
......
htdocs/product/price.php
+ 89
− 93
View file @ 5343dfab
<?php <?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* *
* 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
...@@ -32,25 +32,25 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); ...@@ -32,25 +32,25 @@ require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
$langs->load("products"); $langs->load("products");
$langs->load("bills"); $langs->load("bills");
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'alpha');
// Security check // Security check
if (isset($_GET["id"]) || isset($_GET["ref"])) $fieldid = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
{ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:''); $socid = ($user->societe_id ? $user->societe_id : 0);
} $result=restrictedArea($user,'produit|service',$fieldid,'product','','',$fieldtype);
$fieldid = isset($_GET["ref"])?'ref':'rowid';
$socid=$user->societe_id?$user->societe_id:0;
$result=restrictedArea($user,'produit|service',$id,'product','','',$fieldid);
$object = new Product($db);
/* /*
* Actions * 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 = $object->fetch($id);
$result = $product->fetch($_GET["id"]);
// MultiPrix // MultiPrix
if($conf->global->PRODUIT_MULTIPRICES) if($conf->global->PRODUIT_MULTIPRICES)
...@@ -84,23 +84,21 @@ if ($_POST["action"] == 'update_price' && ! $_POST["cancel"] && ($user->rights-> ...@@ -84,23 +84,21 @@ if ($_POST["action"] == 'update_price' && ! $_POST["cancel"] && ($user->rights->
$newvat=str_replace('*','',$_POST["tva_tx"]); $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>'; $mesg = '<div class="ok">'.$langs->trans("RecordSaved").'</div>';
} }
else else
{ {
$_GET["action"] = 'edit_price'; $action = 'edit_price';
$mesg = '<div class="error">'.$product->error.'</div>'; $mesg = '<div class="error">'.$object->error.'</div>';
} }
} }
else if ($action == 'delete' && $user->rights->produit->supprimer)
if ($_GET["action"] == 'delete' && $user->rights->produit->supprimer)
{ {
$productstatic = new Product($db); $result=$object->log_price_delete($user,$_GET["lineid"]);
$result=$productstatic->log_price_delete($user,$_GET["lineid"]); if ($result < 0) $mesg='<div class="error">'.$object->error.'</div>';
if ($result < 0) $mesg='<div class="error">'.$productstatic->error.'</div>';
} }
...@@ -110,15 +108,13 @@ if ($_GET["action"] == 'delete' && $user->rights->produit->supprimer) ...@@ -110,15 +108,13 @@ if ($_GET["action"] == 'delete' && $user->rights->produit->supprimer)
$form = new Form($db); $form = new Form($db);
$product = new Product($db); if (! empty($id) || ! empty($ref)) $result = $object->fetch($id, $ref);
if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]);
if ($_GET["id"]) $result = $product->fetch($_GET["id"]);
llxHeader("","",$langs->trans("CardProduct".$product->type)); llxHeader("","",$langs->trans("CardProduct".$object->type));
$head=product_prepare_head($product, $user); $head=product_prepare_head($object, $user);
$titre=$langs->trans("CardProduct".$product->type); $titre=$langs->trans("CardProduct".$object->type);
$picto=($product->type==1?'service':'product'); $picto=($object->type==1?'service':'product');
dol_fiche_head($head, 'price', $titre, 0, $picto); dol_fiche_head($head, 'price', $titre, 0, $picto);
...@@ -127,21 +123,21 @@ print '<table class="border" width="100%">'; ...@@ -127,21 +123,21 @@ print '<table class="border" width="100%">';
// Ref // Ref
print '<tr>'; print '<tr>';
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="2">'; 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 '</td>';
print '</tr>'; print '</tr>';
// Label // 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; $nblignes=5;
if ($isphoto) if ($isphoto)
{ {
// Photo // Photo
print '<td valign="middle" align="center" width="30%" rowspan="'.$nblignes.'">'; 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>'; print '</td>';
} }
...@@ -158,39 +154,39 @@ if ($conf->global->PRODUIT_MULTIPRICES) ...@@ -158,39 +154,39 @@ if ($conf->global->PRODUIT_MULTIPRICES)
print '<tr><td>'.$langs->trans("SellingPrice").'</td>'; 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 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 else
{ {
print ' '.$langs->trans($product->price_base_type); print ' '.$langs->trans($object->price_base_type);
} }
print '</td></tr>'; print '</td></tr>';
// Prix mini // Prix mini
print '<tr><td>'.$langs->trans("MinPrice").'</td><td>'; 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 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>'; print '</td></tr>';
// TVA // 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 else
{ {
...@@ -199,39 +195,39 @@ if ($conf->global->PRODUIT_MULTIPRICES) ...@@ -199,39 +195,39 @@ if ($conf->global->PRODUIT_MULTIPRICES)
// TVA // TVA
if ($i == 1) // We show only price for level 1 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>'; 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 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 else
{ {
print ' '.$langs->trans($product->price_base_type); print ' '.$langs->trans($object->price_base_type);
} }
print '</td></tr>'; print '</td></tr>';
// Prix mini // Prix mini
print '<tr><td>'.$langs->trans("MinPrice").' '.$i.'</td><td>'; 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 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>'; print '</td></tr>';
} }
...@@ -240,36 +236,36 @@ if ($conf->global->PRODUIT_MULTIPRICES) ...@@ -240,36 +236,36 @@ if ($conf->global->PRODUIT_MULTIPRICES)
else else
{ {
// TVA // 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 // Price
print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>'; 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 else
{ {
print price($product->price).' '.$langs->trans($product->price_base_type); print price($object->price).' '.$langs->trans($object->price_base_type);
} }
print '</td></tr>'; print '</td></tr>';
// Price minimum // Price minimum
print '<tr><td>'.$langs->trans("MinPrice").'</td><td>'; 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 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>'; print '</td></tr>';
} }
// Status (to sell) // Status (to sell)
print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>'; 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 '</td></tr>';
print "</table>\n"; print "</table>\n";
...@@ -285,13 +281,13 @@ if ($mesg) print $mesg; ...@@ -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) 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"; print "\n</div>\n";
...@@ -302,21 +298,21 @@ if (empty($_GET["action"]) || $_GET["action"]=='delete') ...@@ -302,21 +298,21 @@ if (empty($_GET["action"]) || $_GET["action"]=='delete')
/* /*
* Edition du prix * 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"),'',''); print_fiche_titre($langs->trans("NewPrice"),'','');
if (empty($conf->global->PRODUIT_MULTIPRICES)) 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="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update_price">'; 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%">'; print '<table class="border" width="100%">';
// VAT // VAT
print '<tr><td>'.$langs->trans("VATRate").'</td><td>'; 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>'; print '</td></tr>';
// Price base // Price base
...@@ -324,7 +320,7 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user-> ...@@ -324,7 +320,7 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
print $langs->trans('PriceBase'); print $langs->trans('PriceBase');
print '</td>'; print '</td>';
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 '</td>';
print '</tr>'; print '</tr>';
...@@ -333,13 +329,13 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user-> ...@@ -333,13 +329,13 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
$text=$langs->trans('SellingPrice'); $text=$langs->trans('SellingPrice');
print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
print '</td><td>'; 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 else
{ {
print '<input name="price" size="10" value="'.price($product->price).'">'; print '<input name="price" size="10" value="'.price($object->price).'">';
} }
print '</td></tr>'; print '</td></tr>';
...@@ -347,13 +343,13 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user-> ...@@ -347,13 +343,13 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
print '<tr><td>' ; print '<tr><td>' ;
$text=$langs->trans('MinPrice'); $text=$langs->trans('MinPrice');
print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); 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 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>'; print '</td></tr>';
...@@ -368,22 +364,22 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user-> ...@@ -368,22 +364,22 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
{ {
for ($i=1; $i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) 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="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update_price">'; 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%">'; print '<table class="border" width="100%">';
// VAT // VAT
if ($i == 1) if ($i == 1)
{ {
print '<tr><td>'.$langs->trans("VATRate").'</td><td>'; 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>'; print '</td></tr>';
} }
else else
{ // We always use the vat rate of price level 1 (A vat rate does not depends on customer) { // 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 // Selling price
...@@ -391,28 +387,28 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user-> ...@@ -391,28 +387,28 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
$text=$langs->trans('SellingPrice').' '.$i; $text=$langs->trans('SellingPrice').' '.$i;
print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
print '</td><td>'; 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 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>'; print '</td></tr>';
// Min price // Min price
print '<tr><td>'; print '<tr><td>';
$text=$langs->trans('MinPrice').' '.$i; $text=$langs->trans('MinPrice').' '.$i;
print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1); 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 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>'; print '</td></tr>';
...@@ -432,7 +428,7 @@ $sql.= " p.price_level, p.price_min, p.price_min_ttc,"; ...@@ -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.= " p.date_price as dp, u.rowid as user_id, u.login";
$sql.= " FROM ".MAIN_DB_PREFIX."product_price as p,"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price as p,";
$sql.= " ".MAIN_DB_PREFIX."user as u"; $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"; $sql.= " AND p.fk_user_author = u.rowid";
if ($socid && $conf->global->PRODUIT_MULTIPRICES) $sql.= " AND p.price_level = ".$soc->price_level; 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"; $sql.= " ORDER BY p.date_price DESC, p.price_level ASC";
...@@ -449,7 +445,7 @@ if ($result) ...@@ -449,7 +445,7 @@ if ($result)
// Il doit au moins y avoir la ligne de prix initial. // Il doit au moins y avoir la ligne de prix initial.
// On l'ajoute donc pour remettre a niveau (pb vieilles versions) // 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); $result = $db->query($sql);
$num = $db->num_rows($result); $num = $db->num_rows($result);
...@@ -511,7 +507,7 @@ if ($result) ...@@ -511,7 +507,7 @@ if ($result)
print '<td align="right">'; print '<td align="right">';
if ($i > 0) 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 img_delete();
print '</a>'; print '</a>';
} }
...@@ -532,8 +528,8 @@ else ...@@ -532,8 +528,8 @@ else
dol_print_error($db); dol_print_error($db);
} }
llxFooter();
$db->close(); $db->close();
llxFooter();
?> ?>
test/phpunit/phpunittest.xml
+ 2
− 20
View file @ 5343dfab
...@@ -15,16 +15,7 @@ ...@@ -15,16 +15,7 @@
<directory suffix=".php">../../htdocs/products/canvas/</directory> <directory suffix=".php">../../htdocs/products/canvas/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory> <directory suffix=".php">../../htdocs/contact/canvas/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory> <directory suffix=".php">../../htdocs/societe/canvas/</directory>
<directory suffix=".php">../../htdocs/includes/adodbtime/</directory> <directory suffix=".php">../../htdocs/includes/</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>
</blacklist> </blacklist>
<whitelist> <whitelist>
<directory suffix=".class.php">../../htdocs/</directory> <directory suffix=".class.php">../../htdocs/</directory>
...@@ -49,16 +40,7 @@ ...@@ -49,16 +40,7 @@
<directory suffix=".php">../../htdocs/products/canvas/</directory> <directory suffix=".php">../../htdocs/products/canvas/</directory>
<directory suffix=".php">../../htdocs/contact/canvas/</directory> <directory suffix=".php">../../htdocs/contact/canvas/</directory>
<directory suffix=".php">../../htdocs/societe/canvas/</directory> <directory suffix=".php">../../htdocs/societe/canvas/</directory>
<directory suffix=".php">../../htdocs/includes/adodbtime/</directory> <directory suffix=".php">../../htdocs/includes/</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>
</exclude> </exclude>
</whitelist> </whitelist>
</filter> </filter>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment