diff --git a/htdocs/admin/avoir.php b/htdocs/admin/avoir.php index 29c41a81827..501b036ef4c 100644 --- a/htdocs/admin/avoir.php +++ b/htdocs/admin/avoir.php @@ -317,7 +317,7 @@ print "\n"; print " ".$langs->trans("Name")."\n"; print " ".$langs->trans("Value")."\n"; print "\n"; -print "\n ".$langs->trans("Directory")."\n ".$conf->avoir->dir_output."\n\n"; +print "\n ".$langs->trans("Directory")."\n ".$conf->societe->dir_avoir."\n\n"; print "\n"; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 16cd2397411..372a0570ac6 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -524,7 +524,7 @@ if ($_GET["id"]) print '
'; - if ($_GET["action"] != 'edit') + if ($_GET["action"] != 'edit' && $_GET["action"] != 'delete') { print ''.$langs->trans("Edit").''; diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php index 770243397bf..2cd7ab62416 100644 --- a/htdocs/comm/clients.php +++ b/htdocs/comm/clients.php @@ -52,11 +52,13 @@ $search_ville=isset($_GET["search_ville"])?$_GET["search_ville"]:$_POST["search_ $search_code=isset($_GET["search_code"])?$_GET["search_contract"]:$_POST["search_code"]; - $sql = "SELECT s.idp, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm, s.code_client"; - if (!$user->rights->commercial->client->voir) $sql .= ", sc.fk_soc, sc.fk_user"; - $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st"; - if (!$user->rights->commercial->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql .= " WHERE s.fk_stcomm = st.id AND s.client=1"; + + +$sql = "SELECT s.idp, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm, s.code_client"; +if (!$user->rights->commercial->client->voir) $sql .= ", sc.fk_soc, sc.fk_user"; +$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st"; +if (!$user->rights->commercial->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; +$sql .= " WHERE s.fk_stcomm = st.id AND s.client=1"; if ($socidp) $sql .= " AND s.idp = $socidp"; if ($user->societe_id) $sql .= " AND s.idp = " .$user->societe_id; @@ -79,76 +81,82 @@ if (! $sortfield) $sortfield="s.nom"; $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit +1, $offset); + +/* + * Affichage liste + */ + +llxHeader(); + + $result = $db->query($sql); if ($result) { - $num = $db->num_rows($result); + $num = $db->num_rows($result); - llxHeader(); + print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num); - print_barre_liste($langs->trans("ListOfCustomers"), $page, "clients.php","",$sortfield,$sortorder,"",$num); + $i = 0; - $i = 0; - - $addu = "&search_nom=".$search_nom."&search_code=".$search_code."&search_ville=".$search_ville; - print ''; - print ''; - print_liste_field_titre($langs->trans("Company"),"clients.php","s.nom",$addu,"","",$sortfield); - print_liste_field_titre($langs->trans("Town"),"clients.php","s.ville",$addu,"","",$sortfield); - print_liste_field_titre($langs->trans("CustomerCode"),"clients.php","s.code_client",$addu,"","",$sortfield); - print_liste_field_titre($langs->trans("DateCreation"),"clients.php","datec",$addu,"",'align="center"',$sortfield); - print ''; - print "\n"; + $addu = "&search_nom=".$search_nom."&search_code=".$search_code."&search_ville=".$search_ville; + print '
 
'; + print ''; + print_liste_field_titre($langs->trans("Company"),"clients.php","s.nom",$addu,"","",$sortfield); + print_liste_field_titre($langs->trans("Town"),"clients.php","s.ville",$addu,"","",$sortfield); + print_liste_field_titre($langs->trans("CustomerCode"),"clients.php","s.code_client",$addu,"","",$sortfield); + print_liste_field_titre($langs->trans("DateCreation"),"clients.php","datec",$addu,"",'align="center"',$sortfield); + print ''; + print "\n"; - print ''; - print ''; - print ''; - print '"; - print "\n"; - print ''; - - $var=True; + print ''; + print ''; + print ''; + print '"; + print "\n"; + print ''; - while ($i < min($num,$conf->liste_limit)) - { - $obj = $db->fetch_object($result); - - $var=!$var; + $var=True; - print ""; - print ''; - print ''; - print ''; - print ''; - print '"; + print ''; + print ''; + print ''; + print ''; + print '\n"; + $i++; } - else - { - print " "; - } - print "\n"; - $i++; - } - print "
 
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print ' '; - print "
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ' '; + print "
'; - print img_object($langs->trans("ShowCustomer"),"company"); - print ' '.stripslashes($obj->nom).''.$obj->ville.''.$obj->code_client.''.dolibarr_print_date($obj->datec).''; - if (defined("MAIN_MODULE_DOSSIER") && MAIN_MODULE_DOSSIER == 1) + while ($i < min($num,$conf->liste_limit)) { - print ''; - print img_folder(); - print ''; + $obj = $db->fetch_object($result); + + $var=!$var; + + print "
'; + print img_object($langs->trans("ShowCustomer"),"company"); + print ' '.stripslashes($obj->nom).''.$obj->ville.''.$obj->code_client.''.dolibarr_print_date($obj->datec).''; + if (defined("MAIN_MODULE_DOSSIER") && MAIN_MODULE_DOSSIER == 1) + { + print ''; + print img_folder(); + print ''; + } + else + { + print " "; + } + print "
"; - $db->free($result); + print ""; + $db->free($result); } else { - dolibarr_print_error($db); + dolibarr_print_error($db); } $db->close(); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index ee68893d85b..450a31c7ad5 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -461,10 +461,10 @@ if ($socidp > 0) $objp = $db->fetch_object($resql); $var=!$var; print ""; - print ''.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref."\n"; + print ''.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref."\n"; print ''.dolibarr_print_date($objp->dc)."\n"; print ''.price($objp->total_ht).''; - print ''.$commande_static->status_label_short[$objp->fk_statut].''; + print ''.$commande_static->LibStatut($objp->fk_statut,5).''; $i++; } $db->free($resql); diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 756acfadfa8..b3b351eaa1d 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -175,7 +175,9 @@ if ($conf->propal->enabled && $user->rights->propale->lire) */ print ''; -$sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.code, c.libelle, a.fk_user_author, s.nom as sname, s.idp"; +$sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, a.fk_user_author, a.percent,"; +$sql.= " c.code, c.libelle,"; +$sql.= " s.nom as sname, s.idp"; if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user "; $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -184,37 +186,39 @@ if (!$user->rights->commercial->client->voir && !$socidp) $sql .= " AND s.idp = $sql .= " ORDER BY a.datea DESC"; $resql=$db->query($sql); -if ($resql) +if ($resql) { - $num = $db->num_rows($resql); - if ($num > 0) - { - $var=true; - - print ''; - print ''; - print ''; - print "\n"; - - $i = 0; - while ($i < $num ) + $num = $db->num_rows($resql); + if ($num > 0) { - $obj = $db->fetch_object($resql); - $var=!$var; - - print ""; + $var=true; - $transcode=$langs->trans("Action".$obj->code); - $libelle=($transcode!="Action".$obj->code?$transcode:$obj->libelle); - print ''; + print '
'.$langs->trans("ActionsToDo").'
".dolibarr_print_date($obj->da)."".img_object($langs->trans("ShowAction"),"task").' '.$libelle.'
'; + print ''; + print ''; + print "\n"; - print ''; - $i++; + $i = 0; + while ($i < $num ) + { + $obj = $db->fetch_object($resql); + $var=!$var; + + print ""; + + // Action + $transcode=$langs->trans("Action".$obj->code); + $libelle=($transcode!="Action".$obj->code?$transcode:$obj->libelle); + print ''; + + // Tiers + print ''; + $i++; + } + print "
'.$langs->trans("ActionsToDo").'
'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->sname.'
".dolibarr_print_date($obj->da)."".img_object($langs->trans("ShowAction"),"task").' '.$libelle.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->sname.'

"; } - print "
"; - } - $db->free($resql); -} + $db->free($resql); +} else { dolibarr_print_error($db); diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index e69bae163f6..bca3124bbed 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -135,7 +135,7 @@ if ($resql) $urladd="page=$page"; if (isset($stcomm)) $urladd.="&stcomm=".$stcomm; - print_barre_liste($langs->trans("ListOfProspects"), $page, "prospects.php",'&stcomm='.$_GET["stcomm"],"","",'',$num); + print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"],'&stcomm='.$_GET["stcomm"],$sortfield,$sortorder,'',$num); $i = 0; diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index 6f4ca6a2b4f..27f94ec03b9 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -43,6 +43,8 @@ class Commande var $id ; var $socidp; var $contactid; + var $statut; + var $facturee; var $brouillon; var $cond_reglement_id; var $cond_reglement_code; @@ -68,18 +70,6 @@ class Commande $langs->load('orders'); $this->db = $DB; - $this->statuts[-1] = $langs->trans('StatusOrderCanceled'); - $this->statuts[0] = $langs->trans('StatusOrderDraft'); - $this->statuts[1] = $langs->trans('StatusOrderValidated'); - $this->statuts[2] = $langs->trans('StatusOrderOnProcess'); - $this->statuts[3] = $langs->trans('StatusOrderProcessed'); - - $this->status_label_short[-1] = $langs->trans('StatusOrderCanceled'); - $this->status_label_short[0] = $langs->trans('StatusOrderDraft'); - $this->status_label_short[1] = $langs->trans('StatusOrderValidated'); - $this->status_label_short[2] = $langs->trans('StatusOrderOnProcessShort'); - $this->status_label_short[3] = $langs->trans('StatusOrderProcessed'); - $this->sources[0] = $langs->trans('OrderSource0'); $this->sources[1] = $langs->trans('OrderSource1'); $this->sources[2] = $langs->trans('OrderSource2'); @@ -1711,34 +1701,45 @@ class Commande */ function getLibStatut($mode) { - return $this->LibStatut($this->statut,$mode); + return $this->LibStatut($this->statut,$this->facture,$mode); } /** * \brief Renvoi le libellé d'un statut donné - * \param statut Id statut + * \param statut Id statut * \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long, 5=Libellé court + Picto * \return string Libellé */ - function LibStatut($statut,$mode) + function LibStatut($statut,$facture,$mode) { global $langs; if ($mode == 0) { - return $this->statuts[$statut]; + if ($statut==-1) return $langs->trans('StatusOrderCanceled'); + if ($statut==0) return $langs->trans('StatusOrderDraft'); + if ($statut==1) return $langs->trans('StatusOrderValidated'); + if ($statut==2) return $langs->trans('StatusOrderOnProcess'); + if ($statut==3 && ! $facturee) return $langs->trans('StatusOrderToBill'); + if ($statut==3 && $facturee) return $langs->trans('StatusOrderProcessed'); } if ($mode == 1) { - return $this->status_label_short[$statut]; + if ($statut==-1) return $langs->trans('StatusOrderCanceledShort'); + if ($statut==0) return $langs->trans('StatusOrderDraftShort'); + if ($statut==1) return $langs->trans('StatusOrderValidatedShort'); + if ($statut==2) return $langs->trans('StatusOrderOnProcessShort'); + if ($statut==3 && ! $facturee) return $langs->trans('StatusOrderToBillShort'); + if ($statut==3 && $facturee) return $langs->trans('StatusOrderProcessed'); } if ($mode == 2) { - if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$this->status_label_short[$statut]; - if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$this->status_label_short[$statut]; - if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$this->status_label_short[$statut]; - if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$this->status_label_short[$statut]; - if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$this->status_label_short[$statut]; + if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceledShort'),'statut5').' '.$langs->trans('StatusOrderCanceled'); + if ($statut==0) return img_picto($langs->trans('StatusOrderDraftShort'),'statut0').' '.$langs->trans('StatusOrderDraft'); + if ($statut==1) return img_picto($langs->trans('StatusOrderValidatedShort'),'statut1').' '.$langs->trans('StatusOrderValidated'); + if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcessShort'),'statut3').' '.$langs->trans('StatusOrderOnProcess'); + if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBillShort'),'statut4').' '.$langs->trans('StatusOrderToBill'); + if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessedShort'),'statut6').' '.$langs->trans('StatusOrderProcessed'); } if ($mode == 3) { @@ -1746,23 +1747,26 @@ class Commande if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1'); if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3'); - if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut6'); + if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBill'),'statut4'); + if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessed'),'statut6'); } if ($mode == 4) { - if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$this->statuts[$statut]; - if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$this->statuts[$statut]; - if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$this->statuts[$statut]; - if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$this->statuts[$statut]; - if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$this->statuts[$statut]; + if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled'); + if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft'); + if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated'); + if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$langs->trans('StatusOrderOnProcess'); + if ($statut==3 && ! $facturee) return img_picto($langs->trans('StatusOrderToBill'),'statut4').' '.$langs->trans('StatusOrderToBill'); + if ($statut==3 && $facturee) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed'); } if ($mode == 5) { - if ($statut==-1) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5'); - if ($statut==0) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderDraft'),'statut0'); - if ($statut==1) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderValidated'),'statut1'); - if ($statut==2) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderOnProcess'),'statut3'); - if ($statut==3) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6'); + if ($statut==-1) return $langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceledShort'),'statut5'); + if ($statut==0) return $langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraftShort'),'statut0'); + if ($statut==1) return $langs->trans('StatusOrderValidatedShort').' '.img_picto($langs->trans('StatusOrderValidatedShort'),'statut1'); + if ($statut==2) return $langs->trans('StatusOrderOnProcessShort').' '.img_picto($langs->trans('StatusOrderOnProcessShort'),'statut3'); + if ($statut==3 && ! $facturee) return $langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBillShort'),'statut4'); + if ($statut==3 && $facturee) return $langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessedShort'),'statut6'); } } diff --git a/htdocs/compta/commande/liste.php b/htdocs/compta/commande/liste.php index 19272629516..d8325a0a0a7 100644 --- a/htdocs/compta/commande/liste.php +++ b/htdocs/compta/commande/liste.php @@ -53,7 +53,9 @@ if ($user->societe_id > 0) llxHeader(); -$sql = "SELECT s.nom, s.idp, c.rowid, c.ref, c.total_ht,".$db->pdate("c.date_commande")." as date_commande, c.fk_statut"; +$sql = "SELECT s.nom, s.idp,"; +$sql.= " c.rowid, c.ref, c.total_ht,".$db->pdate("c.date_commande")." as date_commande,"; +$sql.= " c.fk_statut, c.facture"; if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c"; if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -143,7 +145,7 @@ if ($resql) print " "; print strftime("%Y",$objp->date_commande)."\n"; - print ''.$generic_commande->LibStatut($objp->fk_statut,5).''; + print ''.$generic_commande->LibStatut($objp->fk_statut,$objp->facture,5).''; print "\n"; $total = $total + $objp->price; diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index d0d70a650b8..da8bb46cd1c 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -332,7 +332,7 @@ class MenuLeft { if ($conf->commande->enabled ) { $langs->load("orders"); - $newmenu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&status=3", $langs->trans("MenuOrdersToBill"), 0, $user->rights->commande->lire); + if ($conf->facture->enabled) $newmenu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&status=3", $langs->trans("MenuOrdersToBill"), 0, $user->rights->commande->lire); // if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/", $langs->trans("StatusOrderToBill"), 1 ,$user->rights->commande->lire); } diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index f45adefb221..f5a88094a66 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -350,8 +350,8 @@ class MenuLeft { if ($conf->commande->enabled ) { $langs->load("orders"); - $newmenu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&status=3", $langs->trans("MenuOrdersToBill"), 0, $user->rights->commande->lire); - if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/", $langs->trans("StatusOrderToBill"), 1 ,$user->rights->commande->lire); + if ($conf->facture->enabled) $newmenu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&status=3", $langs->trans("MenuOrdersToBill"), 0, $user->rights->commande->lire); +// if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/", $langs->trans("StatusOrderToBill"), 1 ,$user->rights->commande->lire); } */ diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index 8eecf9d360e..a1fc8542992 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,7 +49,11 @@ class MenuTop { */ function MenuTop($db) { + global $langs; $this->db=$db; + + $langs->setTransFromTab("Company",$langs->trans("ThirdParty")); + $langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty")); } diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 67a8725498a..9abfa322855 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -121,7 +121,6 @@ ChangeIntoRepeatableInvoice=Change into repeatable CreateRepeatableInvoice=Create repeatable invoice ExportDataset_invoice_1=Customer invoices list and invoices' lines ProformaBill=Proforma Bill: -VATIsUsed=Using VAT CreditNote=Credit note CreditNotes=Credit notes NewGlobalDiscount=New discount diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 7ec47c84459..cbc7bb5cb63 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -10,6 +10,7 @@ MenuNewProspect=New prospect MenuNewSupplier=New supplier MenuSocGroup=Groups NewCompany=New company (prospect, customer, supplier) +NewThirdParty=New third party (prospect, customer, supplier) NewSocGroup=Nouveau companies group ProspectionArea=Prospection area SocGroup=Group of companies @@ -17,6 +18,7 @@ IdCompany=Company Id Company=Company CompanyName=Company name Companies=Companies +ThirdParty=Third party ParentCompany=Parent company CivilityCode=Civility code RegisteredOffice=Registered office @@ -36,6 +38,7 @@ Zip=Zip Code Town=Town Web=Web Birthday=Birthday +VATIsUsed=Using VAT ##### Professionnal ID ##### ProfId1=Professional ID 1 ProfId2=Professional ID 2 diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 29b75dedf2d..28dca1dbfc6 100755 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -14,11 +14,16 @@ OrdersToValid=Orders to valid OrdersToBill=Orders to bill OrdersInProcess=Orders in process OrdersToProcess=Orders to process +StatusOrderCanceledShort=Canceld +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderOnProcessShort=On process +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=To bill StatusOrderCanceled=Canceld StatusOrderDraft=Draft StatusOrderValidated=Validated StatusOrderOnProcess=On process -StatusOrderOnProcessShort=On process StatusOrderProcessed=Processed StatusOrderToBill=To bill MenuOrdersToBill=Orders to bill diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 3cbee19b11e..b072c70a900 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -121,7 +121,6 @@ ChangeIntoRepeatableInvoice=Modifier en r CreateRepeatableInvoice=Créer facture récurrente ExportDataset_invoice_1=Factures clients et lignes de facture ProformaBill=Facture Proforma : -VATIsUsed=Assujéti à TVA CreditNote=Avoir CreditNotes=Avoirs NewGlobalDiscount=Nouvel avoir diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index d4887b97f0c..8485bef0e24 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -10,6 +10,7 @@ MenuNewProspect=Nouveau prospect MenuNewSupplier=Nouveau fournisseur MenuSocGroup=Groupes NewCompany=Nouvelle société (prospect, client, fournisseur) +NewThirdParty=Nouveau tiers (prospect, client, fournisseur) NewSocGroup=Nouveau groupement de sociétés ProspectionArea=Espace prospection SocGroup=Groupement de sociétés @@ -17,6 +18,7 @@ IdCompany=Id soci Company=Société CompanyName=Raison sociale Companies=Sociétés +ThirdParty=Tiers ParentCompany=Maison mère CivilityCode=Code civilité RegisteredOffice=Siège sociale @@ -36,6 +38,7 @@ Zip=Code postal Town=Ville Web=Web Birthday=Date de naissance +VATIsUsed=Assujéti à TVA ##### Professionnal ID ##### ProfId1=ID professionnel 1 ProfId2=ID professionnel 2 diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index 3118054b61a..1bf254a517c 100755 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -14,11 +14,16 @@ OrdersToValid=Commandes OrdersToBill=Commandes à facturer OrdersInProcess=Commandes en traitement OrdersToProcess=Commandes à traiter +StatusOrderCanceledShort=Annulée +StatusOrderDraftShort=Brouillon +StatusOrderValidatedShort=Validée +StatusOrderOnProcessShort=En cours +StatusOrderProcessedShort=Traitée +StatusOrderToBillShort=À facturer StatusOrderCanceled=Annulée StatusOrderDraft=Brouillon StatusOrderValidated=Validée StatusOrderOnProcess=Traitement en cours -StatusOrderOnProcessShort=En cours StatusOrderProcessed=Traitée StatusOrderToBill=À facturer SearchOrder=Rechercher une commande diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index c50c59ddc55..991841248c3 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -238,6 +238,7 @@ $conf->societe->enabled=defined("MAIN_MODULE_SOCIETE")?MAIN_MODULE_SOCIETE:0; $conf->societe->dir_output=DOL_DATA_ROOT."/societe"; $conf->societe->dir_images=DOL_DATA_ROOT."/societe/images"; $conf->societe->dir_logos=DOL_DATA_ROOT."/societe/logos"; +$conf->societe->dir_avoir=DOL_DATA_ROOT."/societe/avoirs"; if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $conf->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par defaut // Module commercial $conf->commercial->enabled=defined("MAIN_MODULE_COMMERCIAL")?MAIN_MODULE_COMMERCIAL:0; @@ -343,10 +344,6 @@ $conf->actionscomm->dir_output=DOL_DATA_ROOT."/action"; // Module export $conf->export->enabled=defined("MAIN_MODULE_EXPORT")?MAIN_MODULE_EXPORT:0; $conf->export->dir_ouput=DOL_DATA_ROOT."/export"; -// Module avoir client -$conf->avoir->enabled=defined("MAIN_MODULE_AVOIR")?MAIN_MODULE_AVOIR:0; -$conf->avoir->dir_output=DOL_DATA_ROOT."/avoir"; -$conf->avoir->dir_images=DOL_DATA_ROOT."/avoir/images"; /* diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php index fcf2f5577b0..0f49c693542 100644 --- a/htdocs/translate.class.php +++ b/htdocs/translate.class.php @@ -36,8 +36,8 @@ class Translate { var $dir; var $defaultlang; - var $tab_loaded=array(); - var $tab_translate=array(); + var $tab_loaded=array(); // Tableau pour signaler les fichiers deja chargés + var $tab_translate=array(); // Tableau des traductions /** @@ -50,6 +50,35 @@ class Translate { } + /** + * \brief Renvoie la chaine traduite pour une clé donnée. + * Le tableau des traductions doit avoir été chargé. + * \param key Clé de traduction + * \return string Chaine de traduction + */ + function getTransFromTab($key) + { + if (isset($this->tab_translate[$key]) && $this->tab_translate[$key]) + { + return $this->tab_translate[$key]; + } + else + { + return ''; + } + } + + /** + * \brief Positionne la chaine traduite pour une clé donnée. + * \param key Clé de traduction + * \param value Chaine de traduction + */ + function setTransFromTab($key,$value) + { + $this->tab_translate[$key]=$value; + } + + /** * \brief Accesseur de this->defaultlang * \param defaultlang Langue par defaut à utiliser @@ -141,7 +170,7 @@ class Translate { { $tab=split('=',$ligne,2); //print "Domain=$domain, found a string for $tab[0] with value $tab[1]
"; - if (! isset($this->tab_translate[$tab[0]])) $this->tab_translate[$tab[0]]=trim(isset($tab[1])?$tab[1]:''); + if (! $this->getTransFromTab($tab[0])) $this->setTransFromTab($tab[0],trim(isset($tab[1])?$tab[1]:'')); } } fclose($fp); @@ -173,6 +202,7 @@ class Translate { * \brief Retourne la version traduite du texte passé en paramètre * Si il n'y a pas de correspondance pour ce texte, on cherche dans fichier alternatif * et si toujours pas trouvé, il est retourné tel quel + * Les paramètres de cette méthode peuvent contenir de balises HTML. * \param str chaine a traduire * \param param1 chaine de param1 * \param param2 chaine de param1 @@ -188,21 +218,22 @@ class Translate { /** * \brief Retourne la version traduite du texte passé en paramètre * Si il n'y a pas de correspondance pour ce texte, on cherche dans fichier alternatif - * et si toujours pas trouvé, il est retourné tel quel - * \param str chaine a traduire + * et si toujours pas trouvé, il est retourné tel quel. + * Les paramètres de cette méthode ne doivent pas contenir de balises HTML. + * \param key clé de chaine a traduire * \param param1 chaine de param1 * \param param2 chaine de param1 * \param param3 chaine de param1 * \return string chaine traduite */ - function transnoentities($str, $param1='', $param2='', $param3='') + function transnoentities($key, $param1='', $param2='', $param3='') { - if (isset($this->tab_translate[$str]) && $this->tab_translate[$str]) + if ($this->getTransFromTab($key)) { // Si la traduction est disponible - return sprintf($this->tab_translate[$str],$param1,$param2,$param3); + return sprintf($this->tab_translate[$key],$param1,$param2,$param3); } - return $str; + return $key; }