diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index a2f5c6d21ce..22827017087 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -77,13 +77,18 @@ ToOfferALinkForOnlineSignature=Link for online signature WelcomeOnOnlineSignaturePageProposal=Welcome to the page to accept commercial proposals from %s WelcomeOnOnlineSignaturePageContract=Welcome to %s Contract PDF Signing Page WelcomeOnOnlineSignaturePageFichinter=Welcome to %s Intervention PDF Signing Page +WelcomeOnOnlineSignaturePageSociete_rib=Welcome to %s SEPA mandate PDF Signing Page ThisScreenAllowsYouToSignDocFromProposal=This screen allow you to accept and sign, or refuse, a quote/commercial proposal ThisScreenAllowsYouToSignDocFromContract=This screen allow you to sign contract on PDF format online. ThisScreenAllowsYouToSignDocFromFichinter=This screen allow you to sign intervention on PDF format online. +ThisScreenAllowsYouToSignDocFromSociete_rib=This screen allow you to sign SEPA Mandate on PDF format online. ThisIsInformationOnDocumentToSignProposal=This is information on document to accept or refuse ThisIsInformationOnDocumentToSignContract=This is information on contract to sign ThisIsInformationOnDocumentToSignFichinter=This is information on intervention to sign +ThisIsInformationOnDocumentToSignSociete_rib=This is information on SEPA Mandate to sign SignatureProposalRef=Signature of quote/commercial proposal %s SignatureContractRef=Signature of contract %s SignatureFichinterRef=Signature of intervention %s +SignatureSociete_ribRef=Signature of SEPA mandat %s +SignSociete_rib=Signature of SEPA Mandate %s FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang index 4dbb9576480..6051bfee5da 100644 --- a/htdocs/langs/fr_FR/commercial.lang +++ b/htdocs/langs/fr_FR/commercial.lang @@ -77,13 +77,18 @@ ToOfferALinkForOnlineSignature=Lien pour signature en ligne WelcomeOnOnlineSignaturePageProposal=Bienvenue sur la page pour accepter les propositions commerciales de %s WelcomeOnOnlineSignaturePageContract=Bienvenue sur la page de signature du contrat PDF %s WelcomeOnOnlineSignaturePageFichinter=Bienvenue sur la page de signature de PDF d'intervention %s +WelcomeOnOnlineSignaturePageSociete_rib=Bienvenue sur la page de signature de PDF du mandat SEPA %s ThisScreenAllowsYouToSignDocFromProposal=Cet écran vous permet d'accepter et signer en ligne, ou de refuser, le devis ou la proposition commerciale ThisScreenAllowsYouToSignDocFromContract=Cet écran vous permet de signer en ligne un contrat au format PDF. ThisScreenAllowsYouToSignDocFromFichinter=Cet écran vous permet de signer en ligne une intervention au format PDF. +ThisScreenAllowsYouToSignDocFromSociete_rib=Cet écran vous permet de signer en ligne un mandat SEPA au format PDF. ThisIsInformationOnDocumentToSignProposal=Voici les informations sur le document à accepter ou refuser ThisIsInformationOnDocumentToSignContract=Voici les informations sur le contrat à signer ThisIsInformationOnDocumentToSignFichinter=Ceci est une information sur l'intervention à signer +ThisIsInformationOnDocumentToSignSociete_rib=Ceci est une information sur le mandat SEPA à signer SignatureProposalRef=Signature du devis ou proposition commerciale %s SignatureContractRef=Signature du contrat %s SignatureFichinterRef=Signature de l'intervention %s +SignatureSociete_ribRef=Signature du manda SEPA %s +SignSociete_rib=Signature du mandat SEPA %s FeatureOnlineSignDisabled=Fonctionnalité pour la signature en ligne désactivée ou document généré avant l'activation de la fonctionnalité diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index 9b9a624b802..532f6ff4a59 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -527,7 +527,7 @@ if ($source == 'proposal') { print ''."\n"; } elseif ($source == 'societe_rib') { $found = true; - $langs->loadLangs(array("companies", "commercial", "banks", "bills", 'withdrawals')); + $langs->loadLangs(array("companies", "commercial")); $result = $object->fetch_thirdparty(); @@ -553,25 +553,10 @@ if ($source == 'proposal') { $last_main_doc_file = $object->last_main_doc; - - /*if ($action == 'builddocrib') { - $action = 'builddoc'; - $moreparams = array( - 'use_companybankid'=>GETPOST('companybankid'), - 'force_dir_output'=>$conf->societe->multidir_output[$object->thirdparty->entity].'/'.dol_sanitizeFileName($object->id) - ); - $_POST['lang_id'] = GETPOST('lang_idrib'.GETPOST('companybankid', 'int'), 'alpha'); - $_POST['model'] = GETPOST('modelrib'.GETPOST('companybankid', 'int'), 'alpha'); - } - - $id = $socid; - $upload_dir = $conf->societe->multidir_output[$object->entity]; - include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';*/ - if (empty($last_main_doc_file) || !dol_is_file($conf->societe->multidir_output[$object->thirdparty->entity].'/' .dol_sanitizeFileName($object->thirdparty->id).'/' - .$langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref."-".dol_sanitizeFileName($object->rum).".pdf")) { + .$langs->transnoentitiesnoconv("SepaMandateShort").' '.$object->id."-".dol_sanitizeFileName($object->rum).".pdf")) { // It seems document has never been generated, or was generated and then deleted. // So we try to regenerate it with its default template. $defaulttemplate = 'sepamandate';