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

Fix translation of status

Browse Source
This commit is contained in:
Laurent Destailleur 2015-05-04 09:50:49 +02:00
parent 877511717b
commit 89c9996b22
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/commande.php
View File

@ -264,7 +264,6 @@ $form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup'); print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'title_setup');
print '<br>';
$head = order_admin_prepare_head(); $head = order_admin_prepare_head();

6
htdocs/comm/index.php
View File

@ -585,9 +585,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
*/ */
if (! empty($conf->commande->enabled) && $user->rights->commande->lire) if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
{ {
$langs->load("order"); $langs->load("orders");
$sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv "; $sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."commande as c"; $sql.= ", ".MAIN_DB_PREFIX."commande as c";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@ -654,7 +654,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
print '<td align="right">'; print '<td align="right">';
print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n"; print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
print '<td align="right">'.price($obj->total_ttc).'</td>'; print '<td align="right">'.price($obj->total_ttc).'</td>';
print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut,3).'</td>'."\n"; print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut,$obj->billed,3).'</td>'."\n";
print '</tr>'."\n"; print '</tr>'."\n";
$i++; $i++;
$total += $obj->total_ttc; $total += $obj->total_ttc;

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

@ -75,6 +75,7 @@ AddToMyOrders=Add to my orders
AddToOtherOrders=Add to other orders AddToOtherOrders=Add to other orders
AddToDraftOrders=Add to draft order AddToDraftOrders=Add to draft order
ShowOrder=Show order ShowOrder=Show order
OrdersOpened=Orders to process
NoOpenedOrders=No open orders NoOpenedOrders=No open orders
NoOtherOpenedOrders=No other open orders NoOtherOpenedOrders=No other open orders
NoDraftOrders=No draft orders NoDraftOrders=No draft orders