diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 38a498150e6..a5fe47b37f7 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -305,7 +305,11 @@ if ($_GET["action"] == 'create') $lib=$langs->trans("ProductsAndServices"); print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; for ($i = 1 ; $i <= $conf->global->PROPALE_NEW_FORM_NB_PRODUCT ; $i++) { print ''; print ''; - print ''; + print ''; print ''; print ''; $i = 0 ; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 8fa455142f4..186a82ce4ae 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -904,7 +904,7 @@ if ($_GET['action'] == 'create') // Zone de choix des produits prédéfinis à la création print '
'.$lib.''.$langs->trans("Qty").''.$langs->trans("Discount").'
'.$lib.''.$langs->trans("Qty").''.$langs->trans("ReductionShort").'
'; diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 8af362dfa8c..4fb87d6908d 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -118,7 +118,7 @@ if ($_socid > 0) /* - * Liste de l'historique des remises + * Liste de l'historique des avoirs */ $sql = "SELECT rc.rowid,rc.remise_client,".$db->pdate("rc.datec")." as dc,"; $sql.= " u.rowid as user_id, u.code"; @@ -134,7 +134,7 @@ if ($_socid > 0) $tag = !$tag; print '
'.$langs->trans("Date").''.$langs->trans("Discount").''.$langs->trans("CreditNote").''.$langs->trans("User").'
'; - print ''; + print ''; if ($conf->service->enabled) { print ''; @@ -989,7 +989,7 @@ if ($_GET['action'] == 'create') print ''; print ''; print ''; - print ''; + print ''; // Lignes de propal produits prédéfinis $sql = 'SELECT pt.rowid, p.label as product, p.ref, pt.tva_tx, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent, pt.description'; @@ -1069,7 +1069,7 @@ if ($_GET['action'] == 'create') print ''; print ''; print ''; - print ''; + print ''; $sql = 'SELECT pt.rowid, pt.subprice, pt.tva_tx, pt.qty, pt.remise_percent, pt.description,'; $sql.= ' p.label as product, p.ref, p.rowid as prodid'; @@ -1152,7 +1152,7 @@ if ($_GET['action'] == 'create') print ''; print ''; print ''; - print ''; + print ''; // Lignes de contrat produits prédéfinis $sql = 'SELECT pt.rowid, pt.subprice, pt.tva_tx, pt.qty, pt.remise_percent, pt.description,'; @@ -1554,7 +1554,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; @@ -1816,7 +1816,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 8a129084bd7..25fabfa25e3 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -178,7 +178,7 @@ if ($_GET["action"] == 'create') print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print "\n"; @@ -336,7 +336,9 @@ else print '
'.$langs->trans('ProductsAndServices').''.$langs->trans('Qty').''.$langs->trans('Discount').'    
'.$langs->trans('ProductsAndServices').''.$langs->trans('Qty').''.$langs->trans('Reduction').'     '.$langs->trans('ServiceLimitedDuration').'
'.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('Qty').''.$langs->trans('Discount').'
'.$langs->trans('Reduction').'
'.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('Qty').''.$langs->trans('Discount').'
'.$langs->trans('Reduction').'
'.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('Qty').''.$langs->trans('Discount').'
'.$langs->trans('Reduction').'
'.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('Qty').''.$langs->trans('Discount').''.$langs->trans('Reduction').''.$langs->trans('AmountHT').'  '.$langs->trans('VAT').''.$langs->trans('PriceUHT').''.$langs->trans('Qty').''.$langs->trans('Discount').''.$langs->trans('Reduction').'   '.$langs->trans("Description").''.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").''.$langs->trans("ReductionShort").''.$langs->trans("PriceU").'N.P.
'; print ''; - print ''; + print ''; + print ''; + print ''; $num = sizeof($fac->lignes); $i = 0; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 0233fe2e8db..cc33c1d6920 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -424,7 +424,9 @@ if ($_GET["action"] == 'create') print '
'.$langs->trans("Ref").''.$langs->trans("Product").''.$langs->trans("Price").''.$langs->trans("Discount").''.$langs->trans("Qty").'
'.$langs->trans("Price").''.$langs->trans("ReductionShort").''.$langs->trans("Qty").'
'; print ''; - print ''; + print ''; + print ''; + print ''; $sql = "SELECT pt.rowid, p.label as product, p.ref, pt.price, pt.qty, p.rowid as prodid, pt.remise_percent"; $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pt, ".MAIN_DB_PREFIX."product as p WHERE pt.fk_product = p.rowid AND pt.fk_propal = $propalid"; @@ -647,7 +649,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print "\n"; @@ -841,7 +843,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print "\n"; diff --git a/htdocs/contrat/ligne.php b/htdocs/contrat/ligne.php index 658f0a7e339..28584054dc1 100644 --- a/htdocs/contrat/ligne.php +++ b/htdocs/contrat/ligne.php @@ -236,7 +236,7 @@ if ($id > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print "\n"; diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 9060717941c..efb2b864ebb 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -1057,7 +1057,7 @@ class Facture */ function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $datestart, $dateend, $tva_tx) { - dolibarr_syslog('Facture::UpdateLine'); + dolibarr_syslog("Facture::UpdateLine $rowid, $desc, $pu, $qty, $remise_percent, $datestart, $dateend, $tva_tx"); if ($this->brouillon) { @@ -2206,13 +2206,19 @@ class FactureLigne { // From llx_facturedet var $desc; - var $qty; - var $price; // Prix unitaire HT apres remise % de ligne - //var $price_ttc; - var $subprice; // Prix unitaire HT - var $tva_taux; // Taux tva produit/service - var $remise_percent; // % de la remise - var $remise; // Montant unitaire calculé de la remise % + + var $qty; // Quantité (exemple 2) + var $subprice; // P.U. HT (exemple 100) + var $remise_percent; // % de la remise ligne (exemple 20%) + var $price; // P.U. HT apres remise % de ligne (exemple 80) + var $tva_taux; // Taux tva produit/service (exemple 19.6) + var $remise; // Montant calculé de la remise % sur PU HT (exemple 20) + // subprice = price + remise + + var $total_ht; // Total HT de la ligne toute quantité et incluant + // la remise ligne et remise globale. + var $total_ttc; + var $produit_id; var $date_start; var $date_end; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 05336643551..8cd39e06a97 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -418,7 +418,7 @@ if ($_GET["id"] > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print "\n"; @@ -497,7 +497,7 @@ if ($_GET["id"] > 0) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''."\n"; diff --git a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php index e2cf538e79b..921ebf13703 100644 --- a/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php +++ b/htdocs/fourn/commande/modules/pdf/pdf_muscadet.modules.php @@ -607,7 +607,7 @@ class pdf_muscadet extends ModelePDFCommandesSuppliers if ($this->atleastonediscount) { $pdf->SetXY ($this->posxdiscount-1, $tab_top+2); - $pdf->MultiCell(16,2, $langs->trans("Discount"),'','C'); + $pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C'); } if ($this->atleastonediscount) diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index b67b4c9c870..0e553db1b2c 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -201,7 +201,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->MultiCell(42, $tab2_lh, $langs->trans("TotalHT"), 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_lh); - $pdf->MultiCell(42, $tab2_lh, $langs->trans("Discount"), 0, 'R', 0); + $pdf->MultiCell(42, $tab2_lh, $langs->trans("Reduction"), 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_lh*2); $pdf->MultiCell(42, $tab2_lh, "Total HT après remise", 0, 'R', 0); diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index a4670576796..4d4757f3fc8 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -605,7 +605,7 @@ class pdf_einstein extends ModelePDFCommandes if ($this->atleastonediscount) { $pdf->SetXY ($this->posxdiscount-1, $tab_top+2); - $pdf->MultiCell(16,2, $langs->trans("Discount"),'','C'); + $pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C'); } if ($this->atleastonediscount) diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index bcb7b5c7c67..35dc965528e 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -725,7 +725,7 @@ class pdf_crabe extends ModelePDFFactures if ($this->atleastonediscount) { $pdf->SetXY ($this->posxdiscount-1, $tab_top+2); - $pdf->MultiCell(16,2, $langs->trans("Discount"),'','C'); + $pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C'); } if ($this->atleastonediscount) diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 09a829617e0..398435328c4 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -644,7 +644,7 @@ class pdf_propale_azur extends ModelePDFPropales if ($this->atleastonediscount) { $pdf->SetXY ($this->posxdiscount-1, $tab_top+2); - $pdf->MultiCell(16,2, $langs->trans("Discount"),'','C'); + $pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C'); } if ($this->atleastonediscount) diff --git a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php index cd7aba6cf59..94ce0699964 100644 --- a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php @@ -266,7 +266,7 @@ class pdf_propale_vert extends ModelePDFPropales $pdf->line(166, $tab_top, 166, $tab_top + $tab_height); $pdf->SetXY(166, $yt); - $pdf->MultiCell(14,5,$langs->trans("Discount"),0,'C'); + $pdf->MultiCell(14,5,$langs->trans("ReductionShort"),0,'C'); $pdf->line(180, $tab_top, 180, $tab_top + $tab_height); $pdf->SetXY(180, $yt); diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 9abfa322855..8188481cd37 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -77,7 +77,6 @@ ConfirmValidateBill=Are you sure you want to validate this invoice with referenc ConfirmClassifyPayedBill=Are you sure you want to change invoice %s to status payed ? ConfirmCancelBill=Are you sure you want to cancel invoice %s ? ValidateBill=Validate invoice -GlobalDiscount=Global discount NumberOfBills=Nb of invoices NumberOfBillsByMonth=Nb of invoices by month ShowBill=Show invoice @@ -121,6 +120,9 @@ ChangeIntoRepeatableInvoice=Change into repeatable CreateRepeatableInvoice=Create repeatable invoice ExportDataset_invoice_1=Customer invoices list and invoices' lines ProformaBill=Proforma Bill: +Reduction=Reduction +ReductionShort=Reduc +GlobalDiscount=Global discount CreditNote=Credit note CreditNotes=Credit notes NewGlobalDiscount=New discount diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index b072c70a900..f6d074b453f 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -77,7 +77,6 @@ ConfirmValidateBill= ConfirmClassifyPayedBill=Êtes-vous sûr de vouloir classer la facture %s comme payée ? ConfirmCancelBill=Êtes-vous sûr de vouloir annuler la facture %s ? ValidateBill=Valider facture -GlobalDiscount=Remise globale NumberOfBills=Nb de factures NumberOfBillsByMonth=Nb de factures par mois ShowBill=Afficher facture @@ -121,6 +120,9 @@ ChangeIntoRepeatableInvoice=Modifier en r CreateRepeatableInvoice=Créer facture récurrente ExportDataset_invoice_1=Factures clients et lignes de facture ProformaBill=Facture Proforma : +Reduction=Réduction +ReductionShort=Réduc. +GlobalDiscount=Remise globale CreditNote=Avoir CreditNotes=Avoirs NewGlobalDiscount=Nouvel avoir diff --git a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php index 113b76f0f8e..ff802c0dbd2 100644 --- a/htdocs/livraison/mods/pdf/pdf_typhon.modules.php +++ b/htdocs/livraison/mods/pdf/pdf_typhon.modules.php @@ -605,7 +605,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder if ($this->atleastonediscount) { $pdf->SetXY ($this->posxdiscount-1, $tab_top+2); - $pdf->MultiCell(16,2, $langs->trans("Discount"),'','C'); + $pdf->MultiCell(16,2, $langs->trans("ReductionShort"),'','C'); } if ($this->atleastonediscount) diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 267d00cfd3b..88e4394dfc2 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -812,7 +812,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) print "\n"; print "\n"; print ''; print '\n"; print "\n"; print ''; print '\n"; print "\n"; print '"; print '
'.$langs->trans("Ref").''.$langs->trans("Product").''.$langs->trans("Price").''.$langs->trans("Discount").''.$langs->trans("Qty").'
'.$langs->trans("Price").''.$langs->trans("ReductionShort").''.$langs->trans("Qty").'
'.$langs->trans("VAT").''.$langs->trans("PriceUHT").''.$langs->trans("Qty").''.$langs->trans("Discount").''.$langs->trans("ReductionShort").' '.$langs->trans("Status").'
'.$langs->trans("VAT").''.$langs->trans("PriceUHT").''.$langs->trans("Qty").''.$langs->trans("Discount").''.$langs->trans("ReductionShort").'  
'.$langs->trans("VAT").''.$langs->trans("PriceUHT").''.$langs->trans("Qty").''.$langs->trans("Discount").''.$langs->trans("ReductionShort").' '.$langs->trans("Status").'
'.$langs->trans("Description").''.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").''.$langs->trans("ReductionShort").''.$langs->trans("PriceU").'  
'.$langs->trans("Description").''.$langs->trans("VAT").''.$langs->trans("Qty").''.$langs->trans("Discount").''.$langs->trans("ReductionShort").''.$langs->trans("PriceU").'  
idp\">".dolibarr_trunc($objp->nom,18)."".dolibarr_print_date($objp->dp,"%d %b")."'; - print ''.$langs->trans("Discount"); + print ''.$langs->trans("ReductionShort"); print '%'; print " ".$product->stock_proposition; print ''; @@ -851,7 +851,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) $html->select_array("propalid", $otherprop); print '
'.$langs->trans("Qty"); - print ''.$langs->trans("Discount"); + print ''.$langs->trans("ReductionShort"); print '%'; print ''; print ''; @@ -920,7 +920,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) print "idp\">".dolibarr_trunc($objc->nom,18)."".dolibarr_print_date($objc->dc,"%d %b")."'; - print ''.$langs->trans("Discount"); + print ''.$langs->trans("ReductionShort"); print '%'; print " ".$product->stock_proposition; print ''; @@ -959,7 +959,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) $html->select_array("commandeid", $othercom); print '
'.$langs->trans("Qty"); - print ''.$langs->trans("Discount"); + print ''.$langs->trans("ReductionShort"); print '%'; print ''; print ''; @@ -1024,7 +1024,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) print "idp\">".dolibarr_trunc($objp->nom,18)."".dolibarr_print_date($objp->df,"%d %b")."'; - print ''.$langs->trans("Discount"); + print ''.$langs->trans("ReductionShort"); print '%'; print ''; print ''; @@ -1082,7 +1082,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->status) print ''; print "'; - print ''.$langs->trans("Discount"); + print ''.$langs->trans("ReductionShort"); print '%'; print ''; print '';