diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index b5dffcc891e..497c904cf93 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -156,7 +156,7 @@ if ($conf->expedition->enabled) { if ($conf->global->PROPALE_ADD_SHIPPING_DATE) { - print ''.$langs->trans("DateDelivery").''; + print ''.$langs->trans("DeliveryDate").''; print ''; if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") { diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 77bc62da942..02ce94ed681 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -905,9 +905,9 @@ if ($_GET['propalid'] > 0) { print ''; print ''; - if ($_GET['action'] != 'editdate_livraison' && $propal->brouillon) print ''; + if ($_GET['action'] != 'editdate_livraison' && $propal->brouillon) print ''; print '
'; - print $langs->trans('DateDelivery'); + print $langs->trans('DeliveryDate'); print 'id.'">'.img_edit($langs->trans('SetDateLivraison'),1).'id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'
'; print ''; if ($_GET['action'] == 'editdate_livraison') diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 72b5257637b..fc8adf8e96e 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -799,7 +799,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer) print ''; // Date de livraison - print "".$langs->trans("DateDelivery").""; + print "".$langs->trans("DeliveryDate").""; 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 ''; print ''; - if ($_GET['action'] != 'editdate_livraison' && $commande->brouillon) print ''; + if ($_GET['action'] != 'editdate_livraison' && $commande->brouillon) print ''; print '
'; - print $langs->trans('DateDelivery'); + print $langs->trans('DeliveryDate'); print 'id.'">'.img_edit($langs->trans('SetDateDelivery'),1).'id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'
'; print ''; if ($_GET['action'] == 'editdate_livraison') diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index 67d82d5dc52..a2fc5e2bef2 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -175,10 +175,10 @@ if ($_GET["id"] > 0) // Date de livraison print ''; print ''; - if (1 == 2 && $_GET['action'] != 'editdate_livraison' && $commande->brouillon) print ''; + if (1 == 2 && $_GET['action'] != 'editdate_livraison' && $commande->brouillon) print ''; print '
'; - print $langs->trans('DateDelivery'); + print $langs->trans('DeliveryDate'); print 'id.'">'.img_edit($langs->trans('SetDateDelivery'),1).'id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'
'; print ''; if ($_GET['action'] == 'editdate_livraison') diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index b7bc8083219..52b40f4e906 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -163,10 +163,10 @@ if ($_GET["id"] > 0) // Date de livraison print ''; print ''; - if ($_GET['action'] != 'editdate_livraison' && $commande->brouillon) print ''; + if ($_GET['action'] != 'editdate_livraison' && $commande->brouillon) print ''; print '
'; - print $langs->trans('DateDelivery'); + print $langs->trans('DeliveryDate'); print 'id.'">'.img_edit($langs->trans('SetDateDelivery'),1).'id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'
'; print ''; if ($_GET['action'] == 'editdate_livraison') diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 2169941491a..6f0d97c1bf3 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -1004,20 +1004,20 @@ else print ''; print ''; print ''; - print '\n"; - print "'; - print ''; + print ''; print ''; print "
'.$langs->trans("Receive").'
Date de livraison'; + print '
'.$langs->trans("DeliveryDate").''; print $form->select_date('','','','','',"commande"); print "
Livraison\n"; + print "
".$langs->trans("Delivery")."\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 '
Commentaire
'.$langs->trans("Comment").'
\n"; print "\n"; diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php index 8679dcb09e1..4fcae3cbf30 100644 --- a/htdocs/includes/modules/modCommande.class.php +++ b/htdocs/includes/modules/modCommande.class.php @@ -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 "; diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang index e4e179d6717..8f2d5d05da3 100644 --- a/htdocs/langs/en_US/deliveries.lang +++ b/htdocs/langs/en_US/deliveries.lang @@ -5,4 +5,5 @@ DeliveryCard=Delivery card DeliveryOrder=Delivery order DeliveryOrders=Delivery orders DeliveryDate=Delivery date -CreateDeliveryOrder=Generate delivery order \ No newline at end of file +CreateDeliveryOrder=Generate delivery order +SetDeliveryDate=Set shipping date \ No newline at end of file diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index b353dcecf0d..cc5225c9017 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -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 diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index f4518fa73e0..6239222c4da 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -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) diff --git a/htdocs/langs/fr_BE/deliveries.lang b/htdocs/langs/fr_BE/deliveries.lang index 1f0539376cd..b3b1a3f49a3 100644 --- a/htdocs/langs/fr_BE/deliveries.lang +++ b/htdocs/langs/fr_BE/deliveries.lang @@ -6,3 +6,4 @@ DeliveryOrder=Commande livraison DeliveryOrders=Commandes livraison DeliveryDate=Date livraison CreateDeliveryOrder=Générer une commande de livraison +SetDateLivraison=Configurer la date de livraison \ No newline at end of file diff --git a/htdocs/langs/fr_BE/propal.lang b/htdocs/langs/fr_BE/propal.lang index 122f90db0f5..a754f246ffb 100644 --- a/htdocs/langs/fr_BE/propal.lang +++ b/htdocs/langs/fr_BE/propal.lang @@ -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éer une proposition commerciale en copiant une proposition existante CreateEmptyPropal=Créer une proposition commerciale vierge ou à partir d'une liste de produits/services DefaultProposalDurationValidity=Durée de validité par défaut des propositions commerciales (en jours) diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang index 2778eb78efe..8ef350592e9 100644 --- a/htdocs/langs/fr_FR/deliveries.lang +++ b/htdocs/langs/fr_FR/deliveries.lang @@ -6,4 +6,5 @@ DeliveryOrder=Bon de livraison DeliveryOrders=Bons de livraison DeliveryDate=Date de livraison CreateDeliveryOrder=Générer bon de livraison -QtyDelivered=Qté livrée \ No newline at end of file +QtyDelivered=Qté livrée +SetDeliveryDate=Définir la date de livraison \ No newline at end of file diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index de65ad4da36..5fdd6a91699 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -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 diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index 3d6521c6885..563aa706b8c 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -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éer proposition/devis par recopie d'un proposition existante CreateEmptyPropal=Créer proposition/devis vierge ou depuis liste de produits prédéfinis DefaultProposalDurationValidity=Délai de validité par défaut (en jours)