| '.$langs->trans("DeliveryReceipt").' | ';
@@ -403,12 +403,12 @@ class FormMail
{
$defaultmessage="";
- // \todo A partir du type, proposer liste de messages dans table llx_models
- if ($this->param["models"]=='body') { $defaultmessage=$this->withbody; }
- if ($this->param["models"]=='facture_send') { $defaultmessage="Veuillez trouver ci-joint la facture __FACREF__\n\nCordialement\n\n"; }
- if ($this->param["models"]=='facture_relance') { $defaultmessage="Nous apportons à votre connaissance que la facture __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\nCordialement\n\n"; }
- if ($this->param["models"]=='propal_send') { $defaultmessage="Veuillez trouver ci-joint la proposition commerciale __PROPREF__\n\nCordialement\n\n"; }
- if ($this->param["models"]=='order_send') { $defaultmessage="Veuillez trouver ci-joint la commande __ORDERREF__\n\nCordialement\n\n"; }
+ // \TODO A partir du type, proposer liste de messages dans table llx_models
+ if ($this->param["models"]=='body') { $defaultmessage=$this->withbody; }
+ if ($this->param["models"]=='facture_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
+ if ($this->param["models"]=='facture_relance') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+ if ($this->param["models"]=='propal_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
+ if ($this->param["models"]=='order_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
$defaultmessage=make_substitutions($defaultmessage,$this->substit);
diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php
index be19fe9854d..eda0369dc07 100644
--- a/htdocs/includes/menus/barre_left/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php
@@ -429,7 +429,7 @@ class MenuLeft {
{
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/clients.php?action=facturer&leftmenu=customers_bills",$langs->trans("NewBill"),2,$user->rights->facture->creer);
}
- if (! $conf->global->FACTURE_DISABLE_RECUR)
+ if ($conf->global->FACTURE_ENABLE_RECUR)
{
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php?leftmenu=customers_bills",$langs->trans("Repeatables"),2,$user->rights->facture->lire);
}
diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
index 03d94b64763..d01ddd806c2 100644
--- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
@@ -411,7 +411,7 @@ class MenuLeft {
{
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/clients.php?action=facturer&leftmenu=customers_bills",$langs->trans("NewBill"),2,$user->rights->facture->creer);
}
- if (! $conf->global->FACTURE_DISABLE_RECUR)
+ if ($conf->global->FACTURE_ENABLE_RECUR)
{
if (eregi("customers_bills",$leftmenu)) $newmenu->add_submenu(DOL_URL_ROOT."/compta/facture/fiche-rec.php?leftmenu=customers_bills",$langs->trans("Repeatable"),2,$user->rights->facture->lire);
}
diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index 2ccd0703c83..8e6fcc6b91e 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -298,7 +298,7 @@ insert into `llx_menu_constraint` (`rowid`, `action`) values (10, '$conf->contra
insert into `llx_menu_constraint` (`rowid`, `action`) values (11, '$conf->fichinter->enabled');
insert into `llx_menu_constraint` (`rowid`, `action`) values (12, '$conf->societe->enabled');
insert into `llx_menu_constraint` (`rowid`, `action`) values (13, '$conf->facture->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (14, '! $conf->global->FACTURE_DISABLE_RECUR');
+insert into `llx_menu_constraint` (`rowid`, `action`) values (14, '$conf->global->FACTURE_ENABLE_RECUR');
insert into `llx_menu_constraint` (`rowid`, `action`) values (15, '$conf->don->enabled');
insert into `llx_menu_constraint` (`rowid`, `action`) values (16, '$conf->deplacement->enabled');
insert into `llx_menu_constraint` (`rowid`, `action`) values (17, '$conf->tax->enabled');
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 52ca4e0fc15..bca7030cc46 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -239,7 +239,7 @@ class pdf_crabe extends ModelePDFFactures
// Description de la ligne produit
$libelleproduitservice=dol_htmlentitiesbr($fac->lignes[$i]->libelle,1);
- if ($fac->lignes[$i]->desc&&$fac->lignes[$i]->desc!=$fac->lignes[$i]->libelle)
+ if ($fac->lignes[$i]->desc && $fac->lignes[$i]->desc != $fac->lignes[$i]->libelle)
{
if ($libelleproduitservice) $libelleproduitservice.="
";
diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php
index 6aa46715275..6f81bffa072 100644
--- a/htdocs/includes/modules/facture/pdf_huitre.modules.php
+++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php
@@ -254,13 +254,17 @@ class pdf_huitre extends ModelePDFFactures
$pdf->MultiCell(110, 3, $note, 0, 'J');
}
- $pdf->SetFont('Arial','U',11);
$pdf->SetXY(10, 225);
- $titre = $outputlangs->transnoentities("PaymentConditions").' : ';
- $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$fac->cond_reglement_code)!=('PaymentCondition'.$fac->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$fac->cond_reglement_code):$fac->cond_reglement;
- $titre.=$lib_condition_paiement;
- $pdf->MultiCell(190, 5, $titre, 0, 'J');
+ // Show payments conditions
+ if ($fac->type != 2 && ($fac->cond_reglement_code || $fac->cond_reglement))
+ {
+ $titre = $outputlangs->transnoentities("PaymentConditions").' : ';
+ $lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$fac->cond_reglement_code)!=('PaymentCondition'.$fac->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$fac->cond_reglement_code):$fac->cond_reglement;
+ $titre.=$lib_condition_paiement;
+ $pdf->MultiCell(190, 5, $titre, 0, 'J');
+ }
+
$this->_pagefoot($pdf, $fac, $outputlangs);
$pdf->AliasNbPages();
//----
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 5e67f5f422b..8f74302a288 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -196,13 +196,13 @@ NonPercuRecuperable=Non-recoverable
SetConditions=Set payment conditions
SetMode=Set payment mode
Billed=Billed
-RepeatableInvoice=Repeatable invoice
-RepeatableInvoices=Repeatable invoices
-Repeatable=Repeatable
-Repeatables=Repeatable
-ChangeIntoRepeatableInvoice=Change into repeatable
-CreateRepeatableInvoice=Create repeatable invoice
-CreateFromRepeatableInvoice=Create from repeatable invoice
+RepeatableInvoice=Pre-defined invoice
+RepeatableInvoices=Pre-defined invoices
+Repeatable=Pre-defined
+Repeatables=Pre-defined
+ChangeIntoRepeatableInvoice=Convert into pre-defined
+CreateRepeatableInvoice=Create pre-defined invoice
+CreateFromRepeatableInvoice=Create from pre-defined invoice
CustomersInvoicesAndInvoiceLines=Customer invoices and invoices' lines
CustomersInvoicesAndPayments=Customer invoices and payments
ExportDataset_invoice_1=Customer invoices list and invoices' lines
@@ -240,6 +240,10 @@ InvoicePayed=Invoice payed
PaymentNumber=Payment number
RemoveDiscount=Remove discount
WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
+CloneInvoice=Clone invoice
+CloneMainAttributes=Clone object with its main attributes
+ConfirmCloneInvoice=Are you sure you want to clone this invoice ?
+DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
# PaymentConditions
PaymentConditionShortRECEP=Immediate
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index ae788067c15..e009ec26233 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -34,6 +34,11 @@ Miscellanous=Miscellanous
NbOfActiveNotifications=Number of notifications
WarningInstallDirExists=Warning, install directory (%s) still exists. This is a serious security hole. You should removed it as soon as possible.
WarningUntilDirRemoved=This warning will remain active as long as this directory is present (Shown only to admin users).
+PredefinedMailContentSendInvoice=Veuillez trouver ci-joint la facture __FACREF__\n\nCordialement\n\n
+PredefinedMailContentSendInvoiceReminder=Nous apportons à votre connaissance que la facture __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\nCordialement\n\n
+PredefinedMailContentSendProposal=Veuillez trouver ci-joint la proposition commerciale __PROPREF__\n\nCordialement\n\n
+PredefinedMailContentSendOrder=Veuillez trouver ci-joint la commande __ORDERREF__\n\nCordialement\n\n
+##### Bookmark #####
Bookmark=Bookmark
Bookmarks=Bookmarks
NewBookmark=New bookmark
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 93bc7e84786..b5761ea0a66 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -195,13 +195,13 @@ NonPercuRecuperable=Non per
SetConditions=Définir conditions de règlement
SetMode=Définir mode de règlement
Billed=Facturé
-RepeatableInvoice=Facture récurrente
-RepeatableInvoices=Factures récurrentes
-Repeatable=Récurrente
-Repeatables=Récurrentes
-ChangeIntoRepeatableInvoice=Convertir en récurrente
-CreateRepeatableInvoice=Créer facture récurrente
-CreateFromRepeatableInvoice=Créer depuis facture récurrente
+RepeatableInvoice=Facture prédéfinie
+RepeatableInvoices=Factures prédéfinies
+Repeatable=Prédéfinie
+Repeatables=Prédéfinies
+ChangeIntoRepeatableInvoice=Convertir en prédéfinie
+CreateRepeatableInvoice=Créer facture prédéfinie
+CreateFromRepeatableInvoice=Créer depuis facture prédéfinie
CustomersInvoicesAndInvoiceLines=Factures clients et lignes de factures
CustomersInvoicesAndPayments=Factures clients et règlements
ExportDataset_invoice_1=Factures clients et lignes de facture
@@ -240,6 +240,10 @@ PaymentNumber=Num
RemoveDiscount=Supprimer remise
WatermarkOnDraftBill=Filigrane sur les brouillons de factures (aucun si vide)
UnpayedNotChecked=Aucune facture impayées n'a été sélectionnée
+CloneInvoice=Cloner facture
+CloneMainAttributes=Cloner l'objet avec ces attributs principaux
+ConfirmCloneInvoice=Etes-vous sur de vouloir cloner cette facture ?
+DisabledBecauseReplacedInvoice=Action désactivée car facture remplacée
# PaymentConditions
PaymentConditionShortRECEP=A réception
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 6ca19a4deef..049e44cfd9a 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -34,6 +34,10 @@ Miscellanous=Divers
NbOfActiveNotifications=Nombre de notifications
WarningInstallDirExists=Attention, le répertoire install (%s) existe toujours. Une fois l'install terminée, sa présence n'est plus nécessaire et représente une faille sérieuse de sécurité. Vous devriez l'effacer dès que possible.
WarningUntilDirRemoved=Cette alerte restera active tant que le répertoire existera (alerte visible pour les utilisateurs admin uniquement).
+PredefinedMailContentSendInvoice=Veuillez trouver ci-joint la facture __FACREF__\n\nCordialement\n\n
+PredefinedMailContentSendInvoiceReminder=Nous apportons à votre connaissance que la facture __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\nCordialement\n\n
+PredefinedMailContentSendProposal=Veuillez trouver ci-joint la proposition commerciale __PROPREF__\n\nCordialement\n\n
+PredefinedMailContentSendOrder=Veuillez trouver ci-joint la commande __ORDERREF__\n\nCordialement\n\n
##### Bookmark #####
Bookmark=Marque page
Bookmarks=Marque pages
|