lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Add form search customer order on commercial main page.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-02-25 18:32:12 +01:00
parent 1790f905c9
commit e8cadf3a3e
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,6 +4,7 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.6 compared to 3.5.* ***** ***** ChangeLog for 3.6 compared to 3.5.* *****
For users: For users:
- New: Add form search customer order on commercial main page.
- New: Can input barcode during product creation step. - New: Can input barcode during product creation step.
- New: Add autonumbering of barcode value for products. - New: Add autonumbering of barcode value for products.
- New: Can create contract from an order. - New: Can create contract from an order.
@ -32,7 +33,6 @@ TODO
- New: [ task #927 ] Add extrafield feature on Proposal lines. - New: [ task #927 ] Add extrafield feature on Proposal lines.
- New: [ task #928 ] Add extrafield feature on invoice lines. - New: [ task #928 ] Add extrafield feature on invoice lines.
For translators: For translators:
- Update language files. - Update language files.

21
htdocs/comm/index.php
View File

@ -69,7 +69,7 @@ print_fiche_titre($langs->trans("CustomerArea"));
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
// Recherche Propal // Search proposal
if (! empty($conf->propal->enabled) && $user->rights->propal->lire) if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
{ {
$var=false; $var=false;
@ -86,9 +86,22 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
print "<br>\n"; print "<br>\n";
} }
/* // Search customer order
* Recherche Contrat if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
*/ {
$var=false;
print '<table class="noborder nohover" width="100%">';
print '<form method="post" action="'.DOL_URL_ROOT.'/commande/liste.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchACustomerOrder").'</td></tr>';
print '<tr '.$bc[$var].'><td>';
print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
print '</tr>';
print "</form></table><br>\n";
}
// Search contract
if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
{ {
$var=false; $var=false;

6
htdocs/commande/index.php
View File

@ -60,12 +60,10 @@ print_fiche_titre($langs->trans("OrdersArea"));
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
/* // Search customer orders
* Search form
*/
$var=false; $var=false;
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<form method="post" action="liste.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/commande/liste.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchOrder").'</td></tr>'; print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchOrder").'</td></tr>';
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';

1
htdocs/langs/en_US/orders.lang
View File

@ -55,6 +55,7 @@ DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Orders delivered MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Orders to bill MenuOrdersToBill2=Orders to bill
SearchOrder=Search order SearchOrder=Search order
SearchACustomerOrder=Search a customer order
ShipProduct=Ship product ShipProduct=Ship product
Discount=Discount Discount=Discount
CreateOrder=Create Order CreateOrder=Create Order