Browse Source

MMICore : Fetch prev line to show properly deposit details

Mathieu Moulin 10 tháng trước cách đây
mục cha
commit
5ad7f659a4
2 tập tin đã thay đổi với 30 bổ sung0 xóa
  1. 15 0
      htdocs/core/lib/pdf.lib.php
  2. 15 0
      htdocs/core/tpl/objectline_view.tpl.php

+ 15 - 0
htdocs/core/lib/pdf.lib.php

@@ -1642,6 +1642,21 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {
 				$libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
 			}
+		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_prev_id) { // MMI
+			$prevline = clone $object->lines[$i];
+			while($prevline->fk_prev_id) {
+				$prevline->fetch($prevline->fk_prev_id);
+			}
+			if ($prevline->fk_remise_except > 0) {
+				$discount = new DiscountAbsolute($db);
+				$discount->fetch($prevline->fk_remise_except);
+			}
+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoice_supplier_source : $discount->ref_facture_source;
+			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
+			// Add date of deposit
+			if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {
+				$libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
+			}
 		} elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);

+ 15 - 0
htdocs/core/tpl/objectline_view.tpl.php

@@ -119,6 +119,21 @@ if (($line->info_bits & 2) == 2) {
 			if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {
 				print ' ('.dol_print_date($discount->datec).')';
 			}
+		} elseif ($line->description == '(DEPOSIT)' && $line->fk_prev_id > 0) { // MMI Update
+			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+			$prevline = clone $line;
+			while($prevline->fk_prev_id) {
+				$prevline->fetch($prevline->fk_prev_id);
+			}
+			if ($prevline->fk_remise_except > 0) {
+				$discount = new DiscountAbsolute($this->db);
+				$discount->fetch($prevline->fk_remise_except);
+				print($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
+				// Add date of deposit
+				if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {
+					print ' ('.dol_print_date($discount->datec).')';
+				}
+			}
 		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($this->db);