diff --git a/ChangeLog b/ChangeLog
index a1f2806daad..8b62a058875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ For users:
 - New: task #10577: Use a numbering module for shipment and contract
 - New: Add a first workflow module to create automatic action on some
        events (create order on proposal closing).
+- New: Can create manually order from proposal.
 - Fix: Better Postgresql compatibility.
 
 For developers:
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 4f590509b00..5b90362d37d 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1494,7 +1494,7 @@ if ($id > 0 || ! empty($ref))
             {
                 if ($user->rights->commande->creer)
                 {
-                    print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateOrder").'</a>';
+                    print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a>';
                 }
             }
 
@@ -1503,7 +1503,7 @@ if ($id > 0 || ! empty($ref))
 			{
 				if ($user->rights->facture->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("BuildBill").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
 				}
 
 				$arraypropal=$object->getInvoiceArrayList();
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 42755cc0125..f8e471e37d7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1368,14 +1368,14 @@ class CommonObject
 		{
 			$element = $subelement = $objecttype;
 			$tplpath = $element;
-			
+
 			if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
 			{
 				$element = $regs[1];
 				$subelement = $regs[2];
 				$tplpath = $element.'/'.$subelement;
 			}
-			
+
 			$classpath = $element.'/class';
 			if ($element == 'facture') { $tplpath = 'compta/'.$element; $classpath = $tplpath.'/class'; }  // To work with non standard path
 			if ($element == 'propal') { $tplpath = 'comm/'.$element; $classpath = $tplpath.'/class'; }    // To work with non standard path