Merge pull request #762 from grandoc/develop

fix sql error

htdocs/admin/prelevement.php

@@ -117,6 +117,17 @@ llxHeader('',$langs->trans("WithdrawalsSetup"));
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 
 print_fiche_titre($langs->trans("WithdrawalsSetup"),$linkback,'setup');
+print '<br>';
+
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT."/admin/prelevement.php";
+$head[$h][1] = $langs->trans("Withdrawals");
+$head[$h][2] = 'Withdrawal';
+$hselected=$h;
+$h++;
+
+dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
 
 print '<form method="post" action="prelevement.php?action=set">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

htdocs/install/mysql/migration/3.3.0-3.4.0.sql

@@ -154,7 +154,7 @@ ALTER TABLE llx_holiday ADD COLUMN note_public text;
 
 -- Add new trigger on Invoice BILL_UNVALIDATE + Index 
 INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (28,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10);
-ALTER TABLE llx_c_action_trigger ADD INDEX idx_action_trigger_rang (rang) 
+ALTER TABLE llx_c_action_trigger ADD INDEX idx_action_trigger_rang (rang); 
 
 
 ALTER TABLE llx_facture_fourn_det ADD COLUMN fk_code_ventilation integer DEFAULT 0 NOT NULL;