From d92665753495b317e5b8b05addd35a1f82c316be Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 8 Mar 2019 10:57:14 +0100
Subject: [PATCH 1/5] FIX: Accountancy - Format EBP import

Add doc
---
 .../iso-normes/Accountancy-format_Ebp_txt.pdf   | Bin 0 -> 18984 bytes
 .../class/accountancyexport.class.php           |  11 ++++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf

diff --git a/dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf b/dev/resources/iso-normes/Accountancy-format_Ebp_txt.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..24e6fca05e972989f059b0853f8215b3fc1048d8
GIT binary patch
literal 18984
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
TDE$RgKP@K2#s>LgIidd#ASZ!e

literal 0
HcmV?d00001

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 52b5f1c411f..6cad9372701 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -517,14 +517,19 @@ class AccountancyExport
 			print $line->id . $separator;
 			print $date . $separator;
 			print $line->code_journal . $separator;
-			print length_accountg($line->numero_compte) . $separator;
-			print substr(length_accountg($line->numero_compte),0,2) . $separator;
+
+			if (empty($line->subledger_account)) {
+                print $line->numero_compte . $separator;
+            } else {
+                print $line->subledger_account . $separator;
+            }
+			//print substr(length_accountg($line->numero_compte),0,2) . $separator;
 			print '"'.dol_trunc($line->label_operation,40,'right','UTF-8',1).'"' . $separator;
 			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$separator;
 			print price2num($line->montant).$separator;
 			print $line->sens.$separator;
 			print $date . $separator;
-			print 'EUR';
+			//print 'EUR';
 			print $end_line;
 		}
 	}

From 94c58072d74cc7f671448dfd92c8ba587144228d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 12 Mar 2019 07:29:29 +0100
Subject: [PATCH 2/5] FIX possibility to set up payment mode when invoice
 module is disabled

---
 htdocs/admin/facture.php |  24 +++----
 htdocs/admin/propal.php  | 132 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 138 insertions(+), 18 deletions(-)

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 46a11e363fd..0764f86dfb1 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -78,7 +78,7 @@ if ($action == 'updateMask')
     }
 }
 
-if ($action == 'specimen')
+else if ($action == 'specimen')
 {
     $modele=GETPOST('module','alpha');
 
@@ -164,7 +164,7 @@ else if ($action == 'setmod')
     dolibarr_set_const($db, "FACTURE_ADDON",$value,'chaine',0,'',$conf->entity);
 }
 
-if ($action == 'setribchq')
+else if ($action == 'setribchq')
 {
 	$rib = GETPOST('rib','alpha');
 	$chq = GETPOST('chq','alpha');
@@ -184,7 +184,7 @@ if ($action == 'setribchq')
     }
 }
 
-if ($action == 'set_FACTURE_DRAFT_WATERMARK')
+else if ($action == 'set_FACTURE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('FACTURE_DRAFT_WATERMARK','alpha');
 
@@ -202,7 +202,7 @@ if ($action == 'set_FACTURE_DRAFT_WATERMARK')
     }
 }
 
-if ($action == 'set_INVOICE_FREE_TEXT')
+else if ($action == 'set_INVOICE_FREE_TEXT')
 {
 	$freetext = GETPOST('INVOICE_FREE_TEXT','none');	// No alpha here, we want exact string
 
@@ -220,7 +220,7 @@ if ($action == 'set_INVOICE_FREE_TEXT')
     }
 }
 
-if ($action == 'setforcedate')
+else if ($action == 'setforcedate')
 {
 	$forcedate = GETPOST('forcedate','alpha');
 
@@ -238,20 +238,20 @@ if ($action == 'setforcedate')
     }
 }
 
-if ($action == 'setDefaultPDFModulesByType')
+else if ($action == 'setDefaultPDFModulesByType')
 {
     $invoicetypemodels =  GETPOST('invoicetypemodels');
-    
+
     if(!empty($invoicetypemodels) && is_array($invoicetypemodels))
     {
         $error = 0;
-        
+
         foreach ($invoicetypemodels as $type => $value)
         {
             $res = dolibarr_set_const($db, 'FACTURE_ADDON_PDF_'.intval($type),$value,'chaine',0,'',$conf->entity);
             if (! $res > 0) $error++;
         }
-        
+
         if (! $error)
         {
             setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -621,7 +621,7 @@ if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
     print '<td>'.$langs->trans("Name").'</td>';
     print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
     print "</tr>\n";
-    
+
     $listtype=array(
         Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
         Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
@@ -632,7 +632,7 @@ if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
     {
         $listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
     }
-    
+
     foreach ($listtype as $type => $trans)
     {
         $thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
@@ -642,7 +642,7 @@ if(!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
         print '<td colspan="2" >'.$form->selectarray('invoicetypemodels['.$type.']', ModelePDFFactures::liste_modeles($db), $current,0,0, 0).'</td>';
         print "</tr>\n";
     }
-    
+
     print '</table>';
     print "</form>";
 }
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index cf860cd64ba..81fdd4d534e 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -70,7 +70,7 @@ if ($action == 'updateMask')
 	}
 }
 
-if ($action == 'specimen')
+else if ($action == 'specimen')
 {
 	$modele=GETPOST('module','alpha');
 
@@ -115,7 +115,27 @@ if ($action == 'specimen')
 	}
 }
 
-if ($action == 'set_PROPALE_DRAFT_WATERMARK')
+else if ($action == 'setribchq')
+{
+	$rib = GETPOST('rib','alpha');
+	$chq = GETPOST('chq','alpha');
+
+	$res = dolibarr_set_const($db, "FACTURE_RIB_NUMBER",$rib,'chaine',0,'',$conf->entity);
+	$res = dolibarr_set_const($db, "FACTURE_CHQ_NUMBER",$chq,'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+	if (! $error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
+else if ($action == 'set_PROPALE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('PROPALE_DRAFT_WATERMARK','alpha');
 
@@ -132,7 +152,7 @@ if ($action == 'set_PROPALE_DRAFT_WATERMARK')
 	}
 }
 
-if ($action == 'set_PROPOSAL_FREE_TEXT')
+else if ($action == 'set_PROPOSAL_FREE_TEXT')
 {
 	$freetext = GETPOST('PROPOSAL_FREE_TEXT','none');	// No alpha here, we want exact string
 
@@ -150,7 +170,7 @@ if ($action == 'set_PROPOSAL_FREE_TEXT')
 	}
 }
 
-if ($action == 'setdefaultduration')
+else if ($action == 'setdefaultduration')
 {
 	$res = dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION",$value,'chaine',0,'',$conf->entity);
 
@@ -166,7 +186,7 @@ if ($action == 'setdefaultduration')
 	}
 }
 
-if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
+else if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
 {
     $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL",$value,'chaine',0,'',$conf->entity);
 
@@ -183,7 +203,7 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
 }
 
 // Activate a model
-if ($action == 'set')
+else if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 }
@@ -499,6 +519,106 @@ foreach ($dirmodels as $reldir)
 }
 
 print '</table>';
+
+/*
+ *  Payment mode
+ */
+if (! empty($conf->banque->enabled) && empty($conf->facture->enabled))
+{
+	print '<br>';
+	print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice"),'','');
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+
+	print '<table class="noborder" width="100%">';
+
+	print '<tr class="liste_titre">';
+	print '<td>';
+	print '<input type="hidden" name="action" value="setribchq">';
+	print $langs->trans("PaymentMode").'</td>';
+	print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+	print "</tr>\n";
+
+	print '<tr class="oddeven">';
+	print "<td>".$langs->trans("SuggestPaymentByRIBOnAccount")."</td>";
+	print "<td>";
+	if (! empty($conf->banque->enabled))
+	{
+		$sql = "SELECT rowid, label";
+		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+		$sql.= " WHERE clos = 0";
+		$sql.= " AND courant = 1";
+		$sql.= " AND entity IN (".getEntity('bank_account').")";
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+			if ($num > 0)
+			{
+				print '<select name="rib" class="flat" id="rib">';
+				print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
+				while ($i < $num)
+				{
+					$row = $db->fetch_row($resql);
+
+					print '<option value="'.$row[0].'"';
+					print $conf->global->FACTURE_RIB_NUMBER == $row[0] ? ' selected':'';
+					print '>'.$row[1].'</option>';
+
+					$i++;
+				}
+				print "</select>";
+			}
+			else
+			{
+				print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
+			}
+		}
+	}
+	else
+	{
+		print $langs->trans("BankModuleNotActive");
+	}
+	print "</td></tr>";
+
+	print '<tr class="oddeven">';
+	print "<td>".$langs->trans("SuggestPaymentByChequeToAddress")."</td>";
+	print "<td>";
+	print '<select class="flat" name="chq" id="chq">';
+	print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
+	print '<option value="-1"'.($conf->global->FACTURE_CHQ_NUMBER?' selected':'').'>'.$langs->trans("MenuCompanySetup").' ('.($mysoc->name?$mysoc->name:$langs->trans("NotDefined")).')</option>';
+
+	$sql = "SELECT rowid, label";
+	$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
+	$sql.= " WHERE clos = 0";
+	$sql.= " AND courant = 1";
+	$sql.= " AND entity IN (".getEntity('bank_account').")";
+
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num)
+		{
+
+			$row = $db->fetch_row($resql);
+
+			print '<option value="'.$row[0].'"';
+			print $conf->global->FACTURE_CHQ_NUMBER == $row[0] ? ' selected':'';
+			print '>'.$langs->trans("OwnerOfBankAccount",$row[1]).'</option>';
+
+			$i++;
+		}
+	}
+	print "</select>";
+	print "</td></tr>";
+	print "</table>";
+	print "</form>";
+}
+
 print '<br>';
 
 

From 259fa0ac812b5a2bedd9d29116b239d49728e824 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 12 Mar 2019 07:42:25 +0100
Subject: [PATCH 3/5] FIX check only if invoice module is enabled (bank is
 check after)

---
 htdocs/admin/propal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 81fdd4d534e..df0583d1803 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -523,7 +523,7 @@ print '</table>';
 /*
  *  Payment mode
  */
-if (! empty($conf->banque->enabled) && empty($conf->facture->enabled))
+if (empty($conf->facture->enabled))
 {
 	print '<br>';
 	print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice"),'','');

From 47057b431d427443cd5f59f451198d2c00ea561b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 12 Mar 2019 07:56:22 +0100
Subject: [PATCH 4/5] FIX translation

---
 htdocs/admin/propal.php       | 2 +-
 htdocs/langs/en_US/admin.lang | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index df0583d1803..eca6aaab778 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -526,7 +526,7 @@ print '</table>';
 if (empty($conf->facture->enabled))
 {
 	print '<br>';
-	print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice"),'','');
+	print load_fiche_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInProposal"),'','');
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9c8c3d60854..b50e25f50d4 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1245,6 +1245,7 @@ SupplierPaymentSetup=Suppliers payments setup
 PropalSetup=Commercial proposals module setup
 ProposalsNumberingModules=Commercial proposal numbering models
 ProposalsPDFModules=Commercial proposal documents models
+SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined for proposal
 FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal

From d7735ff272606e9f34e425283dc9643b7797b608 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 Mar 2019 14:15:35 +0100
Subject: [PATCH 5/5] FIX #10822

---
 htdocs/expedition/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 6d5d8b17ffa..6d9bba9b464 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2121,7 +2121,7 @@ else if ($id || $ref)
         		    if ($obj)
         		    {
         		        // $obj->rowid is rowid in $origin."det" table
-        		        $alreadysent[$obj->rowid][$obj->shipmentline_id]=array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$obj->date_valid, 'date_delivery'=>$obj->date_delivery);
+        		        $alreadysent[$obj->rowid][$obj->shipmentline_id]=array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($obj->date_delivery));
         		    }
         		    $i++;
     		    }