Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: traduction

Browse Source
This commit is contained in:
Regis Houssin
2008-01-07 10:49:07 +00:00
parent 23a927afb9
commit f718bee3d3
15 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/addpropal.php
View File

@@ -156,7 +156,7 @@ if ($conf->expedition->enabled)
{
if ($conf->global->PROPALE_ADD_SHIPPING_DATE)
{
print '<tr><td>'.$langs->trans("DateDelivery").'</td>';
print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
print '<td colspan="2">';
if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "")
{

4
htdocs/comm/propal.php
View File

@@ -905,9 +905,9 @@ if ($_GET['propalid'] > 0)
{
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('DateDelivery');
print $langs->trans('DeliveryDate');
print '</td>';
if ($_GET['action'] != 'editdate_livraison' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetDateLivraison'),1).'</a></td>';
if ($_GET['action'] != 'editdate_livraison' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="3">';
if ($_GET['action'] == 'editdate_livraison')

6
htdocs/commande/fiche.php
View File

@@ -799,7 +799,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
print '</td></tr>';
// Date de livraison
print "<tr><td>".$langs->trans("DateDelivery")."</td><td>";
print "<tr><td>".$langs->trans("DeliveryDate")."</td><td>";
if ($conf->global->DATE_LIVRAISON_WEEK_DELAY)
{
$tmpdte = time() + ((7*$conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
@@ -1154,10 +1154,10 @@ else
{
print '<tr><td height="10">';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('DateDelivery');
print $langs->trans('DeliveryDate');
print '</td>';
if ($_GET['action'] != 'editdate_livraison' && $commande->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$commande->id.'">'.img_edit($langs->trans('SetDateDelivery'),1).'</a></td>';
if ($_GET['action'] != 'editdate_livraison' && $commande->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$commande->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="2">';
if ($_GET['action'] == 'editdate_livraison')

4
htdocs/compta/commande/fiche.php
View File

@@ -175,10 +175,10 @@ if ($_GET["id"] > 0)
// Date de livraison
print '<tr><td height="10">';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('DateDelivery');
print $langs->trans('DeliveryDate');
print '</td>';
if (1 == 2 && $_GET['action'] != 'editdate_livraison' && $commande->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$commande->id.'">'.img_edit($langs->trans('SetDateDelivery'),1).'</a></td>';
if (1 == 2 && $_GET['action'] != 'editdate_livraison' && $commande->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$commande->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="2">';
if ($_GET['action'] == 'editdate_livraison')

4
htdocs/expedition/commande.php
View File

@@ -163,10 +163,10 @@ if ($_GET["id"] > 0)
// Date de livraison
print '<tr><td height="10">';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('DateDelivery');
print $langs->trans('DeliveryDate');
print '</td>';
if ($_GET['action'] != 'editdate_livraison' && $commande->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$commande->id.'">'.img_edit($langs->trans('SetDateDelivery'),1).'</a></td>';
if ($_GET['action'] != 'editdate_livraison' && $commande->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$commande->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="2">';
if ($_GET['action'] == 'editdate_livraison')

10
htdocs/fourn/commande/fiche.php
View File

@@ -1004,20 +1004,20 @@ else
print '<input type="hidden" name="action" value="livraison">';
print '<table class="border" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
print '<tr><td>Date de livraison</td><td>';
print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
print $form->select_date('','','','','',"commande");
print "</td></tr>\n";
print "<tr><td>Livraison</td><td>\n";
print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
$liv = array();
$liv['par'] = "Partielle";
$liv['tot'] = "Totale";
$liv['par'] = $langs->trans("PartialWoman");
$liv['tot'] = $langs->trans("TotalWoman");
print $form->select_array("type",$liv);
print '</td></tr>';
print '<tr><td>Commentaire</td><td><input size="30" type="text" name="commentaire"></td></tr>';
print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="30" type="text" name="commentaire"></td></tr>';
print '<tr><td align="center" colspan="2"><input type="submit" class="button" name="'.$langs->trans("Activate").'"></td></tr>';
print "</table>\n";
print "</form>\n";

2
htdocs/includes/modules/modCommande.class.php
View File

@@ -162,7 +162,7 @@ class modCommande extends DolibarrModules
$r++;
$this->export_code[$r]=$this->id.'_'.$r;
$this->export_label[$r]='Commandes clients et lignes de commande';
$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefClient",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"DateOrder",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"OrderShortStatusInvoicee",'c.fk_statut'=>'Status','c.note'=>"Note",'c.date_livraison'=>'DateDelivery','p.ref'=>'RefProduct','p.label'=>'Label','cd.rowid'=>'LineId','cd.description'=>"LineDescription",'cd.total_ht'=>"LineTotalHT",'cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty");
$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefClient",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"DateOrder",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"OrderShortStatusInvoicee",'c.fk_statut'=>'Status','c.note'=>"Note",'c.date_livraison'=>'DeliveryDate','p.ref'=>'RefProduct','p.label'=>'Label','cd.rowid'=>'LineId','cd.description'=>"LineDescription",'cd.total_ht'=>"LineTotalHT",'cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty");
$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>'order','c.note'=>"order",'c.date_livraison'=>"order",'p.ref'=>'product','p.label'=>'product','cd.rowid'=>'order_line','cd.description'=>"order_line",'cd.total_ht'=>"order_line",'cd.tva_tx'=>"order_line",'cd.qty'=>"order_line");
$this->export_alias_array[$r]=array('s.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.cp'=>'soc_zip','s.ville'=>'soc_ville','s.fk_pays'=>'soc_pays','s.tel'=>'soc_tel','s.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','c.rowid'=>"orderid",'c.ref'=>"ref",'c.ref_client'=>"refclient",'c.fk_soc'=>"fk_soc",'c.date_creation'=>"datecreation",'c.date_commande'=>"dateorder",'c.amount_ht'=>"amount",'c.remise_percent'=>"globaldiscount",'c.total_ht'=>"totalht",'c.total_ttc'=>"totalttc",'c.facture'=>"invoicee",'c.fk_statut'=>'status','c.note'=>"note",'c.date_livraison'=>'datedelivery','p.ref'=>'refproduct','p.label'=>'label','cd.rowid'=>'lineid','cd.description'=>"linedescription",'cd.total_ht'=>"linetotalht",'cd.tva_tx'=>"linevatrate",'cd.qty'=>"lineqty");
$this->export_sql[$r]="select distinct ";

3
htdocs/langs/en_US/deliveries.lang
View File

@@ -5,4 +5,5 @@ DeliveryCard=Delivery card
DeliveryOrder=Delivery order
DeliveryOrders=Delivery orders
DeliveryDate=Delivery date
CreateDeliveryOrder=Generate delivery order
CreateDeliveryOrder=Generate delivery order
SetDeliveryDate=Set shipping date

4
htdocs/langs/en_US/main.lang
View File

@@ -401,6 +401,10 @@ NotEnoughPermissions=You don't have permission for this action
SessionName=Session name
Method=Method
Receive=Receive
PartialWoman=Partial
PartialMan=Partial
TotalWoman=Total
TotalMan=Total
# Week day
Monday=Monday
Tuesday=Tuesday

2
htdocs/langs/en_US/propal.lang
View File

@@ -69,8 +69,6 @@ ErrorPropalNotFound=Propal %s not found
Estimate=Estimate :
EstimateShort=Estimate
OtherPropals=Other proposals
DateDelivery=Shipping date
SetDateLivraison=Set shipping date
CopyPropalFrom=Create commercial proposal by copying existing proposal
CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)

1
htdocs/langs/fr_BE/deliveries.lang
View File

@@ -6,3 +6,4 @@ DeliveryOrder=Commande livraison
DeliveryOrders=Commandes livraison
DeliveryDate=Date livraison
CreateDeliveryOrder=G<>n<EFBFBD>rer une commande de livraison
SetDateLivraison=Configurer la date de livraison

2
htdocs/langs/fr_BE/propal.lang
View File

@@ -69,8 +69,6 @@ ErrorPropalNotFound=Propale %s non trouv
Estimate=Estimation :
EstimateShort=Estimation
OtherPropals=Autres propositions
DateDelivery=Date de livraison
SetDateLivraison=Configurer la date de livraison
CopyPropalFrom=Cr<43>er une proposition commerciale en copiant une proposition existante
CreateEmptyPropal=Cr<43>er une proposition commerciale vierge ou <20> partir d'une liste de produits/services
DefaultProposalDurationValidity=Dur<75>e de validit<69> par d<>faut des propositions commerciales (en jours)

3
htdocs/langs/fr_FR/deliveries.lang
View File

@@ -6,4 +6,5 @@ DeliveryOrder=Bon de livraison
DeliveryOrders=Bons de livraison
DeliveryDate=Date de livraison
CreateDeliveryOrder=G<>n<EFBFBD>rer bon de livraison
QtyDelivered=Qt<51> livr<76>e
QtyDelivered=Qt<51> livr<76>e
SetDeliveryDate=D<>finir la date de livraison

4
htdocs/langs/fr_FR/main.lang
View File

@@ -402,6 +402,10 @@ NotEnoughPermissions=Vous n'avez pas les permissions pour cette action
SessionName=Nom session
Method=M<>thode
Receive=R<>ceptionner
PartialWoman=Partielle
PartialMan=Partiel
TotalWoman=Totale
TotalMan=Total
# Week day
Monday=Lundi
Tuesday=Mardi

2
htdocs/langs/fr_FR/propal.lang
View File

@@ -69,8 +69,6 @@ ErrorPropalNotFound=Propal %s inexistante
Estimate=Devis :
EstimateShort=Devis
OtherPropals=Autres propositions
DateDelivery=Date de livraison
SetDateLivraison=D<>finir la date de livraison
CopyPropalFrom=Cr<43>er proposition/devis par recopie d'un proposition existante
CreateEmptyPropal=Cr<43>er proposition/devis vierge ou depuis liste de produits pr<70>d<EFBFBD>finis
DefaultProposalDurationValidity=D<>lai de validit<69> par d<>faut (en jours)