francoisPE · francoisPE · Jan 3, 2025 · Jan 3, 2025 · Jan 3, 2025 · Jan 3, 2025
diff --git a/doc/doctemplates/invoices/template_invoice.odt b/doc/doctemplates/invoices/template_invoice.odt
diff --git a/doc/doctemplates/orders/template_order.odt b/doc/doctemplates/orders/template_order.odt
diff --git a/doc/doctemplates/supplier_invoices/template_supplier_invoices.odt b/doc/doctemplates/supplier_invoices/template_supplier_invoices.odt
diff --git a/doc/doctemplates/supplier_orders/template_supplier_order.odt b/doc/doctemplates/supplier_orders/template_supplier_order.odt
diff --git a/doc/doctemplates/thirdparties/template_thirdparty.odt b/doc/doctemplates/thirdparties/template_thirdparty.odt
diff --git a/doc/medias/README.txt b/doc/medias/README.txt
@@ -0,0 +1,2 @@
+# File(s) into root medias directory are provide by Pixabay with Licence "CC0 Creative Commons"
+# https://creativecommons.org/publicdomain/zero/1.0/
diff --git a/doc/medias/background_coder.jpg b/doc/medias/background_coder.jpg
diff --git a/doc/medias/background_dolibarr.jpg b/doc/medias/background_dolibarr.jpg
diff --git a/doc/medias/background_rough-horn.jpg b/doc/medias/background_rough-horn.jpg
diff --git a/doc/medias/background_sunset.jpg b/doc/medias/background_sunset.jpg
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
@@ -98,6 +98,9 @@
 if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
 	$list_account[] = 'ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY';
 }
+if (getDolGlobalString('INVOICE_USE_PRORATA_DISCOUNT')) {
+	$list_account[] = 'ACCOUNTING_ACCOUNT_CUSTOMER_PRORATA_DISCOUNT';
+}
 if (isModEnabled('don')) {
 	$list_account[] = 'DONATION_ACCOUNTINGACCOUNT';
 }

diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
@@ -489,7 +489,7 @@ public function bookkeepingLettering($bookkeeping_ids, $unlettering = false)
 			}
 
 			// Check balance amount
-			if (!$group_error && !$unlettering && price2num($total) != 0) {
+			if (!$group_error && !$unlettering && price2num($total) < 0.01) {
 				$this->errors[] = $langs->trans('AccountancyErrorMismatchBalanceAmount', $total);
 				$group_error++;
 			}

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
@@ -117,7 +117,7 @@
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$sql = "SELECT f.rowid, f.ref, f.type, f.situation_cycle_ref, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code, f.retained_warranty, f.revenuestamp,";
+$sql = "SELECT f.rowid, f.ref, f.type, f.situation_cycle_ref, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code, f.retained_warranty, f.revenuestamp, f.prorata_discount, f.total_ht as fact_total_ht,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code, fd.info_bits,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur,";
 if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
@@ -189,6 +189,7 @@
 	$tabtva = array();
 	$def_tva = array();
 	$tabwarranty = array();
+	$tabprorata = array();
 	$tabrevenuestamp = array();
 	$tabttc = array();
 	$tablocaltax1 = array();
@@ -263,6 +264,9 @@
 			}
 		}
 
+		// Manage prorata_rate for VAT
+		$prorata_rate = $obj->fact_total_ht <> 0 ? ($obj->prorata_discount / $obj->fact_total_ht) : 0;
+
 		$revenuestamp = (float) price2num($obj->revenuestamp, 'MT');
 
 		// Invoice lines
@@ -310,11 +314,19 @@
 			$total_ttc -= $retained_warranty;
 		}
 
+		// Move a part of the prorata discount/charge into the account for prorata charges
+		if (getDolGlobalString('INVOICE_USE_PRORATA_DISCOUNT') && $obj->prorata_discount > 0) {
+			$prorata_discount = $prorata_rate * $obj->total_ht * $situation_ratio;	
+			$tabprorata[$obj->rowid][$compta_soc] += $prorata_discount;
+			$total_ttc -= $prorata_discount; // Remove ht value for prorata
+			$total_ttc -= ($obj->total_tva * $situation_ratio * $prorata_rate); // Remove VAT value corresponding to prorata
+		}
+
 		$tabttc[$obj->rowid][$compta_soc] += $total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
 		$tva_npr = (($obj->info_bits & 1 == 1) ? 1 : 0);
 		if (!$tva_npr) { // We ignore line if VAT is a NPR
-			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio * (1 - $prorata_rate);
 		}
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1 * $situation_ratio;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2 * $situation_ratio;
@@ -369,6 +381,18 @@
 
 $errorforinvoice = array();
 
+// Round prorata and TVA to cents
+if (getDolGlobalString('ROUND_IN_ACCOUNTING')) {
+	$to_round = array(&$tabprorata, &$tabtva, &$tabht, &$tabttc);
+	foreach ($to_round as &$tab) {
+		foreach ($tab as $invoice => $accounts) {
+			foreach ($accounts as $label => $value) {
+				$tab[$invoice][$label] = round($value, 2); 
+			}
+		}
+	}
+}
+
 /*
 // Old way, 1 query for each invoice
 // Loop on all invoices to detect lines without binded code (fk_code_ventilation <= 0)
@@ -426,14 +450,16 @@
 
 	$companystatic = new Societe($db);
 	$invoicestatic = new Facture($db);
-	$accountingaccountcustomer = new AccountingAccount($db);
 
+	$accountingaccountcustomer = new AccountingAccount($db);
 	$accountingaccountcustomer->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'), true);
 
 	$accountingaccountcustomerwarranty = new AccountingAccount($db);
-
 	$accountingaccountcustomerwarranty->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY'), true);
 
+	$accountingaccountcustomerprorata = new AccountingAccount($db);
+	$accountingaccountcustomerprorata->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_PRORATA_DISCOUNT'), true);
+
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		$errorforline = 0;
 
@@ -586,6 +612,67 @@
 			}
 		}
 
+		// Prorata
+		if (!$errorforline && getDolGlobalString('INVOICE_USE_PRORATA_DISCOUNT') && isset($tabprorata[$key])) {
+			if (is_array($tabprorata[$key])) {
+				foreach ($tabprorata[$key] as $k => $mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->date_lim_reglement = $val["datereg"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_creation = $now;
+					$bookkeeping->doc_type = 'customer_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+					$bookkeeping->thirdparty_code = $companystatic->code_client;
+
+					if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) {
+						if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT')) {
+							$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+						} else {
+							$bookkeeping->subledger_account = '';
+							$bookkeeping->subledger_label = '';
+						}
+					} else {
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
+					}
+
+					$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_PRORATA_DISCOUNT');
+					$bookkeeping->label_compte = $accountingaccountcustomerprorata->label;
+
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("ProtataDiscountAccountancy");
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt < 0) ? -$mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $langs->transnoentities($journal_label);
+					$bookkeeping->fk_user_author = $user->id;
+					$bookkeeping->entity = $conf->entity;
+
+					$totaldebit += $bookkeeping->debit;
+					$totalcredit += $bookkeeping->credit;
+
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {    // Already exists
+							$error++;
+							$errorforline++;
+							$errorforinvoice[$key] = 'alreadyjournalized';
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						} else {
+							$error++;
+							$errorforline++;
+							$errorforinvoice[$key] = 'other';
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
+					}
+				}
+			}
+		}
+
 		// Product / Service
 		if (!$errorforline) {
 			foreach ($tabht[$key] as $k => $mt) {
@@ -1143,7 +1230,7 @@ function writebookkeeping() {
 			$i++;
 			continue;
 		}
-		if ($errorforinvoice[$key] == 'somelinesarenotbound') {
+		if (array_key_exists($key, $errorforinvoice) && $errorforinvoice[$key] == 'somelinesarenotbound') {
 			print '<tr class="oddeven">';
 			print "<!-- Some lines are not bound -->";
 			print "<td>".$date."</td>";
@@ -1228,6 +1315,37 @@ function writebookkeeping() {
 			$i++;
 		}
 
+		// Prorata
+		if (getDolGlobalString('INVOICE_USE_PRORATA_DISCOUNT') && isset($tabprorata[$key]) && is_array($tabprorata[$key])) {
+			foreach ($tabprorata[$key] as $k => $mt) {
+				print '<tr class="oddeven">';
+				print "<!-- Prorata discount -->";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				// Account
+				print "<td>";
+				$accountoshow = length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_PRORATA_DISCOUNT'));
+				if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+					print '<span class="error">' . $langs->trans("MainAccountForProrataNotDefined") . '</span>';
+				} else {
+					print $accountoshow;
+				}
+				print '</td>';
+				// Subledger account
+				print "<td>";
+				if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) {
+					if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT')) {
+						print length_accounta($tabcompany[$key]['code_compta']);
+					}
+				} 
+				print '</td>';
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("ProtataDiscountAccountancy") . "</td>";
+				print '<td class="right nowraponall amount">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print '<td class="right nowraponall amount">' . ($mt < 0 ? price(-$mt) : '') . "</td>";
+				print "</tr>";
+			}
+		}
+
 		// Product / Service
 		foreach ($tabht[$key] as $k => $mt) {
 			$accountingaccount = new AccountingAccount($db);

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
@@ -84,6 +84,7 @@
 $contactid = GETPOST('contactid', 'int');
 $projectid = GETPOST('projectid', 'int');
 $rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
+$same_project_filter = GETPOST('sameproject', 'string') == "on";
 
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
@@ -1270,7 +1271,7 @@
 				}
 
 				$type = $prod->type;
-				$fk_unit = $prod->fk_unit;
+                $fk_unit = (getDolGlobalInt('MAIN_EDIT_LINE_SET_UNIT_ON_EXISTING_PRODUCT') ?  GETPOST('units', 'alpha') :  $prod->fk_unit) ;
 			} else {
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num($price_ttc, 'MU');
@@ -2224,7 +2225,7 @@
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
-		print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min" style="overflow: initial !important;" >';
 		print '<table class="noborder centpercent">';
 
 		$objectsrc->printOriginLinesList();
@@ -2973,7 +2974,7 @@
 			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 		}
 
-		print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min" style="overflow: initial !important;" >';
 		if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline')) {
 			print '<table id="tablelines" class="noborder noshadow centpercent">';
 		}
@@ -3155,7 +3156,7 @@
 		print $formfile->showdocuments('propal', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);
 
 		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object, null, array('propal'));
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('propal'), $same_project_filter);
 
 		$compatibleImportElementsList = false;
 		if ($user->hasRight('propal', 'creer') && $object->statut == Propal::STATUS_DRAFT) {

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
@@ -92,6 +92,7 @@
 $origin    =  GETPOST('origin', 'alpha');
 $originid  = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int'));    // For backward compatibility
 $rank      = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
+$same_project_filter = GETPOST('sameproject', 'string') == "on";
 
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
@@ -970,7 +971,7 @@
 				}
 
 				$type = $prod->type;
-				$fk_unit = $prod->fk_unit;
+                $fk_unit = (getDolGlobalInt('MAIN_EDIT_LINE_SET_UNIT_ON_EXISTING_PRODUCT') ?  GETPOST('units', 'alpha') :  $prod->fk_unit) ;
 			} else {
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num($price_ttc, 'MU');
@@ -2122,7 +2123,7 @@
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
-		print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min" style="overflow: initial !important;" >';
 		print '<table class="noborder centpercent">';
 
 		$objectsrc->printOriginLinesList('', $selectedLines);
@@ -2870,7 +2871,7 @@
 				include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 			}
 
-			print '<div class="div-table-responsive-no-min">';
+			print '<div class="div-table-responsive-no-min" style="overflow: initial !important;" >';
 			print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
 			// Show object lines
@@ -3084,7 +3085,7 @@
 
 
 			// Show links to link elements
-			$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
+			$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'), $same_project_filter);
 
 			$compatibleImportElementsList = false;
 			if ($usercancreate

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
@@ -1184,7 +1184,7 @@
 		/*
 		 * Invoice lines
 		 */
-		print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min" style="overflow: initial !important;" >';
 		print '<table id="tablelines" class="noborder noshadow centpercent">';
 
 		// Show object lines
@@ -1683,7 +1683,7 @@
 			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 		}
 
-		print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min" style="overflow: initial !important;" >';
 		print '<table id="tablelines" class="noborder noshadow centpercent">';
 		// Show object lines
 		if (!empty($object->lines)) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# File(s) into root medias directory are provide by Pixabay with Licence "CC0 Creative Commons"
		# https://creativecommons.org/publicdomain/zero/1.0/