diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 0fc022efa24..728ac102799 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -240,26 +240,30 @@ if ($_POST["action"] == 'setremise' && $user->rights->facture->creer) if ($_POST["action"] == 'addligne' && $user->rights->facture->creer) { - $fac = new Facture($db); - $fac->fetch($_POST["facid"]); - $datestart=''; - $dateend=''; - if ($_POST["date_startyear"] && $_POST["date_startmonth"] && $_POST["date_startday"]) { - $datestart=$_POST["date_startyear"].'-'.$_POST["date_startmonth"].'-'.$_POST["date_startday"]; + if ($_POST["qty"] && (($_POST["pu"] && $_POST["desc"]) || $_POST["idprod"])) + { + $fac = new Facture($db); + $fac->fetch($_POST["facid"]); + $datestart=''; + $dateend=''; + if ($_POST["date_startyear"] && $_POST["date_startmonth"] && $_POST["date_startday"]) { + $datestart=$_POST["date_startyear"].'-'.$_POST["date_startmonth"].'-'.$_POST["date_startday"]; + } + if ($_POST["date_endyear"] && $_POST["date_endmonth"] && $_POST["date_endday"]) { + $dateend=$_POST["date_endyear"].'-'.$_POST["date_endmonth"].'-'.$_POST["date_endday"]; + } + $result = $fac->addline($_POST["facid"], + $_POST["desc"], + $_POST["pu"], + $_POST["qty"], + $_POST["tva_tx"], + 0, + $_POST["remise_percent"], + $datestart, + $dateend + ); + } - if ($_POST["date_endyear"] && $_POST["date_endmonth"] && $_POST["date_endday"]) { - $dateend=$_POST["date_endyear"].'-'.$_POST["date_endmonth"].'-'.$_POST["date_endday"]; - } - $result = $fac->addline($_POST["facid"], - $_POST["desc"], - $_POST["pu"], - $_POST["qty"], - $_POST["tva_tx"], - 0, - $_POST["remise_percent"], - $datestart, - $dateend - ); $_GET["facid"]=$_POST["facid"]; // Pour réaffichage de la fiche en cours d'édition } @@ -526,12 +530,18 @@ if ($_GET["action"] == 'create') print ''; - print ''; - print ''; + print ''; + print ''; - print ''; + print ''; + print ''; + print ''; - print ''; + + print ''; - print ''; - - print ''; + print ''; print ''; - print ""; // Mode de réglement - print ""; // Projet if ($conf->projet->enabled) { $langs->load("projects"); - print '"; } else { - print ""; + print ''; } if ($_GET["propalid"] > 0) @@ -946,16 +917,18 @@ else */ print '
'.$langs->trans("Company").' :'.$soc->nom.''.$langs->trans("Comments").'
'.$langs->trans("Company").''.$soc->nom.'
'.$langs->trans("Author").' :'.$user->fullname.'
'.$langs->trans("Author").''.$user->fullname.''.$langs->trans("Comments").'
'; + print '
'.$langs->trans("Date").''; + $html->select_date(); + print ''; print '
'.$langs->trans("Date").' :'; - $html->select_date(); - print '
'.$langs->trans("Ref").' :Provisoire
'.$langs->trans("Ref").'Provisoire
Conditions de réglement :"; - $sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."cond_reglement ORDER BY sortorder"; - $result = $db->query($sql); - $conds=array(); - if ($result) - { - $num = $db->num_rows($result); - $i = 0; - while ($i < $num) - { - $objp = $db->fetch_object($result); - $conds[$objp->rowid]=$objp->libelle; - $i++; - } - $db->free($result); - } - - $html->select_array("condid",$conds); + // Conditions de réglement + $id_condition_paiements_defaut=1; + print "
".$langs->trans("PaymentConditions").""; + $html->select_conditions_paiements($id_condition_paiements_defaut,'condid'); print "
Mode de réglement :"; - $sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement ORDER BY libelle"; - $result = $db->query($sql); - $modesregl=array(); - if ($result) - { - $num = $db->num_rows(); - $i = 0; - while ($i < $num) - { - $objp = $db->fetch_object(); - $modesregl[$objp->id]=$objp->libelle; - $i++; - } - $db->free(); - } - - $html->select_array("mode_reglement",$modesregl); + print "
".$langs->trans("PaymentMode").""; + $html->select_types_paiements('','mode_reglement'); print "
'.$langs->trans("Project").' :'; - $proj = new Project($db); - $html->select_array( - "projetid", - $proj->liste_array($socidp), - (is_object($commande) && !empty($commande->projet_id)) ? $commande->projet_id : '' - ); + print '
'.$langs->trans("Project").''; + $html->select_projects($socidp); print "
 
 
'; print ''; - print ''; - - print ""; + print ''; print ''; - print "\n"; + print '\n"; print '"; + print ''; + + // Conditions et modes de réglement + print ''; + print ''; print ''; @@ -1578,8 +1551,7 @@ else } else { - /* Facture non trouvée */ - print $langs->trans("ErrorBillNotFound",$_GET["facid"]); + dolibarr_print_error($db,$fac->error); } } else diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 8c9d065daf3..f7a0252d044 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -19,7 +19,6 @@ * * $Id$ * $Source$ - * */ /** @@ -109,16 +108,21 @@ if ($_GET["facid"] > 0) */ print '
'.$langs->trans("Company").''; - print ''.$soc->nom.'Conditions de réglement" . $fac->cond_reglement ."
'; + print ''.$soc->nom.'
'.$langs->trans("Date").'".dolibarr_print_date($fac->date,"%A %d %B %Y")."'.dolibarr_print_date($fac->date,"%A %d %B %Y")."'.$langs->trans("DateClosing").'' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y"); if ($fac->date_lim_reglement < (time() - $conf->facture->client->warning_delay) && ! $fac->paye && $fac->statut == 1 && ! $fac->am) print img_warning($langs->trans("Late")); - print "
'.$langs->trans("PaymentConditions").''. $fac->cond_reglement . ''.$langs->trans("PaymentMode").''. $fac->mode_reglement . '
'; print ''; - print ''; - - print ""; + print ''; + print ''; + // Dates print ''; - print "\n"; + print ''; print '"; + + // Conditions et modes de réglement + print ''; + print ''; + print ''; if ($conf->projet->enabled) { diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 04f63265b61..ca8783cdef7 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -105,15 +104,17 @@ if ($_GET["facid"]) print '
'.$langs->trans("Company").''; - print ''.$soc->nom.'Conditions de réglement" . $fac->cond_reglement ."
'; + print ''.$soc->nom.'
'.$langs->trans("Date").'".dolibarr_print_date($fac->date,"%A %d %B %Y")."'.dolibarr_print_date($fac->date,"%A %d %B %Y").''.$langs->trans("DateClosing").'' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y"); if ($fac->paye == 0 && $fac->date_lim_reglement < (time() - $warning_delay)) print img_warning($langs->trans("Late")); print "
'.$langs->trans("PaymentConditions").''. $fac->cond_reglement . ''.$langs->trans("PaymentMode").''. $fac->mode_reglement . '
'; print ''; - print ''; - - print ""; + print ''; print ''; print '\n"; print '"; + // Conditions et modes de réglement + print ''; + print ''; + print ''; print '"; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 12d87bbc764..fc3ac0eed0e 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -15,6 +15,7 @@ Payments=Payments ReceivedPayments=Received payments PaymentsAlreadyDone=Payments already done PaymentMode=Payment mode +PaymentConditions=Payment conditions ClassifyPayed=Classify 'Payed' ClassifyCanceled=Classify 'Abandonned' CreateBill=Create Invoice diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 6ce960359c6..799b6ba7fa6 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -14,7 +14,8 @@ Payment=Paiement Payments=Paiements ReceivedPayments=Paiements reçus PaymentsAlreadyDone=Versements déjà effectués -PaymentMode=Mode de paiement +PaymentMode=Mode de réglement +PaymentConditions=Conditions de réglement ClassifyPayed=Classer 'Payée' ClassifyCanceled=Classer 'Abandonnée' CreateBill=Créer Facture
'.$langs->trans("Company").''; - print ''.$soc->nom.'Conditions de réglement" . $facture->cond_reglement ."
'; + print ''.$soc->nom.'
'.$langs->trans("Date").''.dolibarr_print_date($facture->date,"%A %d %B %Y")."'.$langs->trans("DateClosing").''.dolibarr_print_date($facture->date_lim_reglement,"%A %d %B %Y") ."
'.$langs->trans("PaymentConditions").''. $facture->cond_reglement . ''.$langs->trans("PaymentMode").''. $facture->mode_reglement . '
'.$langs->trans("Note").' :
'.($facture->note?nl2br($facture->note):" ")."