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

Qual: Uniformize dictionnary table names.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-06 01:04:07 +00:00
parent 488105a6d5
commit dfeab93723
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/adherents/card_subscriptions.php
View File

@ -149,6 +149,7 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio
{ {
// If option choosed, we create invoice // If option choosed, we create invoice
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/paymentterm.class.php");
$invoice=new Facture($db); $invoice=new Facture($db);
$customer=new Societe($db); $customer=new Societe($db);
@ -164,9 +165,13 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio
$invoice->cond_reglement_id=$customer->cond_reglement_id; $invoice->cond_reglement_id=$customer->cond_reglement_id;
if (empty($invoice->cond_reglement_id)) if (empty($invoice->cond_reglement_id))
{ {
// TODO Found the id for code 'RECEP'. If not found take the first one $paymenttermstatic=new PaymentTerm($db);
//?$customer->cond_reglement_id:1; $invoice->cond_reglement_id=$paymenttermstatic->getDefaultId();
if (empty($invoice->cond_reglement_id))
{
$error++;
$errmsg='ErrorNoPaymentTermRECEPFound';
}
} }
$invoice->socid=$adh->fk_soc; $invoice->socid=$adh->fk_soc;
@ -180,6 +185,7 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio
// Add line to draft invoice // Add line to draft invoice
$idprodsubscription=0; $idprodsubscription=0;
$vattouse=get_default_tva($mysoc, $customer, $idprodsubscription); $vattouse=get_default_tva($mysoc, $customer, $idprodsubscription);
//print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
$result=$invoice->addline($invoice->id,$label,0,1,$vattouse,0,0,$idprodsubscription,0,$datecotisation,$datesubend,0,0,'','TTC',$cotisation,1); $result=$invoice->addline($invoice->id,$label,0,1,$vattouse,0,0,$idprodsubscription,0,$datecotisation,$datesubend,0,0,'','TTC',$cotisation,1);
if ($result <= 0) if ($result <= 0)
{ {

2
htdocs/compta/facture/class/paymentterm.class.php
View File

@ -230,7 +230,7 @@ class PaymentTerm // extends CommonObject
* \brief Return id of default payment term * \brief Return id of default payment term
* \return int <0 if KO, >0 if OK * \return int <0 if KO, >0 if OK
*/ */
function getDefaultId($id) function getDefaultId()
{ {
global $langs; global $langs;
$sql = "SELECT"; $sql = "SELECT";