mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
Laurent Destailleur (aka Eldy)
commit
6d5dfe2c1d
|
|
@ -962,10 +962,10 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
|
|||
$filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
|
||||
}
|
||||
}
|
||||
if ($year) {
|
||||
if (!empty($year)) {
|
||||
$filename .= '_'.$year;
|
||||
}
|
||||
if ($month) {
|
||||
if (!empty($month)) {
|
||||
$filename .= '_'.$month;
|
||||
}
|
||||
if ($pagecount) {
|
||||
|
|
|
|||
|
|
@ -506,7 +506,7 @@ if ($nolinesbefore) {
|
|||
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
|
||||
$coldisplay++;
|
||||
print '<td class="nobottom linecoluseunit left">';
|
||||
print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
|
||||
print $form->selectUnits(empty($line->fk_unit) ? getDolGlobalInt('PRODUCT_USE_UNITS') : $line->fk_unit, "units");
|
||||
print '</td>';
|
||||
}
|
||||
$remise_percent = $buyer->remise_percent;
|
||||
|
|
|
|||
|
|
@ -62,11 +62,10 @@ NoPageYet=Encara sense pàgines
|
|||
YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
|
||||
SyntaxHelp=Ajuda sobre consells de sintaxi específica
|
||||
YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
|
||||
YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Podeu incloure codi PHP en aquesta font utilitzant les etiquetes <strong><?php ?>b70f65fc09 /span>. Les variables globals següents estan disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<span class='notranslate'><br><br><span class="fa fa-bug paddingright"></span> També podeu incloure contingut d'una altra pàgina/contenidor amb la sintaxi següent:<br> span><span class='notranslate'><strong><?php includeContainer('alias_of_container_to_include'); ?></strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Podeu fer una redirecció a una altra pàgina/contenidor amb la sintaxi següent (Nota: no envieu cap contingut abans d'una redirecció) :<br><strong><?php redirectToContainer('alias_of_container_to_redirect_to'); ?></strong><br>També podeu fer una redirecció amb els paràmetres GET: <br><strong><?php redirectToContainer('alias_to', 'redirect,_0_to', 'redirectTo' 0, $array_of_get_params); ?></strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Per afegir un enllaç a una altra pàgina, utilitzeu la sintaxi:<br><strong><a href="alias_of_page_to_link_to.php">mylink<0 class='notranslate'><</span>a></strong>b0319bzcc</strong>b0319bzcc ><br><p><span class="fa fa-bug paddingright">b014d7f165b Podeu configurar dinàmicament el títol de la pàgina i <span class='notranslate'><strong>Metaetiquetes de SEO</strong> (títol, paraules clau, descripció). Simplement definiu les variables següents:<br> <code>$__PAGE__TITLE__ = "Valor del títol...";b1z08a8b77 <br> <code>$__PAGE__KEYWORDS__ = "paraula clau1, paraula clau2, paraula clau3..."; // Separat per comes</code><br> <code>$___PAGE =Descripció ;</code></p><br>b0d9a138z0<br>b0d9a138 <span class='notranslate'></span> Per incloure un <strong>enllaç per baixar</strong> un fitxer emmagatzemat al class='notranslate'><strong>documents</strong>, utilitzeu el directori <strong>document.php</strong> wrapper:<br>Exemple, per a un fitxer en documents/ecm (cal registrar-se), la sintaxi és:<br><strong><a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"></strong><br>Per a un fitxer en documents o mitjans (directori obert per a l'accés públic), la sintaxi és: <br><strong><a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"></strong><br>Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la clau hash per compartir del fitxer), la sintaxi és:<br><strong><a href="/document.php?hashp=publicsharekeyoffile"> </strong><br>
|
||||
YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Per incloure un <strong>imatge</strong> emmagatzemat als <strong>mitjans de comunicació<span directori class='notranslate'></strong></span> (directori obert per a l'accés públic), utilitzeu el camí relatiu que comença per <strong>/mediasb0a65dc071f , exemple:<br><strong><img src="/medias/image/myimagepath/filename ext"></strong><br>
|
||||
YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Per incloure un <strong>imatge</strong> emmagatzemat als <strong>mitjans de comunicació<span directori</strong></span> (directori obert per a l'accés públic), utilitzeu el camí relatiu que comença per <strong>/mediasb0a65dc071f , exemple:<br><strong><img src="/medias/image/myimagepath/filename ext"></strong><br>
|
||||
YouCanEditHtmlSource2=Per a una imatge compartida amb un enllaç per compartir (accés obert mitjançant la clau hash per compartir del fitxer), utilitzeu l'embolcall:<br><strong> <img src="/viewimage.php?hashp=12345679012..."></strong>b0319bzcc
|
||||
YouCanEditHtmlSource3=Per a obtenir l'URL de la imatge d'un objecte PHP, utilitzeu<br><strong><img src="<?php print getImagePublicURLOfObject($object, 1, "_small") ?>"></strong><br>
|
||||
YouCanEditHtmlSource4=Per obtenir l'URL d'una imatge dins del contingut html d'un article, utilitzeu<br><strong> <img src="<?php print getImageFromHtmlContent($htmlcontent, 1) ?>"b0012c7z0</be08c7zc><span> span class='notranslate'></strong><br>
|
||||
YouCanEditHtmlSource4=Per obtenir l'URL d'una imatge dins del contingut html d'un article, utilitzeu<br><strong> <img src="<?php print getImageFromHtmlContent($htmlcontent, 1) ?>"></strong><br>
|
||||
YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
|
||||
ClonePage=Clona la pàgina/contenidor
|
||||
CloneSite=Clona el lloc
|
||||
|
|
|
|||
|
|
@ -56,17 +56,16 @@ ReadPerm=Læs
|
|||
WritePerm=Skriv
|
||||
TestDeployOnWeb=Test / implementer på nettet
|
||||
PreviewSiteServedByWebServer=<u> Se %s i en ny fane. </u> <br> <br> %s vil blive serveret af en ekstern webserver (som Apache, Nginx, IIS). Du skal installere og konfigurere denne server før du peger på biblioteket: <br> <strong> %s </strong> <br> URL serveret af ekstern server: <br> <strong> %s </strong>
|
||||
PreviewSiteServedByDolibarr=<u>Se forhåndsvisning af %s på en ny fane.</u><br><br>%s vil blive serveret af Dolibarr-serveren, så den behøver ikke nogen ekstra webserver (som Apache, Nginx, IIS) skal installeres.<br>Det ubelejlige er, at sidernes URL'er ikke er brugervenlige og starter med stien til din Dolibarr.<br>URL tjent af Dolibarr:<br><strong><span class='notranslate2ecz8b<04fec2ecz8b /span></strong><br><br>For at implementere eller teste ved hjælp af din egen eksterne webserver (som Apache, Nginx, Lighttp) bruger linket "%s".
|
||||
PreviewSiteServedByDolibarr=<u>Se forhåndsvisning af %s på en ny fane.</u><br><br>%s vil blive serveret af Dolibarr-serveren, så den behøver ikke nogen ekstra webserver (som Apache, Nginx, IIS) skal installeres.<br>Det ubelejlige er, at sidernes URL'er ikke er brugervenlige og starter med stien til din Dolibarr.<br>URL tjent af Dolibarr:<br><strong></strong><br><br>For at implementere eller teste ved hjælp af din egen eksterne webserver (som Apache, Nginx, Lighttp) bruger linket "%s".
|
||||
VirtualHostUrlNotDefined=URL til den virtuelle vært, der serveres af en ekstern webserver, der ikke er defineret
|
||||
NoPageYet=Ingen sider endnu
|
||||
YouCanCreatePageOrImportTemplate=Du kan oprette en ny side eller importere en fuld hjemmeside skabelon
|
||||
SyntaxHelp=Hjælp til specifikke syntax tips
|
||||
YouCanEditHtmlSourceckeditor=Du kan redigere HTML-kildekode ved hjælp af knappen "Kilde" i editoren.
|
||||
YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Du kan inkludere PHP-kode i denne kilde ved hjælp af tags <strong><?php ?><span class='01a66fccz01a665d9d0 </span>. Følgende globale variabler er tilgængelige: $conf, $db, $mysoc, $user, $websted, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Du kan også inkludere af en anden side/beholder med følgende syntaks:<br><strong><? php includeContainer('alias_of_container_to_include'); ?></strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Du kan foretage en omdirigering til en anden side/beholder med følgende syntaks (Bemærk: udskriv ikke nogen indhold før en omdirigering):<br><strong><?php redirectToContainer alias_of_container_to_redirect_to'); ?></strong><br>Du kan også lave en omdirigering med GET-parametre: <br><strong><?php redirectToContainer('container_to', 'container_alias_of', 'container_to' 0, 0, $array_of_get_params); ?></strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-link paddingright"></span> For at tilføje et link til en anden side skal du bruge syntaksen:<br> <strong><a href="alias_of_page_to_link_to.php"b0012c7z0</0be12c7z0 >mylink<span class='notranslate'><a></strong> <br><br><p>b02bd88d791translate'><spanlate'0 '></span> Du kan dynamisk indstille sidetitlen og <strong>SEO-metatags</strong>, søgeord, ). Definer blot følgende variabler:<br> <code>$__PAGE__TITLE__ = "Titelværdi …";<span class='notranslate67b'>7d08a8a67b>b316dz0 </span><br> <code>$__PAGE__KEYWORDS__ = "søgeord1, søgeord2, søgeord3 …"; // Kommasepareret</code><br> <code>____PAGE_DEscriptionSC ;</code></p><br>840d /span><span class='notranslate'></span> At inkludere et <strong>link til download</strong> en fil gemt i mappen <strong>documents</strong>, skal du bruge <strong>document.php</span> </strong> wrapper:<br>Eksempel, for en fil til dokumenter/ecm (skal logges), er syntaksen:<br><strong><a href="/document.php?modulepart=[ecm&file relative_dir/]filename.ext"></strong><br> tilFor en fil dokumenter/medier (åben mappe for offentlig adgang), syntaks er:<br><strong>< /span>a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"<span class='notranslate'>></strong> <br>For en fil, der deles med et delingslink (åben adgang ved hjælp af filens hash-nøgle), er syntaksen:<br><strong><a href="/document.php?hashp=publicsharekeyoffile"b0012c7dcbe</span087 ><span class='notranslate'></strong><br>
|
||||
YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> At inkludere en <strong>image</strong> gemt i <strong>medier</strong> Bibliotek (bibliotek åben for offentlig adgang), brug den relative sti, der starter med <strong>/medias</strong>, eksempel:<br><strong><img src="/medias/image/.myimagepath/filename" span class='notranslate'>></strong><br>
|
||||
YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> At inkludere en <strong>image</strong> gemt i <strong>medier</strong> Bibliotek (bibliotek åben for offentlig adgang), brug den relative sti, der starter med <strong>/medias</strong>, eksempel:<br><strong><img src="/medias/image/.myimagepath/filename"></strong><br>
|
||||
YouCanEditHtmlSource2=For et billede, der er delt med et delelink (åben adgang ved hjælp af filens hashnøgle til deling), skal du bruge wrapperen:<br><strong> <img src="/viewimage.php?hashp=12345679012..."> </strong><br>
|
||||
YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong><img src="<?php print getImagePublicURLOfObject($object, 1, "_small") ?>"></strong><br>
|
||||
YouCanEditHtmlSource4=For at få URL'en til et billede i et html-indhold i en artikel brug<br><strong> <img src="<?php print getImageFromHtmlContent($htmlcontent, 1) ?b0012c>b0012c>class ='notranslate'>></strong><br>
|
||||
YouCanEditHtmlSource4=For at få URL'en til et billede i et html-indhold i en artikel brug<br><strong> <img src="<?php print getImageFromHtmlContent($htmlcontent, 1) ?>"></strong><br>
|
||||
YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
|
||||
ClonePage=Klon side / container
|
||||
CloneSite=Klon website
|
||||
|
|
|
|||
|
|
@ -62,7 +62,10 @@ NoPageYet=No pages yet
|
|||
YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
|
||||
SyntaxHelp=Help on specific syntax tips
|
||||
YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
|
||||
YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong><?php ?></strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong><?php includeContainer('alias_of_container_to_include'); ?></strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong><?php redirectToContainer('alias_of_container_to_redirect_to'); ?></strong><br>You can also make a redirection with GET parameters:<br><strong><?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?></strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong><a href="alias_of_page_to_link_to.php">mylink<a></strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong><a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"></strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong><a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"></strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong><a href="/document.php?hashp=publicsharekeyoffile"></strong><br>
|
||||
YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong><?php ?></strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong><?php includeContainer('alias_of_container_to_include'); ?></strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong><?php redirectToContainer('alias_of_container_to_redirect_to'); ?></strong><br>You can also make a redirection with GET parameters:<br><strong><?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?></strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong><a href="alias_of_page_to_link_to.php">mylink<a></strong><br><br>
|
||||
YouCanEditHtmlSourceb=<span class="fa fa-bug paddingright"></span> You can dynamically set <strong>SEO title and meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE_TITLE__ = "Title value …";</code><br> <code>$__PAGE_KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE_DESC__ = "Description …";</code><br>
|
||||
YouCanEditHtmlSourcec=<span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong><a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"></strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong><a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"></strong><br>
|
||||
YouCanEditHtmlSourced=For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong><a href="/document.php?hashp=publicsharekeyoffile"></strong><br>
|
||||
YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong><img src="/medias/image/myimagepath/filename.ext"></strong><br>
|
||||
YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong><img src="/viewimage.php?hashp=12345679012..."></strong><br>
|
||||
YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong><img src="<?php print getImagePublicURLOfObject($object, 1, "_small") ?>"></strong><br>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ NoPageYet=Vēl nav nevienas lapas
|
|||
YouCanCreatePageOrImportTemplate=Jūs varat izveidot jaunu lapu vai importēt pilnu vietnes veidni
|
||||
SyntaxHelp=Palīdzība par konkrētiem sintakses padomiem
|
||||
YouCanEditHtmlSourceckeditor=Jūs varat rediģēt HTML avota kodu, izmantojot redaktorā pogu "Avots".
|
||||
YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Šajā avotā varat iekļaut PHP kodu, izmantojot tagus <strong><?php ?><span class='notranslate6fd70b10af6fd70 </span>. Ir pieejami šādi globālie mainīgie: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Varat iekļaut arī citas lapas/konteinera saturu ar šādu sintaksi:<br><strong><?php includeContainer('alias_of_includeer'); ?></strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Varat veikt novirzīšanu uz citu lapu/konteineru, izmantojot šādu sintaksi (piezīme: neizvadiet nevienu saturs pirms novirzīšanas):<br><strong><?php redirectToContainer alias_of_container_to_redirect_to'); ?></strong><br>Varat arī veikt novirzīšanu, izmantojot GET parametrus. <br><strong><?php redirectToContainer,'alias_of_container, 0, 0, $array_of_get_params); ?></strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Lai pievienotu saiti uz citu lapu, izmantojiet sintaksi:<br> <strong><a href="alias_of_page_to_link_to.php"b0012c7d0be</08c7d >mana saite<span class='notranslate'><a></strong> <br><br><p>b02bd88d791f12 classz0'no '></span> Varat dinamiski iestatīt lapas nosaukumu un <strong>SEO metatagus</strong>, ti, aprakstu ). Vienkārši definējiet šādus mainīgos:<br> <code>$__PAGE__TITLE__ = "Nosaukuma vērtība…";7b05d <br> <code>$__PAGE__KEYWORDS__ = "atslēgvārds1, atslēgvārds2, atslēgvārds…"; // Atdalīts ar komatu</code><br> <code>DESC___PAGE__ ;</code> /span></span> Lai iekļautu <strong>saiti, lai lejupielādētu</strong> failu kas saglabāti <strong>dokumentu</strong> direktorijā, izmantojiet <strong>. <span class='notranslate'></strong> iesaiņojums:<br>Piemērs, failam dokumentos/ecm (jāreģistrē), sintakse ir:<br><strong><a href="/document.php?modulepart=[ecm&fi relation_dir/]filename.ext"></strong><br> failā dokumenti/mediji (atvērts direktorijs publiskai piekļuvei), sintakse ir:<br><strong>< /span>a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"<span class='notranslate'>></strong> <br>Failam, kas kopīgots ar kopīgošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas jaucējatslēgu), sintakse ir šāda:<br><. span class='notranslate'><strong></span><a href="/document.php?hashp=publicsharekeyoffile"b0012c7dc0</span8c7d ><span class='notranslate'></strong><br>
|
||||
YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong><img src="/medias/image/myimagepath/filename.ext"></strong><br>
|
||||
YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong><img src="/viewimage.php?hashp=12345679012..."></strong><br>
|
||||
YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong><img src="<?php print getImagePublicURLOfObject($object, 1, "_small") ?>"></strong><br>
|
||||
|
|
|
|||
|
|
@ -4233,7 +4233,7 @@ class Societe extends CommonObject
|
|||
public function isACompany()
|
||||
{
|
||||
// Define if third party is treated as company (or not) when nature is unknown
|
||||
$isACompany = getDolGlobalInt('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES');
|
||||
$isACompany = getDolGlobalInt('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES', 1); // default if not set is 1 because it was like this in all past versions
|
||||
|
||||
// Now try to guess using different tips
|
||||
if (!empty($this->tva_intra)) {
|
||||
|
|
@ -4241,12 +4241,9 @@ class Societe extends CommonObject
|
|||
} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
|
||||
$isACompany = 1;
|
||||
} else {
|
||||
if (!getDolGlobalString('MAIN_CUSTOMERS_ARE_COMPANIES_EVEN_IF_SET_AS_INDIVIDUAL')) {
|
||||
// TODO Add a field is_a_company into dictionary
|
||||
if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
|
||||
if (!getDolGlobalString('MAIN_CUSTOMERS_ARE_COMPANIES_EVEN_IF_SET_AS_INDIVIDUAL')) { // never or rarely set
|
||||
if (preg_match('/^TE_PRIVATE/', $this->typent_code)) { // TODO Add a field is_a_company into dictionary
|
||||
$isACompany = 0;
|
||||
} else {
|
||||
$isACompany = 1;
|
||||
}
|
||||
} else {
|
||||
$isACompany = 1;
|
||||
|
|
|
|||
|
|
@ -3788,6 +3788,9 @@ if (!GETPOST('hide_websitemenu')) {
|
|||
|
||||
$htmltext = '<small>';
|
||||
$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource", $url);
|
||||
$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourceb", $url);
|
||||
$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourcec", $url);
|
||||
$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourced", $url);
|
||||
$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource1", $url);
|
||||
$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource2", $url);
|
||||
$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource3", $url);
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ __(AnotherContainer)__
|
|||
<section id="div5" style="text-align: center" contenteditable="true">
|
||||
<br><br>
|
||||
__(YouCanEditHtmlSource)__
|
||||
__(YouCanEditHtmlSourceb)__
|
||||
__(YouCanEditHtmlSourcec)__
|
||||
__(YouCanEditHtmlSourced)__
|
||||
<br><br>
|
||||
Page created by __WEBSITE_CREATED_BY__
|
||||
<br>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user