Work on LNE
This commit is contained in:
parent
dad0061495
commit
7328aeacf9
6 changed files with 17 additions and 6 deletions
|
|
@ -223,7 +223,7 @@ $morehtmlcenter = '';
|
|||
|
||||
$registrationnumber = getHashUniqueIdOfRegistration();
|
||||
$texttop = '<small class="opacitymedium">'.$langs->trans("RegistrationNumber").':</small> <small>'.dol_trunc($registrationnumber, 10).'</small>';
|
||||
if (!isRegistrationDataSavedAndPushed()) {
|
||||
if ((!isRegistrationDataSavedAndPushed() || !isModEnabled('blockedlog')) && $mode != "forceregistration") {
|
||||
$texttop = '';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -265,9 +265,16 @@ function pdfCertifMentionblockedLog(&$pdf, $outputlangs, $seller, $default_font_
|
|||
{
|
||||
$result = 0;
|
||||
|
||||
if (in_array($seller->country_code, array('FR')) && isALNEQualifiedVersion()) { // If necessary, we could replace with "if isALNERunningVersion()"
|
||||
if (in_array($seller->country_code, array('FR'))) {
|
||||
$outputlangs->load("blockedlog");
|
||||
$blockedlog_mention = $outputlangs->transnoentitiesnoconv("InvoiceGeneratedWithLNECertifiedPOSSystem");
|
||||
|
||||
$isalne = isALNEQualifiedVersion(); // If necessary, we could replace with "if isALNERunningVersion()"
|
||||
if ($isalne == 'CERTIF_LNE_IS_2') {
|
||||
$blockedlog_mention = $outputlangs->transnoentitiesnoconv("InvoiceGeneratedWithLNECandidatePOSSystem");
|
||||
} else {
|
||||
$blockedlog_mention = $outputlangs->transnoentitiesnoconv("InvoiceGeneratedWithLNECertifiedPOSSystem");
|
||||
}
|
||||
|
||||
if ($blockedlog_mention) {
|
||||
$pdf->SetFont('', '', $default_font_size - 2);
|
||||
$pdf->SetXY($pdftemplate->marge_gauche, $posy);
|
||||
|
|
|
|||
|
|
@ -1907,7 +1907,8 @@ class pdf_crabe extends ModelePDFFactures
|
|||
$resteapayer = 0;
|
||||
}
|
||||
|
||||
if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && !getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS')) {
|
||||
if ((($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && !getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS'))
|
||||
|| isALNERunningVersion()) {
|
||||
// Already paid + Deposits
|
||||
$index++;
|
||||
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
|
||||
|
|
|
|||
|
|
@ -1997,7 +1997,7 @@ class pdf_octopus extends ModelePDFFactures
|
|||
if (! empty($object->paye)) $resteapayer=0;
|
||||
*/
|
||||
|
||||
if ($deja_regle > 0) {
|
||||
if ($deja_regle > 0 || isALNERunningVersion()) {
|
||||
// Already paid + Deposits
|
||||
$index++;
|
||||
|
||||
|
|
|
|||
|
|
@ -2264,7 +2264,8 @@ class pdf_sponge extends ModelePDFFactures
|
|||
$resteapayer_origin = 0;
|
||||
}
|
||||
|
||||
if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && !getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS')) {
|
||||
if ((($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && !getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS'))
|
||||
|| isALNERunningVersion()) {
|
||||
// Already paid + Deposits
|
||||
$index++;
|
||||
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ LNECertifiedVersionFR=This version is a certified version of application. More i
|
|||
LNECandidateVersionForCertificationFR=This version is a candidate version to become a LNE certified version. Not yet certified.
|
||||
NotCertifiedVersionFR=This version of application is technically compliant with the french VAT anti-fraud law (check any update of the law of your country), but you MUST get the compliant statement from an IT company to be allowed to use this software to collect payments from private individuals (ask your reseller or integrator to get this statement of compliance).
|
||||
InvoiceGeneratedWithLNECertifiedPOSSystem=Invoice generated with a LNE certified POS system
|
||||
InvoiceGeneratedWithLNECandidatePOSSystem=Invoice generated with a candidate for the LNE certified POS system
|
||||
TotalTTCIfInvoiceSeeCompleteDataForDetail=Event amount. Total including tax if invoice. See the column "complete data" for details.
|
||||
TypeOfEvent=Type of event
|
||||
TotalForAction=Total for event %s
|
||||
|
|
@ -124,3 +125,4 @@ DebugTools=Debug tools
|
|||
URLToForceRegistration=URL to force the registration
|
||||
URLToForcePushOfBlockedLogCounter=URL to force the push of the last unlaterable record counter
|
||||
UseThisFormToUpdate=Use this form to update your registration information
|
||||
ControlFile=Control the file
|
||||
|
|
|
|||
Loading…
Reference in a new issue