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

Make predefined invoice feature easier to use.

Browse Source
This commit is contained in:
Laurent Destailleur 2013-08-06 23:55:17 +02:00
parent acf3db8512
commit 7438809ab5
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/compta/facture/fiche-rec.php
View File

@ -521,7 +521,6 @@ else
/* /*
* List mode * List mode
*/ */
$sql = "SELECT s.nom, s.rowid as socid, f.titre, f.total, f.rowid as facid"; $sql = "SELECT s.nom, s.rowid as socid, f.titre, f.total, f.rowid as facid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
$sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " WHERE f.fk_soc = s.rowid";
@ -531,13 +530,14 @@ else
//$sql .= " ORDER BY $sortfield $sortorder, rowid DESC "; //$sql .= " ORDER BY $sortfield $sortorder, rowid DESC ";
// $sql .= $db->plimit($limit + 1,$offset); // $sql .= $db->plimit($limit + 1,$offset);
$result = $db->query($sql); $resql = $db->query($sql);
if ($resql)
if ($result)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($resql);
print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],"&socid=$socid",$sortfield,$sortorder,'',$num); print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],"&socid=$socid",$sortfield,$sortorder,'',$num);
print $langs->trans("ToCreateAPredefinedInvoice").'<br><br>';
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -552,7 +552,7 @@ else
$var=True; $var=True;
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
@ -586,9 +586,10 @@ else
$i++; $i++;
} }
} }
else print '<tr><td>'.$langs->trans("NoneF").'</td></tr>';
print "</table>"; print "</table>";
$db->free(); $db->free($resql);
} }
else else
{ {
@ -601,5 +602,4 @@ else
llxFooter(); llxFooter();
$db->close(); $db->close();
?>
?>

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

@ -154,4 +154,5 @@ InvoiceLinesToDispatch=Invoice lines to dispatch
InvoiceDispatched=Dispatched invoices InvoiceDispatched=Dispatched invoices
AccountancyDashboard=Accountancy summary AccountancyDashboard=Accountancy summary
ByProductsAndServices=By products and services ByProductsAndServices=By products and services
RefExt=External ref RefExt=External ref
ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".

1
htdocs/langs/fr_FR/compta.lang
View File

@ -155,3 +155,4 @@ InvoiceDispatched=Factures ventilées
AccountancyDashboard=Synthèse compta/tréso AccountancyDashboard=Synthèse compta/tréso
ByProductsAndServices=Par produits et services ByProductsAndServices=Par produits et services
RefExt=Référence externe RefExt=Référence externe
ToCreateAPredefinedInvoice=Pour créer une facture prédéfinie, créer une facture standard puis sans la valider, cliquer sur le bouton "Convertir en facture prédéfine".