[Dolibarr-cvs] dolibarr/htdocs/compta facture.php

[Regis Houssin]

CVSROOT:        /cvsroot/dolibarr
Module name:    dolibarr
Changes by:     Regis Houssin <hregis>  06/06/08 12:40:10

Modified files:
        htdocs/compta  : facture.php 

Log message:
        début ajout option : confirmation de suppression d'une ligne produit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/compta/facture.php?cvsroot=dolibarr&r1=1.323&r2=1.324

Patches:
Index: facture.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/compta/facture.php,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -b -r1.323 -r1.324
--- facture.php 7 Jun 2006 21:05:14 -0000       1.323
+++ facture.php 8 Jun 2006 12:40:10 -0000       1.324
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: facture.php,v 1.323 2006/06/07 21:05:14 eldy Exp $
+ * $Id: facture.php,v 1.324 2006/06/08 12:40:10 hregis Exp $
  * $Source: /cvsroot/dolibarr/dolibarr/htdocs/compta/facture.php,v $
  */
 
@@ -28,7 +28,7 @@
                \file       htdocs/compta/facture.php
                \ingroup    facture
                \brief      Page de création d'une facture
-               \version    $Revision: 1.323 $
+               \version    $Revision: 1.324 $
 */
 
 require('./pre.inc.php');
@@ -146,6 +146,18 @@
        }
 }
 
+if ($_POST['action'] == 'confirm_deleteproductline' && $_POST['confirm'] == 
'yes' && $conf->global->PRODUIT_CONFIRM_DELETE_LINE)
+{
+    if ($user->rights->facture->creer)
+    {
+       $facture = new Facture($db);
+       $facture->fetch($_GET['facid']);
+       $facture->deleteline($_GET['rowid']);
+    }
+    Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$_GET['facid']);
+    exit;
+}
+
 // Classe à "payée"
 if ($_POST['action'] == 'confirm_payed' && $_POST['confirm'] == 'yes' && 
$user->rights->facture->paiement)
 {
@@ -431,7 +443,7 @@
        exit;
 }
 
-if ($_GET['action'] == 'deleteline' && $user->rights->facture->creer)
+if ($_GET['action'] == 'deleteline' && $user->rights->facture->creer && 
!$conf->global->PRODUIT_CONFIRM_DELETE_LINE)
 {
        $fac = new Facture($db,'',$_GET['facid']);
        $fac->fetch($_GET['facid']);
@@ -1328,6 +1340,15 @@
                        }
 
                        /*
+                        * Confirmation de la suppression d'une ligne produit
+                        */
+                       if ($_GET['action'] == 'delete_product_line' && 
$conf->global->PRODUIT_CONFIRM_DELETE_LINE)
+                       {
+                               
$html->form_confirm($_SERVER["PHP_SELF"].'?facid='.$fac->id.'&amp;rowid='.$_GET["rowid"],
 $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 
'confirm_deleteproductline');
+                               print '<br />';
+                       }
+
+                       /*
                         *   Facture
                         */
                        print '<table class="border" width="100%">';
@@ -1646,7 +1667,14 @@
                                                        print '<td 
align="right"><a 
href="'.$_SERVER["PHP_SELF"].'?facid='.$fac->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
                                                        print img_edit();
                                                        print '</a></td>';
+                                                       if 
($conf->global->PRODUIT_CONFIRM_DELETE_LINE)
+                                                       {
+                                                               print '<td 
align="right"><a 
href="'.$_SERVER["PHP_SELF"].'?facid='.$fac->id.'&amp;action=delete_product_line&amp;rowid='.$objp->rowid.'">';
+                                                       }
+                                                       else
+                                                       {
                                                        print '<td 
align="right"><a 
href="'.$_SERVER["PHP_SELF"].'?facid='.$fac->id.'&amp;action=deleteline&amp;rowid='.$objp->rowid.'">';
+                                                       }
                                                        print img_delete();
                                                        print '</a></td>';
                                                        print '<td 
align="right">';
@@ -2497,5 +2525,5 @@
 
 $db->close();
 
-llxFooter('$Date: 2006/06/07 21:05:14 $ - $Revision: 1.323 $');
+llxFooter('$Date: 2006/06/08 12:40:10 $ - $Revision: 1.324 $');
 ?>