Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts: htdocs/accountancy/bookkeeping/list.php htdocs/langs/en_US/cashdesk.lang
Dolibarr · Aug 18, 2019 · c989a63 · c989a63
2 parents f39e8ef + cef8828
commit c989a63
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
@@ -236,8 +236,13 @@
 		$error++;
 	}
 
-	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+	$db->begin();
+
+	if (! $error)
+	{
+		// Fill array 'array_options' with data from add form
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+	}
 
 	if (! $error)
 	{
@@ -252,10 +257,20 @@
 		}
 		else
 		{
+			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action='edit';     // Force chargement page edition
 		}
 	}
+
+	if (! $error)
+	{
+		$db->commit();
+	}
+	else
+	{
+		$db->rollback();
+	}
 }
 
 if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
@@ -412,7 +427,7 @@
 	$doleditor->Create();
 	print '</td></tr>';
 
- 	// Other attributes
+	// Other attributes
 	$parameters=array();
 	$reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
@@ -639,12 +654,12 @@
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
 
-            if ($object->fk_accountancy_journal > 0) {
-                $accountingjournal = new AccountingJournal($db);
-                $accountingjournal->fetch($object->fk_accountancy_journal);
+			if ($object->fk_accountancy_journal > 0) {
+				$accountingjournal = new AccountingJournal($db);
+				$accountingjournal->fetch($object->fk_accountancy_journal);
 
-                print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-            }
+				print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+			}
 			print '</td></tr>';
 		}
 

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
@@ -1330,7 +1330,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
             if (! empty($conf->comptabilite->enabled))
             {
             	// Files
-            	if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+            	if ((! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 1) || ! empty($conf->global->ACCOUNTANCY_SHOW_EXPORT_FILES_MENU))
             	{
             		$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
             	}

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
@@ -68,4 +68,5 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
-BasicPhoneLayout=Use basic layout for phones
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete