alxarafe / alixar

dolibarr/htdocs/comm/remise.php

Indentation +205 added lines, -205 removed lines

@@ -39,7 +39,7 @@ 
 // Security check

 if ($user->societe_id > 0)

 {

-	$socid = $user->societe_id;

+    $socid = $user->societe_id;

 }

 

 $backtopage = GETPOST('backtopage','alpha');

@@ -51,40 +51,40 @@ 
 

 if (GETPOST('cancel','alpha') && ! empty($backtopage))

 {

-     header("Location: ".$backtopage);

-     exit;

+        header("Location: ".$backtopage);

+        exit;

 }

 

 if (GETPOST('action','aZ09') == 'setremise')

 {

-	$object = new Societe($db);

-	$object->fetch($id);

-

-	$discount_type = GETPOST('discount_type', 'int');

-

-	if(! empty($discount_type)) {

-		$result=$object->set_remise_supplier(price2num(GETPOST("remise")),GETPOST("note"),$user);

-	} else {

-		$result=$object->set_remise_client(price2num(GETPOST("remise")),GETPOST("note"),$user);

-	}

-

-	if ($result > 0)

-	{

-	    if (! empty($backtopage))

-	    {

-    		header("Location: ".$backtopage);

-    		exit;

-	    }

-	    else

-	    {

-    		header("Location: remise.php?id=".$_GET["id"]);

-    		exit;

-	    }

-	}

-	else

-	{

-		setEventMessages($object->error, $object->errors, 'errors');

-	}

+    $object = new Societe($db);

+    $object->fetch($id);

+

+    $discount_type = GETPOST('discount_type', 'int');

+

+    if(! empty($discount_type)) {

+        $result=$object->set_remise_supplier(price2num(GETPOST("remise")),GETPOST("note"),$user);

+    } else {

+        $result=$object->set_remise_client(price2num(GETPOST("remise")),GETPOST("note"),$user);

+    }

+

+    if ($result > 0)

+    {

+        if (! empty($backtopage))

+        {

+            header("Location: ".$backtopage);

+            exit;

+        }

+        else

+        {

+            header("Location: remise.php?id=".$_GET["id"]);

+            exit;

+        }

+    }

+    else

+    {

+        setEventMessages($object->error, $object->errors, 'errors');

+    }

 }

 

 

@@ -104,21 +104,21 @@ 
  *********************************************************************************/

 if ($socid > 0)

 {

-	// On recupere les donnees societes par l'objet

-	$object = new Societe($db);

-	$object->fetch($socid);

+    // On recupere les donnees societes par l'objet

+    $object = new Societe($db);

+    $object->fetch($socid);

 

-	$head = societe_prepare_head($object);

+    $head = societe_prepare_head($object);

 

-	$isCustomer = $object->client == 1 || $object->client == 3;

-	$isSupplier = $object->fournisseur == 1;

+    $isCustomer = $object->client == 1 || $object->client == 3;

+    $isSupplier = $object->fournisseur == 1;

 

-	print '<form method="POST" action="remise.php?id='.$object->id.'">';

-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

-	print '<input type="hidden" name="action" value="setremise">';

+    print '<form method="POST" action="remise.php?id='.$object->id.'">';

+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+    print '<input type="hidden" name="action" value="setremise">';

     print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';

 

-	dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"), -1, 'company');

+    dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"), -1, 'company');

 

     dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');

 

@@ -127,208 +127,208 @@ 
     print '<div class="underbanner clearboth"></div>';

 

     if(! $isCustomer && ! $isSupplier) {

-    	print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';

+        print '<p class="opacitymedium">'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'</p>';

 

-    	dol_fiche_end();

+        dol_fiche_end();

 

-    	print '</form>';

+        print '</form>';

 

-    	// End of page

+        // End of page

         llxFooter();

         $db->close();

-    	exit;

+        exit;

     }

 

-	print '<table class="border centpercent">';

+    print '<table class="border centpercent">';

 

-	if($isCustomer) {

-		// Customer discount

-		print '<tr><td class="titlefield">';

-		print $langs->trans("CustomerRelativeDiscount").'</td><td>'.price2num($object->remise_percent)."%</td></tr>";

-	}

+    if($isCustomer) {

+        // Customer discount

+        print '<tr><td class="titlefield">';

+        print $langs->trans("CustomerRelativeDiscount").'</td><td>'.price2num($object->remise_percent)."%</td></tr>";

+    }

 

-	if($isSupplier) {

-		// Supplier discount

-		print '<tr><td class="titlefield">';

-		print $langs->trans("SupplierRelativeDiscount").'</td><td>'.price2num($object->remise_supplier_percent)."%</td></tr>";

-	}

+    if($isSupplier) {

+        // Supplier discount

+        print '<tr><td class="titlefield">';

+        print $langs->trans("SupplierRelativeDiscount").'</td><td>'.price2num($object->remise_supplier_percent)."%</td></tr>";

+    }

 

-	print '</table>';

-	print '<br>';

+    print '</table>';

+    print '<br>';

 

-	print load_fiche_titre($langs->trans("NewRelativeDiscount"),'','');

+    print load_fiche_titre($langs->trans("NewRelativeDiscount"),'','');

 

-	print '<div class="underbanner clearboth"></div>';

+    print '<div class="underbanner clearboth"></div>';

 

-	if($isCustomer && ! $isSupplier) {

-		print '<input type="hidden" name="discount_type" value="0" />';

-	}

+    if($isCustomer && ! $isSupplier) {

+        print '<input type="hidden" name="discount_type" value="0" />';

+    }

 

-	if(! $isCustomer && $isSupplier) {

-		print '<input type="hidden" name="discount_type" value="1" />';

-	}

+    if(! $isCustomer && $isSupplier) {

+        print '<input type="hidden" name="discount_type" value="1" />';

+    }

 

-	print '<table class="border centpercent">';

+    print '<table class="border centpercent">';

 

-	if($isCustomer && $isSupplier) {

-		// Discount type

-		print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td>';

-		print '<td><input type="radio" name="discount_type" id="discount_type_0" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';

-		print ' <input type="radio" name="discount_type" id="discount_type_1" selected value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';

-		print '</td></tr>';

-	}

+    if($isCustomer && $isSupplier) {

+        // Discount type

+        print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td>';

+        print '<td><input type="radio" name="discount_type" id="discount_type_0" selected value="0"/> <label for="discount_type_0">'.$langs->trans('Customer').'</label>';

+        print ' <input type="radio" name="discount_type" id="discount_type_1" selected value="1"/> <label for="discount_type_1">'.$langs->trans('Supplier').'</label>';

+        print '</td></tr>';

+    }

 

-	// New value

-	print '<tr><td class="titlefield fieldrequired">';

-	print $langs->trans("NewValue").'</td><td><input type="text" size="5" name="remise" value="'.dol_escape_htmltag(GETPOST("remise")).'">%</td></tr>';

+    // New value

+    print '<tr><td class="titlefield fieldrequired">';

+    print $langs->trans("NewValue").'</td><td><input type="text" size="5" name="remise" value="'.dol_escape_htmltag(GETPOST("remise")).'">%</td></tr>';

 

-	// Motif/Note

-	print '<tr><td class="fieldrequired">';

-	print $langs->trans("NoteReason").'</td><td><input type="text" size="60" name="note" value="'.dol_escape_htmltag(GETPOST("note")).'"></td></tr>';

+    // Motif/Note

+    print '<tr><td class="fieldrequired">';

+    print $langs->trans("NoteReason").'</td><td><input type="text" size="60" name="note" value="'.dol_escape_htmltag(GETPOST("note")).'"></td></tr>';

 

-	print "</table>";

+    print "</table>";

 

-	print '</div>';

+    print '</div>';

 

-	dol_fiche_end();

+    dol_fiche_end();

 

-	print '<div class="center">';

-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

+    print '<div class="center">';

+    print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

     if (! empty($backtopage))

     {

         print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

-	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';

+        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';

     }

-	print '</div>';

+    print '</div>';

 

-	print "</form>";

+    print "</form>";

 

-	print '<br>';

+    print '<br>';

 

-	if($isCustomer) {

-		if($isSupplier) {

-			print '<div class="fichecenter">';

-			print '<div class="fichehalfleft">';

-			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');

-		}

+    if($isCustomer) {

+        if($isSupplier) {

+            print '<div class="fichecenter">';

+            print '<div class="fichehalfleft">';

+            print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');

+        }

 

-		/*

+        /*

 		 * List log of all customer percent discounts

 		 */

-		$sql  = "SELECT rc.rowid, rc.remise_client as remise_percent, rc.note, rc.datec as dc,";

-		$sql.= " u.login, u.rowid as user_id";

-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u";

-		$sql.= " WHERE rc.fk_soc = " . $object->id;

-		$sql.= " AND rc.entity = " . $conf->entity;

-		$sql.= " AND u.rowid = rc.fk_user_author";

-		$sql.= " ORDER BY rc.datec DESC";

-

-		$resql=$db->query($sql);

-		if ($resql)

-		{

-			print '<table class="noborder" width="100%">';

-			$tag = !$tag;

-			print '<tr class="liste_titre">';

-			print '<td width="160">'.$langs->trans("Date").'</td>';

-			print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';

-			print '<td align="left">'.$langs->trans("NoteReason").'</td>';

-			print '<td align="center">'.$langs->trans("User").'</td>';

-			print '</tr>';

-			$num = $db->num_rows($resql);

-	        if ($num > 0)

-	        {

-			    $i = 0;

-	            while ($i < $num)

-	    		{

-	    			$obj = $db->fetch_object($resql);

-	    			print '<tr class="oddeven">';

-	    			print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';

-	    			print '<td align="center">'.price2num($obj->remise_percent).'%</td>';

-	    			print '<td align="left">'.$obj->note.'</td>';

-	    			// print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';

+        $sql  = "SELECT rc.rowid, rc.remise_client as remise_percent, rc.note, rc.datec as dc,";

+        $sql.= " u.login, u.rowid as user_id";

+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u";

+        $sql.= " WHERE rc.fk_soc = " . $object->id;

+        $sql.= " AND rc.entity = " . $conf->entity;

+        $sql.= " AND u.rowid = rc.fk_user_author";

+        $sql.= " ORDER BY rc.datec DESC";

+

+        $resql=$db->query($sql);

+        if ($resql)

+        {

+            print '<table class="noborder" width="100%">';

+            $tag = !$tag;

+            print '<tr class="liste_titre">';

+            print '<td width="160">'.$langs->trans("Date").'</td>';

+            print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';

+            print '<td align="left">'.$langs->trans("NoteReason").'</td>';

+            print '<td align="center">'.$langs->trans("User").'</td>';

+            print '</tr>';

+            $num = $db->num_rows($resql);

+            if ($num > 0)

+            {

+                $i = 0;

+                while ($i < $num)

+                {

+                    $obj = $db->fetch_object($resql);

+                    print '<tr class="oddeven">';

+                    print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';

+                    print '<td align="center">'.price2num($obj->remise_percent).'%</td>';

+                    print '<td align="left">'.$obj->note.'</td>';

+                    // print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';

                     print '<td align="center"><a href="' . BASE_URI . '?controller=user&method=card&id=' . $obj->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $obj->login . '</a></td>';

                     print '</tr>';

-	    			$i++;

-	    		}

-			}

-			else

-			{

-			    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';

-			}

-			$db->free($resql);

-			print "</table>";

-		}

-		else

-		{

-			dol_print_error($db);

-		}

-	}

-

-	if($isSupplier) {

-		if($isCustomer) {

-			print '</div>'; // class="fichehalfleft"

-			print '<div class="fichehalfright">';

-			print '<div class="ficheaddleft">';

-			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');

-		}

-

-		/*

+                    $i++;

+                }

+            }

+            else

+            {

+                print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';

+            }

+            $db->free($resql);

+            print "</table>";

+        }

+        else

+        {

+            dol_print_error($db);

+        }

+    }

+

+    if($isSupplier) {

+        if($isCustomer) {

+            print '</div>'; // class="fichehalfleft"

+            print '<div class="fichehalfright">';

+            print '<div class="ficheaddleft">';

+            print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');

+        }

+

+        /*

 		 * List log of all supplier percent discounts

 		 */

-		$sql  = "SELECT rc.rowid, rc.remise_supplier as remise_percent, rc.note, rc.datec as dc,";

-		$sql.= " u.login, u.rowid as user_id";

-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_supplier as rc, ".MAIN_DB_PREFIX."user as u";

-		$sql.= " WHERE rc.fk_soc = " . $object->id;

-		$sql.= " AND rc.entity = " . $conf->entity;

-		$sql.= " AND u.rowid = rc.fk_user_author";

-		$sql.= " ORDER BY rc.datec DESC";

-

-		$resql=$db->query($sql);

-		if ($resql)

-		{

-			print '<table class="noborder" width="100%">';

-			$tag = !$tag;

-			print '<tr class="liste_titre">';

-			print '<td width="160">'.$langs->trans("Date").'</td>';

-			print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';

-			print '<td align="left">'.$langs->trans("NoteReason").'</td>';

-			print '<td align="center">'.$langs->trans("User").'</td>';

-			print '</tr>';

-			$num = $db->num_rows($resql);

-			if ($num > 0)

-			{

-				$i = 0;

-				while ($i < $num)

-				{

-					$obj = $db->fetch_object($resql);

-					print '<tr class="oddeven">';

-					print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';

-					print '<td align="center">'.price2num($obj->remise_percent).'%</td>';

-					print '<td align="left">'.$obj->note.'</td>';

-					// print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';

+        $sql  = "SELECT rc.rowid, rc.remise_supplier as remise_percent, rc.note, rc.datec as dc,";

+        $sql.= " u.login, u.rowid as user_id";

+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_supplier as rc, ".MAIN_DB_PREFIX."user as u";

+        $sql.= " WHERE rc.fk_soc = " . $object->id;

+        $sql.= " AND rc.entity = " . $conf->entity;

+        $sql.= " AND u.rowid = rc.fk_user_author";

+        $sql.= " ORDER BY rc.datec DESC";

+

+        $resql=$db->query($sql);

+        if ($resql)

+        {

+            print '<table class="noborder" width="100%">';

+            $tag = !$tag;

+            print '<tr class="liste_titre">';

+            print '<td width="160">'.$langs->trans("Date").'</td>';

+            print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';

+            print '<td align="left">'.$langs->trans("NoteReason").'</td>';

+            print '<td align="center">'.$langs->trans("User").'</td>';

+            print '</tr>';

+            $num = $db->num_rows($resql);

+            if ($num > 0)

+            {

+                $i = 0;

+                while ($i < $num)

+                {

+                    $obj = $db->fetch_object($resql);

+                    print '<tr class="oddeven">';

+                    print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';

+                    print '<td align="center">'.price2num($obj->remise_percent).'%</td>';

+                    print '<td align="left">'.$obj->note.'</td>';

+                    // print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';

                     print '<td align="center"><a href="' . BASE_URI . '?controller=user&method=card&id=' . $obj->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $obj->login . '</a></td>';

                     print '</tr>';

-					$i++;

-				}

-			}

-			else

-			{

-				print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';

-			}

-			$db->free($resql);

-			print "</table>";

-		}

-		else

-		{

-			dol_print_error($db);

-		}

-

-		if($isCustomer) {

-			print '</div>'; // class="ficheaddleft"

-			print '</div>'; // class="fichehalfright"

-			print '</div>'; // class="fichecenter"

-		}

-	}

+                    $i++;

+                }

+            }

+            else

+            {

+                print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';

+            }

+            $db->free($resql);

+            print "</table>";

+        }

+        else

+        {

+            dol_print_error($db);

+        }

+

+        if($isCustomer) {

+            print '</div>'; // class="ficheaddleft"

+            print '</div>'; // class="fichehalfright"

+            print '</div>'; // class="fichecenter"

+        }

+    }

 }

 

 // End of page