diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index ff73d61e3da..8967e20e3ca 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -158,7 +158,7 @@ print ""; print_liste_field_titre($langs->trans("User"),$_SERVER["PHP_SELF"],"name","",'&year='.($year).'&modecompta='.$modecompta,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"amount_ttc","",'&year='.($year).'&modecompta='.$modecompta,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Percentage"),$_SERVER["PHP_SELF"],"amount_ttc","",'&year='.($year).'&modecompta='.$modecompta,'align="right"',$sortfield,$sortorder); -if ($conf->global->MAIN_FEATURES_LEVEL == 2) print_liste_field_titre($langs->trans("OrderStats"),$_SERVER["PHP_SELF"],"","","",'align="center" width="20%"'); +if ($conf->commande->enabled && $conf->global->MAIN_FEATURES_LEVEL == 2) print_liste_field_titre($langs->trans("OrderStats"),$_SERVER["PHP_SELF"],"","","",'align="center" width="20%"'); print "\n"; $var=true; @@ -199,7 +199,7 @@ if (sizeof($amount)) print "".$linkname."\n"; print ''.price($amount[$key]).''; print ''.($catotal > 0 ? round(100 * $amount[$key] / $catotal,2).'%' : ' ').''; - if ($conf->global->MAIN_FEATURES_LEVEL == 2) + if ($conf->commande->enabled && $conf->global->MAIN_FEATURES_LEVEL == 2) { if($key>0){ print ''.img_picto($langs->trans("Show"),"vcard").''; @@ -213,7 +213,7 @@ if (sizeof($amount)) // Total print ''.$langs->trans("Total").''.price($catotal).' '; - if ($conf->global->MAIN_FEATURES_LEVEL == 2) print ' '; + if ($conf->commande->enabled && $conf->global->MAIN_FEATURES_LEVEL == 2) print ' '; print ''; $db->free($result); diff --git a/htdocs/compta/stats/comm.php b/htdocs/compta/stats/comm.php index c7020702b87..ac9f20a5382 100644 --- a/htdocs/compta/stats/comm.php +++ b/htdocs/compta/stats/comm.php @@ -19,11 +19,10 @@ */ /** - \file htdocs/comm/index.php - \ingroup commercial - \brief Page acceuil de la zone commercial cliente - \version $Id$ -*/ + * \file htdocs/compta/stats/comm.php + * \ingroup commercial + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php index 90c0b899557..3a95688c510 100644 --- a/htdocs/compta/stats/comp.php +++ b/htdocs/compta/stats/comp.php @@ -15,106 +15,116 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * + */ + +/** + * \file htdocs/compta/stats/comp.php + * \ingroup commercial + * \version $Id$ */ require("./pre.inc.php"); -require("./lib.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/accountancy.lib.php"); + +// Security check +if ($user->societe_id > 0) +{ + $socid = $user->societe_id; +} -function propals ($db, $year, $month) { - global $bc,$langs; - $sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; - $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c"; - $sql.= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id"; - $sql .= " AND c.id in (1,2,4)"; - $sql .= " AND date_format(p.datep, '%Y') = ".$year; - $sql .= " AND round(date_format(p.datep, '%m')) = ".$month; + +function propals ($db, $year, $month) +{ + global $bc,$langs; + $sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c"; + $sql.= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id"; + $sql .= " AND c.id in (1,2,4)"; + $sql .= " AND date_format(p.datep, '%Y') = ".$year; + $sql .= " AND round(date_format(p.datep, '%m')) = ".$month; - $sql .= " ORDER BY p.fk_statut"; + $sql .= " ORDER BY p.fk_statut"; - $result = $db->query($sql); - $num = $db->num_rows(); - $i = 0; - print ""; - print ""; + $result = $db->query($sql); + $num = $db->num_rows(); + $i = 0; + print "
Propal
"; + print ""; - $oldstatut = -1; - $subtotal = 0; - while ($i < $num) { - $objp = $db->fetch_object($result); + $oldstatut = -1; + $subtotal = 0; + while ($i < $num) { + $objp = $db->fetch_object($result); - if ($objp->statut <> $oldstatut ) { - $oldstatut = $objp->statut; - - if ($i > 0) { + if ($objp->statut <> $oldstatut ) { + $oldstatut = $objp->statut; + + if ($i > 0) { + print "\n"; + print "\n"; + } + $subtotal = 0; + + print ""; + print ""; + print ""; + print ""; + print ""; + print ""; + print "\n"; + $var=True; + } + + $var=!$var; + print ""; + + print "\n"; + + print "\n"; + + print "\n"; + + print "\n"; + print "\n"; + print "\n"; + + $total = $total + $objp->price; + $subtotal = $subtotal + $objp->price; + + $i++; + } print "\n"; print "\n"; - } - $subtotal = 0; - - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print "\n"; - $var=True; - } - - $var=!$var; - print ""; - - print "\n"; - - print "\n"; - - print "\n"; - - print "\n"; - print "\n"; - print "\n"; - - $total = $total + $objp->price; - $subtotal = $subtotal + $objp->price; - - $i++; - } - print "\n"; - print "\n"; - print ""; - print ""; - print ""; - print "
Propal
".$langs->trans("Total").": ".price($subtotal)."".$langs->trans("Currency".$conf->monnaie)."
Societe".$langs->trans("Ref")."Date".$langs->trans("Price")."".$langs->trans("Status")."
socid."\">".$objp->nom."propalid."\">".$objp->ref."".dolibarr_print_date($objp->dp)."".price($objp->price)."".$objp->statut."
".$langs->trans("Total").": ".price($subtotal)."".$langs->trans("Currency".$conf->monnaie)."
Societe".$langs->trans("Ref")."Date".$langs->trans("Price")."".$langs->trans("Status")."
socid."\">".$objp->nom."propalid."\">".$objp->ref."".dolibarr_print_date($objp->dp)."".price($objp->price)."".$objp->statut."
".$langs->trans("Total").": ".price($subtotal)."".$langs->trans("Currency".$conf->monnaie)."
".$langs->trans("Total").": ".price($total)."".$langs->trans("Currency".$conf->monnaie)."
"; - $db->free(); + print ""; + print "".$langs->trans("Total").": ".price($total).""; + print "".$langs->trans("Currency".$conf->monnaie).""; + print ""; + $db->free(); } function factures ($db, $year, $month, $paye) { - global $bc,$conf; + global $bc,$conf; - $sql = "SELECT s.nom, s.rowid as socid, f.facnumber, f.total,".$db->pdate("f.datef")." as df, f.paye, f.rowid as facid "; - $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; - $sql .= " WHERE f.fk_statut = 1"; - if ($conf->compta->mode != 'CREANCES-DETTES') { - $sql .= " AND f.paye = ".$paye; - } - $sql .= " AND f.fk_soc = s.rowid"; - $sql .= " AND date_format(f.datef, '%Y') = ".$year; - $sql .= " AND round(date_format(f.datef, '%m')) = ".$month; - $sql .= " ORDER BY f.datef DESC "; + $sql = "SELECT s.nom, s.rowid as socid, f.facnumber, f.total,".$db->pdate("f.datef")." as df, f.paye, f.rowid as facid "; + $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; + $sql .= " WHERE f.fk_statut = 1"; + if ($conf->compta->mode != 'CREANCES-DETTES') { + $sql .= " AND f.paye = ".$paye; + } + $sql .= " AND f.fk_soc = s.rowid"; + $sql .= " AND date_format(f.datef, '%Y') = ".$year; + $sql .= " AND round(date_format(f.datef, '%m')) = ".$month; + $sql .= " ORDER BY f.datef DESC "; - $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows(); - if ($num > 0) + $result = $db->query($sql); + if ($result) { + $num = $db->num_rows(); + if ($num > 0) + { $i = 0; print ""; print ""; @@ -127,206 +137,200 @@ function factures ($db, $year, $month, $paye) { print "\n"; $var=True; while ($i < $num) - { - $objp = $db->fetch_object($result); - $var=!$var; - print ""; - print "\n"; - print "\n"; - if ($objp->df > 0 ) - { - print "\n"; - } - else - { - print "\n"; - } - - print "\n"; - - $payes[1] = "oui"; - $payes[0] = "non"; - - print "\n"; - print "\n"; - - $total = $total + $objp->total; - - $i++; - } + { + $objp = $db->fetch_object($result); + $var=!$var; + print ""; + print "\n"; + print "\n"; + if ($objp->df > 0 ) + { + print "\n"; + } + else + { + print "\n"; + } + + print "\n"; + + $payes[1] = "oui"; + $payes[0] = "non"; + + print "\n"; + print "\n"; + + $total = $total + $objp->total; + + $i++; + } print ""; print "
Factures
socid."\">".$objp->nom."facid."\">".$objp->facnumber."".dolibarr_print_date($objp->df)."!!!".price($objp->total)."".$payes[$objp->paye]."
socid."\">".$objp->nom."facid."\">".$objp->facnumber."".dolibarr_print_date($objp->df)."!!!".price($objp->total)."".$payes[$objp->paye]."
"; print "Total : ".price($total)."
"; $db->free(); + } + } + else + { + print $db->error(); } - } - else - { - print $db->error(); - } } -function pt ($db, $sql, $year) { - global $bc, $langs; +function pt ($db, $sql, $year) +{ + global $bc, $langs; - $result = $db->query($sql); - if ($result) { - $num = $db->num_rows(); - $i = 0; $total = 0 ; - print ''; - print ""; - print ''; - print "\n"; - $var=True; - $month = 1 ; + $result = $db->query($sql); + if ($result) { + $num = $db->num_rows(); + $i = 0; $total = 0 ; + print '
'.$langs->trans("Month").'Montant
'; + print ""; + print ''; + print "\n"; + $var=True; + $month = 1 ; - while ($i < $num) { - $obj = $db->fetch_object($result); - $var=!$var; + while ($i < $num) { + $obj = $db->fetch_object($result); + $var=!$var; - if ($obj->dm > $month ) { - for ($b = $month ; $b < $obj->dm ; $b++) { - print ""; - print "\n"; - print "\n"; - print "\n"; - $var=!$var; - $ca[$b] = 0; + if ($obj->dm > $month ) { + for ($b = $month ; $b < $obj->dm ; $b++) { + print ""; + print "\n"; + print "\n"; + print "\n"; + $var=!$var; + $ca[$b] = 0; + } + } + + if ($obj->sum > 0) { + print ""; + print "\n"; + print "\n"; + + print "\n"; + $month = $obj->dm + 1; + $ca[$obj->dm] = $obj->sum; + $total = $total + $obj->sum; + } + $i++; + } + + if ($num) { + $beg = $obj->dm; + } else { + $beg = 0 ; + } + + if ($beg <= 12 ) { + for ($b = $beg + 1 ; $b < 13 ; $b++) { + $var=!$var; + print ""; + print "\n"; + print "\n"; + print "\n"; + $ca[$b] = 0; + } + } + + print ""; + print "
'.$langs->trans("Month").'Montant
".dolibarr_print_date(dolibarr_mktime(12,0,0,$b, 1, $year),"%b")."0
".dolibarr_print_date(dolibarr_mktime(12,0,0,$b, 1, $year),"%b")."0
dm\">"; + print dolibarr_print_date(dolibarr_mktime(12,0,0,$obj->dm, 1, $year),"%b")."".price($obj->sum)."
".dolibarr_print_date(dolibarr_mktime(12,0,0,$b, 1, $year),"%b")."0
Total :".price($total)."
"; + + $db->free(); + return $ca; + } else { + print $db->error(); } - } - - if ($obj->sum > 0) { - print ""; - print "dm\">"; - print dolibarr_print_date(dolibarr_mktime(12,0,0,$obj->dm, 1, $year),"%b")."\n"; - print "".price($obj->sum)."\n"; - - print "\n"; - $month = $obj->dm + 1; - $ca[$obj->dm] = $obj->sum; - $total = $total + $obj->sum; - } - $i++; - } - - if ($num) { - $beg = $obj->dm; - } else { - $beg = 0 ; - } - - if ($beg <= 12 ) { - for ($b = $beg + 1 ; $b < 13 ; $b++) { - $var=!$var; - print ""; - print "".dolibarr_print_date(dolibarr_mktime(12,0,0,$b, 1, $year),"%b")."\n"; - print "0\n"; - print "\n"; - $ca[$b] = 0; - } - } - - print "Total :".price($total).""; - print ""; - - $db->free(); - return $ca; - } else { - print $db->error(); - } } function ppt ($db, $year, $socid) { - global $bc,$conf,$langs; - print ""; + global $bc,$conf,$langs; + print "
"; - print '"; - print ""; - - print '"; + print ""; - $sql .= " GROUP BY dm"; - - $prev = pt($db, $sql, $year); - - print "
'; - print "CA Prévisionnel basé sur les propal $year"; - - print "CA Réalisé $yearDelta $year
'; - - $sql = "SELECT sum(f.price) as sum, round(date_format(f.datep,'%m')) as dm"; - $sql .= " FROM ".MAIN_DB_PREFIX."propal as f WHERE fk_statut in (1,2,4) AND date_format(f.datep,'%Y') = $year "; + print '
'; + print "CA Prévisionnel basé sur les propal $year"; - if ($socid) - { - $sql .= " AND f.fk_soc = $socid"; - } + print "CA Réalisé $yearDelta $year
"; - - $sql = "SELECT sum(f.total) as sum, round(date_format(f.datef, '%m')) as dm"; - $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; - $sql .= " WHERE f.fk_statut in (1,2)"; - if ($conf->compta->mode != 'CREANCES-DETTES') { - $sql .= " AND f.paye = 1"; - } - $sql .= " AND date_format(f.datef,'%Y') = $year "; - if ($socid) - { - $sql .= " AND f.fk_soc = $socid"; - } - $sql .= " GROUP BY dm"; - - $ca = pt($db, $sql, $year); - - print ""; - - print ''; - print ""; - print ''; - print ''; - print "\n"; + print '"; - print "\n"; - print "\n"; - print "\n"; - } - - $ayear = $year - 1; - $acat = get_ca($db, $ayear, $socid) - get_ca_propal($db, $ayear, $socid); + if ($socid) + { + $sql .= " AND f.fk_soc = $socid"; + } + + $sql .= " GROUP BY dm"; + + $prev = pt($db, $sql, $year); + + print "
'.$langs->trans("Month").''.$langs->trans("Amount").'
'; - $var = 1 ; - for ($b = 1 ; $b <= 12 ; $b++) - { - $var=!$var; + $sql = "SELECT sum(f.price) as sum, round(date_format(f.datep,'%m')) as dm"; + $sql .= " FROM ".MAIN_DB_PREFIX."propal as f WHERE fk_statut in (1,2,4) AND date_format(f.datep,'%Y') = $year "; - $delta = $ca[$b] - $prev[$b]; - $deltat = $deltat + $delta ; - print "
".dolibarr_print_date(dolibarr_mktime(12,0,0,$b, 1, $year),"%b")."".price($delta)."
"; + + $sql = "SELECT sum(f.total) as sum, round(date_format(f.datef, '%m')) as dm"; + $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; + $sql .= " WHERE f.fk_statut in (1,2)"; + if ($conf->compta->mode != 'CREANCES-DETTES') { + $sql .= " AND f.paye = 1"; + } + $sql .= " AND date_format(f.datef,'%Y') = $year "; + if ($socid) + { + $sql .= " AND f.fk_soc = $socid"; + } + $sql .= " GROUP BY dm"; + + $ca = pt($db, $sql, $year); + + print ""; + + print ''; + print ""; + print ''; + print ''; + print "\n"; + + $var = 1 ; + for ($b = 1 ; $b <= 12 ; $b++) + { + $var=!$var; + + $delta = $ca[$b] - $prev[$b]; + $deltat = $deltat + $delta ; + print ""; + print "\n"; + print "\n"; + print "\n"; + } + + $ayear = $year - 1; + $acat = get_ca($db, $ayear, $socid) - get_ca_propal($db, $ayear, $socid); - print ""; - print ""; - print ""; + print ""; + print ""; + print ""; - print "
'.$langs->trans("Month").''.$langs->trans("Amount").'
".dolibarr_print_date(dolibarr_mktime(12,0,0,$b, 1, $year),"%b")."".price($delta)."
Total :".price($deltat)."
Rappel $ayear :".price($acat)."
Soit :".price($acat+$deltat)."
Total :".price($deltat)."
Rappel $ayear :".price($acat)."
Soit :".price($acat+$deltat)."
"; - print "
"; + print "
"; + print ""; } /* - * + * View */ llxHeader(); -/* - * Sécurité accés client - */ -if ($user->societe_id > 0) -{ - $socid = $user->societe_id; -} $cyear = isset($_GET["year"])?$_GET["year"]:0; if (! $cyear) { $cyear = strftime ("%Y", time()); } @@ -337,14 +341,14 @@ ppt($db, $cyear, $socid); if ($details == 1) { - print "
"; - factures ($db, $year, $month, 1); - print ""; - propals ($db, $year, $month); - print "
"; + print "
"; + factures ($db, $year, $month, 1); + print ""; + propals ($db, $year, $month); + print "
"; } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 692ba70f5c5..2094ffd121e 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -503,9 +503,9 @@ class MenuLeft { // Compta simple if ($conf->compta->enabled) { - $newmenu->add(DOL_URL_ROOT."/compta/ventilation/index.php?leftmenu=ventil",$langs->trans("Ventilation"),0,$user->rights->compta->ventilation->lire); - if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/liste.php",$langs->trans("A ventiler"),1,$user->rights->compta->ventilation->lire); - if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/lignes.php",$langs->trans("Ventilées"),1,$user->rights->compta->ventilation->lire); + $newmenu->add(DOL_URL_ROOT."/compta/ventilation/index.php?leftmenu=ventil",$langs->trans("Dispatch"),0,$user->rights->compta->ventilation->lire); + if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/liste.php",$langs->trans("ToDispatch"),1,$user->rights->compta->ventilation->lire); + if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/lignes.php",$langs->trans("Dispatched"),1,$user->rights->compta->ventilation->lire); if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Setup"),1,$user->rights->compta->ventilation->parametrer); if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/param/comptes/fiche.php?action=create",$langs->trans("New"),2,$user->rights->compta->ventilation->parametrer); if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/param/comptes/liste.php",$langs->trans("List"),2,$user->rights->compta->ventilation->parametrer); diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index ef99dc4ac6e..2058f0231df 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -484,9 +484,9 @@ class MenuLeft { /* if ($conf->compta->enabled) { - $newmenu->add(DOL_URL_ROOT."/compta/ventilation/index.php?leftmenu=ventil",$langs->trans("Ventilation"),0,$user->rights->compta->ventilation->lire); - if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/liste.php",$langs->trans("A ventiler"),1,$user->rights->compta->ventilation->lire); - if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/lignes.php",$langs->trans("Ventilées"),1,$user->rights->compta->ventilation->lire); + $newmenu->add(DOL_URL_ROOT."/compta/ventilation/index.php?leftmenu=ventil",$langs->trans("Dispatch"),0,$user->rights->compta->ventilation->lire); + if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/liste.php",$langs->trans("ToDispatch"),1,$user->rights->compta->ventilation->lire); + if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/ventilation/lignes.php",$langs->trans("Dispatched"),1,$user->rights->compta->ventilation->lire); if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/param/",$langs->trans("Setup"),1,$user->rights->compta->ventilation->parametrer); if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/param/comptes/fiche.php?action=create",$langs->trans("New"),2,$user->rights->compta->ventilation->parametrer); if ($leftmenu=="ventil") $newmenu->add(DOL_URL_ROOT."/compta/param/comptes/liste.php",$langs->trans("List"),2,$user->rights->compta->ventilation->parametrer); diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 53cbfde75d5..dc01c3271ac 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -98,4 +98,7 @@ SeeVATReportInDueDebtMode=Voir le rapport %sTVA sur d RulesVATIn=- Pour les services, le rapport inclut les TVA des réglements effectivement reçus ou émis en se basant sur la date du réglement.
- Pour les biens matériels, il inclut les TVA des factures en se basant sur la date de validation de la facture. RulesVATDue=- Pour les services, le rapport inclut les TVA des factures dues, payées ou non en se basant sur la date de validation de ces factures.
- Pour les biens matériels, il inclut les TVA des factures en se basant sur la date de validation de la facture. OptionVatInfoModuleComptabilite=Remarque : Pour les biens matériels, il faudrait utiliser la date de livraison pour être plus juste. -PercentOfInvoice=%%/invoice \ No newline at end of file +PercentOfInvoice=%%/invoice +Dispatch=Dispatching +Dispatched=Dispatched +ToDispatch=To dispatch \ No newline at end of file diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 23e933fee06..163123e7c59 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -99,4 +99,7 @@ RulesVATIn=- Pour les services, le rapport inclut les TVA des r RulesVATDue=- Pour les services, le rapport inclut les TVA des factures dues, payées ou non en se basant sur la date de validation de ces factures.
- Pour les biens matériels, il inclut les TVA des factures en se basant sur la date de validation de la facture. OptionVatInfoModuleComptabilite=Remarque : Pour les biens matériels, il faudrait utiliser la date de livraison pour être plus juste. PercentOfInvoice=%%/facture -OrderStats=Statistiques sur les commandes \ No newline at end of file +OrderStats=Statistiques sur les commandes +Dispatch=Ventilation +Dispatched=Ventilés +ToDispatch=A ventiler \ No newline at end of file diff --git a/htdocs/compta/stats/lib.inc.php b/htdocs/lib/accountancy.lib.php similarity index 93% rename from htdocs/compta/stats/lib.inc.php rename to htdocs/lib/accountancy.lib.php index 95bfb201c9c..57072ea1bad 100644 --- a/htdocs/compta/stats/lib.inc.php +++ b/htdocs/lib/accountancy.lib.php @@ -15,11 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ +/** + * \file htdocs/lib/accountancy.lib.php + * \brief Library of accountancy functions + * \version $Id$ + */ + + function get_ca_propal ($db, $year, $socid) { diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index c7756355bbb..d9cb2f8b2c1 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -19,10 +19,10 @@ */ /** - \file htdocs/lib/admin.lib.php - \brief Library of admin functions - \version $Id$ -*/ + * \file htdocs/lib/admin.lib.php + * \brief Library of admin functions + * \version $Id$ + */ /**