Merge pull request #1301 from aspangaro/3.4

Fix 3.4
Dolibarr · Nov 15, 2013 · 4099038 · 4099038
2 parents 0dfbfbc + 200553c
commit 4099038
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 18 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,8 +2,10 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 ***** ChangeLog for 3.4.2 compared to 3.4.1 *****
+Fix: field's problem into company's page (RIB)
+Fix: Document cerfa doesn't contained firstname & lastname from donator
 Fix: Bad rounding on margin calculations and display.
-Fix: Option drpo table into backup was broken.
+Fix: Option drop table into backup was broken.
 Fix: [ bug #1105 ] Searching Boxes other search option
 
 

diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
@@ -79,7 +79,7 @@
   print '<table class="liste" width="100%">';
 
   print '<tr class="liste_titre">';
-  print_liste_field_titre($langs->trans("WithdrawalReceipt"),"bons.php","p.ref",'','','class="liste_titre"');
+  print_liste_field_titre($langs->trans("WithdrawalReceipts"),"bons.php","p.ref",'','','class="liste_titre"');
   print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'class="liste_titre" align="center"');
   print '<td class="liste_titre" align="right">'.$langs->trans("Amount").'</td>';
   print '</tr>';

diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
@@ -47,7 +47,7 @@
 $sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
 $sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.ref" : GETPOST('sortfield','alpha');
 
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 if ($prev_id)
 {
@@ -56,7 +56,7 @@
   	if ($bon->fetch($prev_id) == 0)
     {
     	$head = prelevement_prepare_head($bon);
-      	dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipt"), '', 'payment');
+      	dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
       	print '<table class="border" width="100%">';
 

diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
@@ -46,7 +46,7 @@
 /*
  * View
  */
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 if ($prev_id)
 {
@@ -55,7 +55,7 @@
   	if ($bon->fetch($prev_id) == 0)
     {
     	$head = prelevement_prepare_head($bon);
-      	dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipt"), '', 'payment');
+      	dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
       	print '<table class="border" width="100%">';
 

diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
@@ -44,7 +44,7 @@
  * View
  */
 
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 if ($prev_id)
 {
@@ -53,7 +53,7 @@
 	if ($bon->fetch($prev_id) == 0)
 	{
 		$head = prelevement_prepare_head($bon);
-		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalReceipt"), '', 'payment');
+		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
 		print '<table class="border" width="100%">';
 

diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
@@ -133,15 +133,15 @@
 $bon = new BonPrelevement($db,"");
 $form = new Form($db);
 
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 
 if ($id > 0)
 {
 	$bon->fetch($id);
 
 	$head = prelevement_prepare_head($bon);
-	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipt"), '', 'payment');
+	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
 	if (GETPOST('error','alpha')!='')
 	{

diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
@@ -130,7 +130,7 @@
 
 		print '<table class="border" width="100%">';
 
-		print '<tr><td width="20%">'.$langs->trans("WithdrawalReceipt").'</td><td>';
+		print '<tr><td width="20%">'.$langs->trans("WithdrawalReceipts").'</td><td>';
 		print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';

diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
@@ -54,7 +54,7 @@
  * View
  */
 
-llxHeader('',$langs->trans("WithdrawalReceipt"));
+llxHeader('',$langs->trans("WithdrawalReceipts"));
 
 if ($prev_id)
 {
@@ -63,7 +63,7 @@
 	if ($bon->fetch($prev_id) == 0)
 	{
 		$head = prelevement_prepare_head($bon);
-		dol_fiche_head($head, 'lines', $langs->trans("WithdrawalReceipt"), '', 'payment');
+		dol_fiche_head($head, 'lines', $langs->trans("WithdrawalReceipts"), '', 'payment');
 
 		print '<table class="border" width="100%">';
 

diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
@@ -111,7 +111,7 @@
 
     print '<tr class="liste_titre">';
     print '<td class="liste_titre">'.$langs->trans("Line").'</td>';
-    print_liste_field_titre($langs->trans("WithdrawalReceipt"),$_SERVER["PHP_SELF"],"p.ref");
+    print_liste_field_titre($langs->trans("WithdrawalReceipts"),$_SERVER["PHP_SELF"],"p.ref");
     print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"f.facnumber",'',$urladd);
     print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom");
     print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client",'','','align="center"');

diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
@@ -66,7 +66,7 @@
 	$account->iban_prefix     = $_POST["iban_prefix"];
 	$account->domiciliation   = $_POST["domiciliation"];
 	$account->proprio 	      = $_POST["proprio"];
-	$account->adresse_proprio = $_POST["adresse_proprio"];
+	$account->owner_address   = $_POST["owner_address"];
 
 	$result = $account->update($user);
 	if (! $result)
@@ -154,7 +154,7 @@
 	print "</td></tr>\n";
 
 	print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
-	print $account->adresse_proprio;
+	print $account->owner_address;
 	print "</td></tr>\n";
 
 	print '</table>';
@@ -236,8 +236,8 @@
 	print "</td></tr>\n";
 
 	print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
-	print "<textarea name=\"adresse_proprio\" rows=\"4\" cols=\"40\">";
-	print $account->adresse_proprio;
+	print "<textarea name=\"owner_address\" rows=\"4\" cols=\"40\">";
+	print $account->owner_address;
 	print "</textarea></td></tr>";
 
 	print '</table><br>';