NEW: Add deposit on supplier invoice (& somes ajustments)

htdocs/compta/facture/card.php

@@ -5347,8 +5347,7 @@ if ($action == 'create') {
 				print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
 			}
 
-			// Classify 'closed not completely paid' (possible si validee et pas encore classee payee)
+			// Classify 'closed not completely paid' (possible if validated and not yet filed paid)
-
 			if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && $usercanissuepayment) {
 				if ($totalpaye > 0 || $totalcreditnotes > 0) {
 					// If one payment or one credit note was linked to this invoice

htdocs/compta/facture/class/facture.class.php

@@ -157,10 +157,17 @@ class Facture extends CommonInvoice
 	public $total_ttc = 0;
 	public $revenuestamp;
 
-	//! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon
+	/**
-	//! Fermeture alors que aucun paiement: replaced (si remplace), abandon
+	 * ! Closing after partial payment: discount_vat, badsupplier, abandon
+	 * ! Closing when no payment: replaced, abandoned
+	 * @var string Close code
+	 */
 	public $close_code;
-	//! Commentaire si mis a paye sans paiement complet
+
+	/**
+	 * ! Comment if paid without full payment
+	 * @var string Close note
+	 */
 	public $close_note;
 
 	/**
@@ -2237,14 +2244,14 @@ class Facture extends CommonInvoice
 			$sql .= ' AND fk_facture_line IS NULL';
 			$resql = $this->db->query($sql);
 
-			// If invoice has consumned discounts
+			// If invoice has consumed discounts
 			$this->fetch_lines();
 			$list_rowid_det = array();
 			foreach ($this->lines as $key => $invoiceline) {
 				$list_rowid_det[] = $invoiceline->id;
 			}
 
-			// Consumned discounts are freed
+			// Consumed discounts are freed
 			if (count($list_rowid_det)) {
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
 				$sql .= ' SET fk_facture = NULL, fk_facture_line = NULL';
@@ -2536,8 +2543,8 @@ class Facture extends CommonInvoice
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			// On desaffecte de la facture les remises liees
+			// Bound discounts are deducted from the invoice
-			// car elles n'ont pas ete utilisees vu que la facture est abandonnee.
+			// as they have not been used since the invoice is abandoned.
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
 			$sql .= ' SET fk_facture = NULL';
 			$sql .= ' WHERE fk_facture = '.$this->id;
@@ -3659,7 +3666,7 @@ class Facture extends CommonInvoice
 
 		$this->db->begin();
 
-		// Libere remise liee a ligne de facture
+		// Free discount linked to invoice line
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
 		$sql .= ' SET fk_facture_line = NULL';
 		$sql .= ' WHERE fk_facture_line = '.((int) $rowid);

htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php

@@ -1111,7 +1111,17 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierInvoice")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+		$title = $outputlangs->transnoentities("PdfInvoiceTitle");
+		if ($object->type == 1) {
+			$title = $outputlangs->transnoentities("InvoiceReplacement");
+		}
+		if ($object->type == 2) {
+			$title = $outputlangs->transnoentities("InvoiceAvoir");
+		}
+		if ($object->type == 3) {
+			$title = $outputlangs->transnoentities("InvoiceDeposit");
+		}
+		$pdf->MultiCell(100, 3, $title." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
 		$posy += 1;
 
 		if ($object->ref_supplier) {

htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+/* Copyright (C) 2003-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2008	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2013-2018 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2018	Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2013      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2016      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2021  Alexandre Spangaro		<aspangaro@open-dsi.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
@@ -23,7 +23,7 @@
 
 /**
  *	\file       htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
- *	\ingroup    commande
+ *	\ingroup    Supplier invoice
  *	\brief      File containing the Tulip Class of numbering models of suppliers invoices references
  */
 
@@ -90,7 +90,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
-		// Parametrage du prefix
+		// Setting the prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").')';
 		$texte .= ':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->SUPPLIER_INVOICE_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
@@ -99,7 +99,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 
 		$texte .= '</tr>';
 
-		// Parametrage du prefix des avoirs
+		// Prefix setting of credit note
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
@@ -109,14 +109,13 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
 			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
 			$texte .= '</tr>';
-
-
-			// Parametrage du prefix des acomptes
-			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
-			$texte .= '</tr>';
 		}
 
+		// Prefix setting of deposit
+		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '</tr>';
+
 		$texte .= '</table>';
 		$texte .= '</form>';
 

htdocs/fourn/class/fournisseur.facture.class.php

@@ -10,7 +10,7 @@
  * Copyright (C) 2014-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2015		Bahfir Abbes			<bafbes@gmail.com>
  * Copyright (C) 2015-2019	Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2016		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -34,6 +34,8 @@
  *  \brief      File of class to manage suppliers invoices
  */
 
+include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -124,6 +126,19 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $statut;
 
+	/**
+	 * ! Closing after partial payment: discount_vat, badsupplier, abandon
+	 * ! Closing when no payment: replaced, abandoned
+	 * @var string Close code
+	 */
+	public $close_code;
+
+	/**
+	 * ! Comment if paid without full payment
+	 * @var string Close note
+	 */
+	public $close_note;
+
 	/**
 	 * Set to 1 if the invoice is completely paid, otherwise is 0
 	 * @var int
@@ -311,7 +326,7 @@ class FactureFournisseur extends CommonInvoice
 	 * Classified paid.
 	 * If paid partially, $this->close_code can be:
 	 * - CLOSECODE_DISCOUNTVAT
-	 * - CLOSECODE_BADDEBT
+	 * - CLOSECODE_BADCREDIT
 	 * If paid completelly, this->close_code will be null
 	 */
 	const STATUS_CLOSED = 2;
@@ -319,7 +334,7 @@ class FactureFournisseur extends CommonInvoice
 	/**
 	 * Classified abandoned and no payment done.
 	 * $this->close_code can be:
-	 * - CLOSECODE_BADDEBT
+	 * - CLOSECODE_BADCREDIT
 	 * - CLOSECODE_ABANDONED
 	 * - CLOSECODE_REPLACED
 	 */
@@ -1318,36 +1333,53 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public function setPaid($user, $close_code = '', $close_note = '')
 	{
-		global $conf, $langs;
 		$error = 0;
 
-		$this->db->begin();
+		if ($this->paye != 1) {
+			$this->db->begin();
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
+			$now = dol_now();
-		$sql .= ' SET paye = 1, fk_statut = '.self::STATUS_CLOSED;
-		$sql .= ' WHERE rowid = '.$this->id;
 
-		dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
+			dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
-		$resql = $this->db->query($sql);
+
-		if ($resql) {
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn SET';
-			// Call trigger
+			$sql .= ' fk_statut = '.self::STATUS_CLOSED;
-			$result = $this->call_trigger('BILL_SUPPLIER_PAYED', $user);
+			if (!$close_code) {
-			if ($result < 0) {
+				$sql .= ', paye=1';
-				$error++;
 			}
-			// End call triggers
+			if ($close_code) {
-		} else {
+				$sql .= ", close_code='".$this->db->escape($close_code)."'";
-			$error++;
+			}
-			$this->error = $this->db->error();
+			if ($close_note) {
-			dol_print_error($this->db);
+				$sql .= ", close_note='".$this->db->escape($close_note)."'";
-		}
+			}
+			$sql .= ', fk_user_closing = '.$user->id;
+			$sql .= ", date_closing = '".$this->db->idate($now)."'";
+			$sql .= ' WHERE rowid = '.$this->id;
 
-		if (!$error) {
+			$resql = $this->db->query($sql);
-			$this->db->commit();
+			if ($resql) {
-			return 1;
+				// Call trigger
+				$result = $this->call_trigger('BILL_SUPPLIER_PAYED', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			} else {
+				$error++;
+				$this->error = $this->db->error();
+				dol_print_error($this->db);
+			}
+
+			if (!$error) {
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
 		} else {
-			$this->db->rollback();
+			return 0;
-			return -1;
 		}
 	}
 
@@ -1385,7 +1417,9 @@ class FactureFournisseur extends CommonInvoice
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
-		$sql .= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
+		$sql .= ' SET paye=0, fk_statut='.self::STATUS_VALIDATED.', close_code=null, close_note=null';
+		$sql .= ' date_closing=null,';
+		$sql .= ' fk_user_closing=null';
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
@@ -1399,8 +1433,8 @@ class FactureFournisseur extends CommonInvoice
 			// End call triggers
 		} else {
 			$error++;
-			$this->error = $this->db->lasterror();
+			$this->error = $this->db->error();
-			dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
+			dol_print_error($this->db);
 		}
 
 		if (!$error) {
@@ -1412,6 +1446,64 @@ class FactureFournisseur extends CommonInvoice
 		}
 	}
 
+	/**
+	 *	Tag invoice as canceled, with no payment on it (example for replacement invoice or payment never received) + call trigger BILL_CANCEL
+	 *	Warning, if option to decrease stock on invoice was set, this function does not change stock (it might be a cancel because
+	 *  of no payment even if merchandises were sent).
+	 *
+	 *	@param	User	$user        	Object user making change
+	 *	@param	string	$close_code		Code of closing invoice (CLOSECODE_REPLACED, CLOSECODE_...)
+	 *	@param	string	$close_note		Comment
+	 *	@return int         			<0 if KO, >0 if OK
+	 */
+	public function setCanceled($user, $close_code = '', $close_note = '')
+	{
+		dol_syslog(get_class($this)."::setCanceled rowid=".((int) $this->id), LOG_DEBUG);
+
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn SET';
+		$sql .= ' fk_statut='.self::STATUS_ABANDONED;
+		if ($close_code) {
+			$sql .= ", close_code='".$this->db->escape($close_code)."'";
+		}
+		if ($close_note) {
+			$sql .= ", close_note='".$this->db->escape($close_note)."'";
+		}
+		$sql .= ' WHERE rowid = '.$this->id;
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			// Bound discounts are deducted from the invoice
+			// as they have not been used since the invoice is abandoned.
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
+			$sql .= ' SET fk_invoice_supplier = NULL';
+			$sql .= ' WHERE fk_invoice_supplier = '.$this->id;
+
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				// Call trigger
+				$result = $this->call_trigger('BILL_SUPPLIER_CANCEL', $user);
+				if ($result < 0) {
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
+
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->error = $this->db->error()." sql=".$sql;
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = $this->db->error()." sql=".$sql;
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
 	/**
 	 *	Tag invoice as validated + call trigger BILL_VALIDATE
 	 *
@@ -2703,6 +2795,10 @@ class FactureFournisseur extends CommonInvoice
 		$object->ref_client         = '';
 		$object->close_code         = '';
 		$object->close_note         = '';
+		if ($conf->global->MAIN_DONT_KEEP_NOTE_ON_CLONING == 1) {
+			$object->note_private = '';
+			$object->note_public = '';
+		}
 
 		// Loop on each line of new invoice
 		foreach ($object->lines as $i => $line) {

htdocs/fourn/facture/card.php

@@ -8,7 +8,7 @@
  * Copyright (C) 2013-2015	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016  Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2016-2020	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Ferran Marcet	        <fmarcet@2byte.es>
  *
@@ -112,18 +112,18 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture',
 
 // Common permissions
 $usercanread = $user->rights->fournisseur->facture->lire;
-$usercancreate		= $user->rights->fournisseur->facture->creer;
+$usercancreate = $user->rights->fournisseur->facture->creer;
-$usercandelete		= $user->rights->fournisseur->facture->supprimer;
+$usercandelete = $user->rights->fournisseur->facture->supprimer;
 
 // Advanced permissions
 $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)));
 $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send);
 
 // Permissions for includes
-$permissionnote		= $usercancreate; // Used by the include of actions_setnotes.inc.php
+$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
 $permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
-$permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
 $error = 0;
 
@@ -283,6 +283,32 @@ if (empty($reshook)) {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
+	} elseif ($action == 'confirm_paid_partially' && $confirm == 'yes') {
+		// Classif "paid partialy"
+		$object->fetch($id);
+		$close_code = GETPOST("close_code", 'restricthtml');
+		$close_note = GETPOST("close_note", 'restricthtml');
+		if ($close_code) {
+			$result = $object->setPaid($user, $close_code, $close_note);
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		} else {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
+		}
+	} elseif ($action == 'confirm_canceled' && $confirm == 'yes') {
+		// Classify "abandoned"
+		$object->fetch($id);
+		$close_code = GETPOST("close_code", 'restricthtml');
+		$close_note = GETPOST("close_note", 'restricthtml');
+		if ($close_code) {
+			$result = $object->setCanceled($user, $close_code, $close_note);
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		} else {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
+		}
 	}
 
 	// Set supplier ref
@@ -497,11 +523,15 @@ if (empty($reshook)) {
 			// Loop on each vat rate
 			$i = 0;
 			foreach ($object->lines as $line) {
-				if ($line->product_type < 9 && $line->total_ht != 0) { // Remove lines with product_type greater than or equal to 9
+				if ($line->product_type < 9 && $line->total_ht != 0) { // Remove lines with product_type greater than or equal to 9 and no need to create discount if amount is null
-					// no need to create discount if amount is null
+					$keyforvatrate = $line->tva_tx.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : '');
+
 					$amount_ht[$line->tva_tx] += $line->total_ht;
 					$amount_tva[$line->tva_tx] += $line->total_tva;
 					$amount_ttc[$line->tva_tx] += $line->total_ttc;
+					$multicurrency_amount_ht[$keyforvatrate] += $line->multicurrency_total_ht;
+					$multicurrency_amount_tva[$keyforvatrate] += $line->multicurrency_total_tva;
+					$multicurrency_amount_ttc[$keyforvatrate] += $line->multicurrency_total_ttc;
 					$i++;
 				}
 			}
@@ -515,6 +545,9 @@ if (empty($reshook)) {
 						$amount_ht[$vatrate] = price2num($amount_ht[$vatrate] * $ratio, 'MU');
 						$amount_tva[$vatrate] = price2num($amount_tva[$vatrate] * $ratio, 'MU');
 						$amount_ttc[$vatrate] = price2num($amount_ttc[$vatrate] * $ratio, 'MU');
+						$multicurrency_amount_ht[$vatrate] = price2num($multicurrency_amount_ht[$vatrate] * $ratio, 'MU');
+						$multicurrency_amount_tva[$vatrate] = price2num($multicurrency_amount_tva[$vatrate] * $ratio, 'MU');
+						$multicurrency_amount_ttc[$vatrate] = price2num($multicurrency_amount_ttc[$vatrate] * $ratio, 'MU');
 					}
 				}
 			}
@@ -574,6 +607,7 @@ if (empty($reshook)) {
 				$discount->amount_ht = $discount->amount_ttc = $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
 				$discount->amount_tva = 0;
 				$discount->tva_tx = 0;
+				$discount->vat_src_code = '';
 
 				$result = $discount->create($user);
 				if ($result < 0) {
@@ -585,7 +619,20 @@ if (empty($reshook)) {
 					$discount->amount_ht = abs($amount_ht[$tva_tx]);
 					$discount->amount_tva = abs($amount_tva[$tva_tx]);
 					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
+					$discount->multicurrency_amount_ht = abs($multicurrency_amount_ht[$tva_tx]);
+					$discount->multicurrency_amount_tva = abs($multicurrency_amount_tva[$tva_tx]);
+					$discount->multicurrency_amount_ttc = abs($multicurrency_amount_ttc[$tva_tx]);
+
+					// Clean vat code
+					$reg = array();
+					$vat_src_code = '';
+					if (preg_match('/\((.*)\)/', $tva_tx, $reg)) {
+						$vat_src_code = $reg[1];
+						$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx); // Remove code into vatrate.
+					}
+
 					$discount->tva_tx = abs($tva_tx);
+					$discount->vat_src_code = $vat_src_code;
 
 					$result = $discount->create($user);
 					if ($result < 0) {
@@ -628,7 +675,7 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'add' && $usercancreate) {
-		// Create
+		// Insert new invoice in database
 		if ($socid > 0) {
 			$object->socid = GETPOST('socid', 'int');
 		}
@@ -813,7 +860,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		// Standard or deposit
+		// Standard invoice or Deposit invoice, created from a Predefined template invoice
 		if (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT) {
 			if (GETPOST('socid', 'int') < 1) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Supplier')), null, 'errors');
@@ -843,24 +890,26 @@ if (empty($reshook)) {
 				$tmpproject = GETPOST('projectid', 'int');
 
 				// Creation invoice
-				$object->ref           = GETPOST('ref', 'nohtml');
+				$object->socid				= GETPOST('socid', 'int');
-				$object->ref_supplier  = GETPOST('ref_supplier', 'nohtml');
+				$object->type				= GETPOST('type');
-				$object->socid         = GETPOST('socid', 'int');
+				$object->ref				= GETPOST('ref', 'nohtml');
-				$object->libelle       = GETPOST('label', 'nohtml');	// deprecated
+				$object->ref_supplier		= GETPOST('ref_supplier', 'nohtml');
-				$object->label         = GETPOST('label', 'nohtml');
+				$object->socid				= GETPOST('socid', 'int');
-				$object->date          = $dateinvoice;
+				$object->libelle			= GETPOST('label', 'nohtml');	// deprecated
-				$object->date_echeance = $datedue;
+				$object->label				= GETPOST('label', 'nohtml');
-				$object->note_public   = GETPOST('note_public', 'restricthtml');
+				$object->date				= $dateinvoice;
-				$object->note_private  = GETPOST('note_private', 'restricthtml');
+				$object->date_echeance		= $datedue;
-				$object->cond_reglement_id = GETPOST('cond_reglement_id');
+				$object->note_public		= GETPOST('note_public', 'restricthtml');
-				$object->mode_reglement_id = GETPOST('mode_reglement_id');
+				$object->note_private		= GETPOST('note_private', 'restricthtml');
-				$object->fk_account        = GETPOST('fk_account', 'int');
+				$object->cond_reglement_id	= GETPOST('cond_reglement_id');
-				$object->fk_project = ($tmpproject > 0) ? $tmpproject : null;
+				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
-				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+				$object->fk_account			= GETPOST('fk_account', 'int');
-				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
+				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
-				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+				$object->fk_incoterms		= GETPOST('incoterm_id', 'int');
-				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
-				$object->transport_mode_id = GETPOST('transport_mode_id');
+				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
+				$object->multicurrency_tx	= GETPOST('originmulticurrency_tx', 'int');
+				$object->transport_mode_id	= GETPOST('transport_mode_id');
 
 				// Auto calculation of date due if not filled by user
 				if (empty($object->date_echeance)) {
@@ -935,6 +984,123 @@ if (empty($reshook)) {
 						$srcobject = new $classname($db);
 
 						$result = $srcobject->fetch(GETPOST('originid', 'int'));
+
+						// If deposit invoice - down payment with 1 line (fixed amount or percent)
+						if (GETPOST('type') == Facture::TYPE_DEPOSIT && in_array($typeamount, array('amount', 'variable'))) {
+							// Define the array $amountdeposit
+							$amountdeposit = array();
+							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
+								if ($typeamount == 'amount') {
+									$amount = $valuedeposit;
+								} else {
+									$amount = $srcobject->total_ttc * ($valuedeposit / 100);
+								}
+
+								$TTotalByTva = array();
+								foreach ($srcobject->lines as &$line) {
+									if (!empty($line->special_code)) {
+										continue;
+									}
+									$TTotalByTva[$line->tva_tx] += $line->total_ttc;
+								}
+
+								foreach ($TTotalByTva as $tva => &$total) {
+									$coef = $total / $srcobject->total_ttc; // Calc coef
+									$am = $amount * $coef;
+									$amount_ttc_diff += $am;
+									$amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline
+								}
+							} else {
+								if ($typeamount == 'amount') {
+									$amountdeposit[0] = $valuedeposit;
+								} elseif ($typeamount == 'variable') {
+									if ($result > 0) {
+										$totalamount = 0;
+										$lines = $srcobject->lines;
+										$numlines = count($lines);
+										for ($i = 0; $i < $numlines; $i++) {
+											$qualified = 1;
+											if (empty($lines[$i]->qty)) {
+												$qualified = 0; // We discard qty=0, it is an option
+											}
+											if (!empty($lines[$i]->special_code)) {
+												$qualified = 0; // We discard special_code (frais port, ecotaxe, option, ...)
+											}
+											if ($qualified) {
+												$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
+												$tva_tx = $lines[$i]->tva_tx;
+												$amountdeposit[$tva_tx] += ($lines[$i]->total_ht * $valuedeposit) / 100;
+											}
+										}
+
+										if ($totalamount == 0) {
+											$amountdeposit[0] = 0;
+										}
+									} else {
+										setEventMessages($srcobject->error, $srcobject->errors, 'errors');
+										$error++;
+									}
+								}
+
+								$amount_ttc_diff = $amountdeposit[0];
+							}
+
+							foreach ($amountdeposit as $tva => $amount) {
+								if (empty($amount)) {
+									continue;
+								}
+
+								$arraylist = array(
+									'amount' => 'FixAmount',
+									'variable' => 'VarAmount'
+								);
+								$descline = '(DEPOSIT)';
+								//$descline.= ' - '.$langs->trans($arraylist[$typeamount]);
+								if ($typeamount == 'amount') {
+									$descline .= ' ('.price($valuedeposit, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).')';
+								} elseif ($typeamount == 'variable') {
+									$descline .= ' ('.$valuedeposit.'%)';
+								}
+
+								$descline .= ' - '.$srcobject->ref;
+								$result = $object->addline(
+									$descline,
+									$amount, // subprice
+									$tva, // vat rate
+									0, // localtax1_tx
+									0, // localtax2_tx
+									1, // quantity
+									(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT) ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
+									0, // remise_percent
+									0, // date_start
+									0, // date_end
+									0,
+									$lines[$i]->info_bits, // info_bits
+									'HT',
+									0, // product_type
+									1,
+									0,
+									0,
+									0,
+									null,
+									$object->origin,
+									0,
+									'',
+									$lines[$i]->special_code,
+									0
+									//,$langs->trans('Deposit') //Deprecated
+								);
+							}
+
+							$diff = $object->total_ttc - $amount_ttc_diff;
+
+							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) {
+								$object->fetch_lines();
+								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
+								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
+							}
+						}
+
 						if ($result > 0) {
 							$lines = $srcobject->lines;
 							if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {
@@ -1798,40 +1964,67 @@ if ($action == 'create') {
 	print $desc;
 	print '</div></div>';
 
-	/* Not yet supported
 	if ((empty($origin)) || ((($origin == 'propal') || ($origin == 'commande')) && (! empty($originid))))
 	{
-		// Deposit
+		// Deposit - Down payment
 		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT))
 		{
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
 			print '<script type="text/javascript" language="javascript">
 			jQuery(document).ready(function() {
-				jQuery("#typedeposit, #valuedeposit").click(function() {
+    			jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
+    				jQuery("#radio_standard").prop("checked", true);
+    			});
+    			jQuery("#typedeposit, #valuedeposit").click(function() {
+    				jQuery("#radio_deposit").prop("checked", true);
+    			});
+				jQuery("#typedeposit").change(function() {
+					console.log("We change type of down payment");
 					jQuery("#radio_deposit").prop("checked", true);
+					setRadioForTypeOfInvoice();
 				});
-			});
+    			jQuery("#radio_standard, #radio_deposit, #radio_replacement, #radio_template").change(function() {
-			</script>';
+					setRadioForTypeOfInvoice();
+				});
+				function setRadioForTypeOfInvoice() {
+					console.log("Change radio");
+					if (jQuery("#radio_deposit").prop("checked") && (jQuery("#typedeposit").val() == \'amount\' || jQuery("#typedeposit").val() == \'variable\')) {
+						jQuery(".checkforselect").prop("disabled", true);
+						jQuery(".checkforselect").prop("checked", false);
+					} else {
+						jQuery(".checkforselect").prop("disabled", false);
+						jQuery(".checkforselect").prop("checked", true);
+					}
+				};
+    		});
+    		</script>';
 
-			$desc = $form->textwithpicto($tmp.$langs->trans("InvoiceDeposit"), $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3);
+			$tmp  = $tmp.'<label for="radio_deposit" >'.$langs->trans("InvoiceDeposit").'</label>';
-			print '<table class="nobordernopadding"><tr><td>';
+			$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3);
+			print '<table class="nobordernopadding"><tr>';
+			print '<td>';
 			print $desc;
 			print '</td>';
 			if (($origin == 'propal') || ($origin == 'commande'))
 			{
-				print '<td class="nowrap" style="padding-left: 5px">';
+				print '<td class="nowrap" style="padding-left: 15px">';
-				$arraylist = array('amount' => $langs->transnoentitiesnoconv('FixAmount', $langs->transnoentitiesnoconv('Deposit')), 'variable' => $langs->transnoentitiesnoconv('VarAmountOneLine', $langs->transnoentitiesnoconv('Deposit')));
+				$arraylist = array(
-				print $form->selectarray('typedeposit', $arraylist, GETPOST('typedeposit'), 0, 0, 0, '', 1);
+					'amount' => $langs->transnoentitiesnoconv('FixAmount', $langs->transnoentitiesnoconv('Deposit')),
+					'variable' => $langs->transnoentitiesnoconv('VarAmountOneLine', $langs->transnoentitiesnoconv('Deposit')),
+					'variablealllines' => $langs->transnoentitiesnoconv('VarAmountAllLines')
+				);
+				print $form->selectarray('typedeposit', $arraylist, GETPOST('typedeposit', 'aZ09'), 0, 0, 0, '', 1);
+				print '</td>';
+				print '<td class="nowrap" style="padding-left: 5px">';
+				print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="' . GETPOST('valuedeposit', 'int') . '"/>';
 				print '</td>';
-				print '<td class="nowrap" style="padding-left: 5px">' . $langs->trans('Value') . ':<input type="text" id="valuedeposit" name="valuedeposit" size="3" value="' . GETPOST('valuedeposit', 'int') . '"/>';
 			}
-			print '</td></tr></table>';
+			print '</tr></table>';
 
 			print '</div></div>';
 		}
 	}
-	*/
 
 	/* Not yet supported for supplier
 	if ($societe->id > 0)
@@ -2340,10 +2533,68 @@ if ($action == 'create') {
 		}
 
 		// Confirmation set paid
-		if ($action == 'paid') {
+		if ($action == 'paid' && $resteapayer <= 0) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', 0, 1);
 		}
 
+		if ($action == 'paid' && $resteapayer > 0) {
+			$close = array();
+			// Code
+			$i = 0;
+			$close[$i]['code'] = 'discount_vat'; // escompte
+			$i++;
+			$close[$i]['code'] = 'badsupplier';
+			$i++;
+			$close[$i]['code'] = 'other';
+			$i++;
+			// Help
+			$i = 0;
+			$close[$i]['label'] = $langs->trans("HelpEscompte").'<br><br>'.$langs->trans("ConfirmClassifyPaidPartiallyReasonDiscountVatDesc");
+			$i++;
+			$close[$i]['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBadSupplierDesc");
+			$i++;
+			$close[$i]['label'] = $langs->trans("Other");
+			$i++;
+			// Text
+			$i = 0;
+			$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscount", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
+			$i++;
+			$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
+			$i++;
+			$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("Other"), $close[$i]['label'], 1);
+			$i++;
+			// arrayreasons[code]=reason
+			foreach ($close as $key => $val) {
+				$arrayreasons[$close[$key]['code']] = $close[$key]['reason'];
+			}
+
+			// Create a form table
+			$formquestion = array('text' => $langs->trans("ConfirmClassifyPaidPartiallyQuestion"), array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
+			// Incomplete payment. We ask if the reason is discount or other
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidPartially', $object->ref), 'confirm_paid_partially', $formquestion, "yes", 1, 310);
+		}
+
+		// Confirmation of the abandoned classification
+		if ($action == 'canceled') {
+			// Code
+			$close[1]['code'] = 'badsupplier';
+			$close[2]['code'] = 'abandon';
+			// Help
+			$close[1]['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBadSupplierDesc");
+			$close[2]['label'] = $langs->trans("ConfirmClassifyAbandonReasonOtherDesc");
+			// Text
+			$close[1]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadSupplier", $object->ref), $close[1]['label'], 1);
+			$close[2]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyAbandonReasonOther"), $close[2]['label'], 1);
+			// arrayreasons
+			$arrayreasons[$close[1]['code']] = $close[1]['reason'];
+			$arrayreasons[$close[2]['code']] = $close[2]['reason'];
+
+			// Create a form table
+			$formquestion = array('text' => $langs->trans("ConfirmCancelBillQuestion"), array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
+
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelBill'), $langs->trans('ConfirmCancelBill', $object->ref), 'confirm_canceled', $formquestion, "yes", 1, 250);
+		}
+
 		// Confirmation de la suppression de la facture fournisseur
 		if ($action == 'delete') {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBill'), $langs->trans('ConfirmDeleteBill'), 'confirm_delete', '', 0, 1);
@@ -3109,9 +3360,9 @@ if ($action == 'create') {
 					$ventilExportCompta = $object->getVentilExportCompta(); // Should be 0 since the sum of payments are zero. But we keep the protection.
 
 					if ($ventilExportCompta == 0) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a></div>';
+						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
 					} else {
-						print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span></div>';
+						print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span>';
 					}
 				}
 
@@ -3120,15 +3371,29 @@ if ($action == 'create') {
 
 				// Reopen a standard paid invoice
 				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT
-					|| ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && empty($discount->id)))
+					|| ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && empty($discount->id))
+					|| ($object->type == FactureFournisseur::TYPE_DEPOSIT && empty($discount->id)))
 					&& ($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED)) {				// A paid invoice (partially or completely)
 					if (!$facidnext && $object->close_code != 'replaced' && $usercancreate) {	// Not replaced by another invoice
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a></div>';
+						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
 					} else {
 						if ($usercancreate) {
-							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span></div>';
+							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span>';
 						} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
-							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('ReOpen').'</span></div>';
+							print '<span class="butActionRefused classfortooltip">'.$langs->trans('ReOpen').'</span>';
+						}
+					}
+				}
+
+				// Validate
+				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT) {
+					if (count($object->lines)) {
+						if ($usercanvalidate) {
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
+							print '>'.$langs->trans('Validate').'</a>';
+						} else {
+							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
+							print '>'.$langs->trans('Validate').'</a>';
 						}
 					}
 				}
@@ -3137,24 +3402,16 @@ if ($action == 'create') {
 				if (empty($user->socid)) {
 					if (($object->statut == FactureFournisseur::STATUS_VALIDATED || $object->statut == FactureFournisseur::STATUS_CLOSED)) {
 						if ($usercansend) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
+							print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 						} else {
-							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</a></div>';
+							print '<span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</span>';
 						}
 					}
 				}
 
-				// Make payments
+				// Create payment
-				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0) {
+				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create'.($object->fk_account > 0 ? '&amp;accountid='.$object->fk_account : '').'">'.$langs->trans('DoPayment').'</a></div>'; // must use facid because id is for payment id not invoice
+					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.DOL_URL_ROOT.'/fourn/facture/paiement.php?facid='.$object->id.'&amp;action=create'.($object->fk_account > 0 ? '&amp;accountid='.$object->fk_account : '').'">'.$langs->trans('DoPayment').'</a>'; // must use facid because id is for payment id not invoice
-				}
-
-				// Classify paid
-				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
-					print '>'.$langs->trans('ClassifyPaid').'</a></div>';
-
-					//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
 				}
 
 				// Reverse back money or convert to reduction
@@ -3162,37 +3419,43 @@ if ($action == 'create') {
 					// For credit note only
 					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0) {
 						if ($resteapayer == 0) {
-							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span></div>';
+							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span>';
 						} else {
-							print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
+							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a>';
 						}
 					}
 
 					// For standard invoice with excess paid
 					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $usercancreate && empty($discount->id)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessPaidToReduc').'</a></div>';
+						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessPaidToReduc').'</a>';
 					}
 					// For credit note
 					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $usercancreate
 						&& (!empty($conf->global->SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED) || $object->getSommePaiement() == 0)
 						) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReducSupplier2")).'">'.$langs->trans('ConvertToReduc').'</a></div>';
+						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReducSupplier2")).'">'.$langs->trans('ConvertToReduc').'</a>';
 					}
 					// For deposit invoice
-					if ($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->paye == 1 && $resteapayer == 0 && $usercancreate && empty($discount->id)) {
+					if ($object->type == FactureFournisseur::TYPE_DEPOSIT && $usercancreate && $object->statut > 0 && empty($discount->id)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a></div>';
+						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a>';
 					}
 				}
 
-				// Validate
+				// Classify paid
-				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT) {
+				if (($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && (($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $resteapayer >= 0)))
-					if (count($object->lines)) {
+					|| ($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->paye == 0 && $object->total_ttc > 0 && $resteapayer == 0 && empty($discount->id))
-						if ($usercanvalidate) {
+				) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
+					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
-							print '>'.$langs->trans('Validate').'</a></div>';
+				}
-						} else {
+
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
+				// Classify 'closed not completely paid' (possible if validated and not yet filed paid)
-							print '>'.$langs->trans('Validate').'</a></div>';
+				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0) {
+					if ($totalpaye > 0 || $totalcreditnotes > 0) {
+						// If one payment or one credit note was linked to this invoice
+						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaidPartially').'</a>';
+					} else {
+						if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED)) {
+							print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=canceled">'.$langs->trans('ClassifyCanceled').'</a>';
 						}
 					}
 				}
@@ -3203,34 +3466,34 @@ if ($action == 'create') {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a></div>';
 				}*/
 
-				// Clone
-				if ($action != 'edit' && $usercancreate) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=clone&amp;socid='.$object->socid.'">'.$langs->trans('ToClone').'</a></div>';
-				}
-
 				// Create a credit note
 				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut > 0 && $usercancreate) {
 					if (!$objectidnext) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'">'.$langs->trans("CreateCreditNote").'</a></div>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'">'.$langs->trans("CreateCreditNote").'</a>';
 					}
 				}
 
+				// Clone
+				if ($action != 'edit' && $usercancreate) {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=clone&amp;socid='.$object->socid.'">'.$langs->trans('ToClone').'</a>';
+				}
+
 				// Delete
 				$isErasable = $object->is_erasable();
 				if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($usercancreate && $isErasable == 1))) {	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
 					//var_dump($isErasable);
 					if ($isErasable == -4) {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a>';
 					} elseif ($isErasable == -3) {	// Should never happen with supplier invoice
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a></div>';
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a>';
 					} elseif ($isErasable == -2) {	// Should never happen with supplier invoice
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a>';
 					} elseif ($isErasable == -1) {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a>';
 					} elseif ($isErasable <= 0) {	// Any other cases
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
+						print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
 					}
 				}
 				print '</div>';

htdocs/install/mysql/migration/13.0.0-14.0.0.sql

@@ -365,3 +365,6 @@ ALTER TABLE llx_product ADD COLUMN batch_mask VARCHAR(32) NULL;
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (210, 'conferenceorbooth', 'internal', 'MANAGER',  'Conference or Booth manager', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (211, 'conferenceorbooth', 'external', 'SPEAKER',   'Conference Speaker', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (212, 'conferenceorbooth', 'external', 'RESPONSIBLE',   'Booth responsible', 1);
+
+ALTER TABLE llx_facture_fourn ADD COLUMN date_closing datetime DEFAULT NULL after date_valid;
+ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL after fk_user_valid;

htdocs/install/mysql/tables/llx_facture_fourn.sql

@@ -1,8 +1,9 @@
 -- ===========================================================================
--- Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2001-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
--- Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2007-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
--- Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
+-- Copyright (C) 2007-2012  Regis Houssin           <regis.houssin@inodbox.com>
--- Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2010       Juanjo Menent           <jmenent@2byte.es>
+-- Copyright (C) 2021       Alexandre Spangaro      <aspangaro@open-dsi.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,10 +33,11 @@ create table llx_facture_fourn
   fk_soc				integer NOT NULL,
   
   datec					datetime,                      -- date de creation de la facture
-  datef					date,                          -- date de la facture
+  datef					date,                          -- date invoice
   date_pointoftax		date DEFAULT NULL,			   -- date point of tax (for GB)
   date_valid			date,						   -- date validation
   tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                     -- last modification date
+  date_closing			datetime,                      -- date closing
   libelle				varchar(255),
   paye					smallint         DEFAULT 0 NOT NULL,
   amount				double(24,8)     DEFAULT 0 NOT NULL,
@@ -57,14 +59,15 @@ create table llx_facture_fourn
   fk_user_author		integer,                       -- user making creation
   fk_user_modif         integer,                       -- user making last change
   fk_user_valid			integer,                       -- user validating
+  fk_user_closing		integer,					   -- user closing
 
   fk_facture_source		integer,                       -- facture origine si facture avoir
   fk_projet				integer,                       -- projet auquel est associee la facture
 
   fk_account            integer,                       -- bank account
-  fk_cond_reglement		integer,   	                   	-- condition de reglement (30 jours, fin de mois ...)
+  fk_cond_reglement		integer,   	                   -- condition de reglement (30 jours, fin de mois ...)
-  fk_mode_reglement		integer,                	   	-- mode de reglement (CHQ, VIR, ...)
+  fk_mode_reglement		integer,                	   -- mode de reglement (CHQ, VIR, ...)
-  date_lim_reglement 	date,                          	-- date limite de reglement
+  date_lim_reglement 	date,                          -- date limite de reglement
 
   note_private			text,
   note_public			text,