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

Fix: make fix on predefined invoice feature.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-27 01:48:31 +00:00
parent 930b400458
commit 892a8c1ce4
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/facture.php
View File

@ -483,7 +483,7 @@ if ($_REQUEST['action'] == 'confirm_converttoreduc' && $_REQUEST['confirm'] == '
/* /*
* Insert invoice * Insert new invoice in database
*/ */
if ($_POST['action'] == 'add' && $user->rights->facture->creer) if ($_POST['action'] == 'add' && $user->rights->facture->creer)
{ {
@ -533,7 +533,7 @@ if ($_POST['action'] == 'add' && $user->rights->facture->creer)
} }
} }
// Facture avoir // Credit note invoice
if ($_POST['type'] == 2) if ($_POST['type'] == 2)
{ {
if (! $_POST['fac_avoir'] > 0) if (! $_POST['fac_avoir'] > 0)
@ -1453,7 +1453,7 @@ if ($_GET['action'] == 'create')
{ {
if ($_GET['propalid'] == 0 && $_GET['commandeid'] == 0 && $_GET['contratid'] == 0) if ($_GET['propalid'] == 0 && $_GET['commandeid'] == 0 && $_GET['contratid'] == 0)
{ {
$sql = 'SELECT r.rowid, r.titre, r.amount FROM '.MAIN_DB_PREFIX.'facture_rec as r'; $sql = 'SELECT r.rowid, r.titre, r.total_ttc FROM '.MAIN_DB_PREFIX.'facture_rec as r';
$sql.= ' WHERE r.fk_soc = '.$soc->id; $sql.= ' WHERE r.fk_soc = '.$soc->id;
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
@ -1463,12 +1463,15 @@ if ($_GET['action'] == 'create')
if ($num > 0) if ($num > 0)
{ {
print '<tr><td>'.$langs->trans('CreateFromRepeatableInvoice').'</td><td><select class="flat" name="fac_rec">'; print '<tr><td>'.$langs->trans('CreateFromRepeatableInvoice').'</td><td>';
print '<select class="flat" name="fac_rec">';
print '<option value="0" selected="true"></option>'; print '<option value="0" selected="true"></option>';
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
print '<option value="'.$objp->rowid.'">'.$objp->titre.' : '.$objp->amount.'</option>'; print '<option value="'.$objp->rowid.'"';
if ($_POST["fac_rec"] == $objp->rowid) print ' selected="true"';
print '>'.$objp->titre.' ('.$objp->total_ttc.' '.$langs->trans("TTC").')</option>';
$i++; $i++;
} }
print '</select></td></tr>'; print '</select></td></tr>';

1
htdocs/compta/facture/facture-rec.class.php
View File

@ -327,6 +327,7 @@ class FactureRec extends Facture
$this->lignes[$i] = $faclig; $this->lignes[$i] = $faclig;
$i++; $i++;
} }
$this->db->free($result); $this->db->free($result);
return 1; return 1;
} }

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

@ -543,11 +543,11 @@ else
{ {
if ($objp->fk_statut == 0) if ($objp->fk_statut == 0)
{ {
print '<td align="center">brouillon</td>'; print '<td align="center">'.$langs->trans("Draft").'</td>';
} }
else else
{ {
print '<td align="center"><a href="facture.php?filtre=paye:0,fk_statut:1">impay<EFBFBD>e</a></td>'; print '<td align="center"><a href="facture.php?filtre=paye:0,fk_statut:1">'.$langs->trans("Validated").'</a></td>';
} }
} }
else else

8
htdocs/facture.class.php
View File

@ -158,7 +158,7 @@ class Facture extends CommonObject
if ($this->fac_rec > 0) if ($this->fac_rec > 0)
{ {
require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture-rec.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture-rec.class.php');
$_facrec = new FactureRec($this->db, $this->fac_rec); $_facrec = new FactureRec($this->db);
$result=$_facrec->fetch($this->fac_rec); $result=$_facrec->fetch($this->fac_rec);
$this->projetid = $_facrec->projetid; $this->projetid = $_facrec->projetid;
@ -277,7 +277,7 @@ class Facture extends CommonObject
} }
/* /*
* Produits de la facture récurrente * Insert lines of predefined invoices
*/ */
if (! $error && $this->fac_rec > 0) if (! $error && $this->fac_rec > 0)
{ {
@ -298,8 +298,8 @@ class Facture extends CommonObject
$tva_tx, $tva_tx,
$_facrec->lignes[$i]->produit_id, $_facrec->lignes[$i]->produit_id,
$_facrec->lignes[$i]->remise_percent, $_facrec->lignes[$i]->remise_percent,
'','',0,0,'','HT', '','',0,0,'','HT',0,
$_facref->lignes[$i]->product_type $_facrec->lignes[$i]->product_type
); );
if ( $result_insert < 0) if ( $result_insert < 0)