diff --git a/ChangeLog b/ChangeLog index f0f038b7235..40cf93e9e3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.6 compared to 3.5.* ***** For users: +- New: Add form search customer order on commercial main page. - New: Can input barcode during product creation step. - New: Add autonumbering of barcode value for products. - New: Can create contract from an order. @@ -32,7 +33,6 @@ TODO - New: [ task #927 ] Add extrafield feature on Proposal lines. - New: [ task #928 ] Add extrafield feature on invoice lines. - For translators: - Update language files. diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index d0a5f12727a..a3cde90d102 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -69,7 +69,7 @@ print_fiche_titre($langs->trans("CustomerArea")); print '
'; -// Recherche Propal +// Search proposal if (! empty($conf->propal->enabled) && $user->rights->propal->lire) { $var=false; @@ -86,9 +86,22 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) print "
\n"; } -/* - * Recherche Contrat - */ +// Search customer order +if (! empty($conf->commande->enabled) && $user->rights->commande->lire) +{ + $var=false; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "
'.$langs->trans("SearchACustomerOrder").'
'; + print $langs->trans("Ref").':
'.$langs->trans("Other").':

\n"; +} + +// Search contract if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) { $var=false; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 2327c2063be..c8dc5e61d6d 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -60,12 +60,10 @@ print_fiche_titre($langs->trans("OrdersArea")); print '
'; -/* - * Search form - */ +// Search customer orders $var=false; print ''; -print ''; +print ''; print ''; print ''; print '
'.$langs->trans("SearchOrder").'
'; diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 096261bd918..ad29ce6eb86 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -55,6 +55,7 @@ DraftOrWaitingShipped=Draft or validated not yet shipped MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Orders to bill SearchOrder=Search order +SearchACustomerOrder=Search a customer order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order