lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12882 from simnandez/11.0

Browse Source 
FIX In third parties creation, when changing the country drop down, the states are not reloaded
This commit is contained in:
Laurent Destailleur 2020-01-18 19:37:29 +01:00 committed by GitHub
commit 3748da6ee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
htdocs/societe/card.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2017 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2008 Patrick Raguin <patrick.raguin@auguria.net>
* Copyright (C) 2010-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2020 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2013 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
@ -1070,13 +1070,13 @@ else
$linkback = "";
print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'building');
if (!empty($conf->use_javascript_ajax) && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
{
print "\n".'<script type="text/javascript">';
print '$(document).ready(function () {
if (!empty($conf->use_javascript_ajax)) {
if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
print "\n" . '<script type="text/javascript">';
print '$(document).ready(function () {
id_te_private=8;
id_ef15=1;
is_private='.$private.';
is_private=' . $private . ';
if (is_private) {
$(".individualline").show();
} else {
@ -1103,7 +1103,7 @@ else
});
function init_customer_categ() {
console.log("is customer or prospect = "+jQuery("#customerprospect").val());
if (jQuery("#customerprospect").val() == 0 && (jQuery("#fournisseur").val() == 0 || '.(empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER) ? '1' : '0').'))
if (jQuery("#customerprospect").val() == 0 && (jQuery("#fournisseur").val() == 0 || ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER) ? '1' : '0') . '))
{
jQuery(".visibleifcustomer").hide();
}
@ -1134,28 +1134,38 @@ else
document.formsoc.submit();
});
});';
print '</script>'."\n";
print '</script>' . "\n";
print '<div id="selectthirdpartytype">';
print '<div class="hideonsmartphone float">';
print $langs->trans("ThirdPartyType").': &nbsp; &nbsp; ';
print '</div>';
print '<label for="radiocompany" class="radiocompany">';
print '<input type="radio" id="radiocompany" class="flat" name="private" value="0"'.($private ? '' : ' checked').'>';
print '&nbsp;';
print $langs->trans("CreateThirdPartyOnly");
print '</label>';
print ' &nbsp; &nbsp; ';
print '<label for="radioprivate" class="radioprivate">';
$text = '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private ? ' checked' : '').'>';
$text .= '&nbsp;';
$text .= $langs->trans("CreateThirdPartyAndContact");
$htmltext = $langs->trans("ToCreateContactWithSameName");
print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
print '</label>';
print '</div>';
print "<br>\n";
}
print '<div id="selectthirdpartytype">';
print '<div class="hideonsmartphone float">';
print $langs->trans("ThirdPartyType") . ': &nbsp; &nbsp; ';
print '</div>';
print '<label for="radiocompany" class="radiocompany">';
print '<input type="radio" id="radiocompany" class="flat" name="private" value="0"' . ($private ? '' : ' checked') . '>';
print '&nbsp;';
print $langs->trans("CreateThirdPartyOnly");
print '</label>';
print ' &nbsp; &nbsp; ';
print '<label for="radioprivate" class="radioprivate">';
$text = '<input type="radio" id="radioprivate" class="flat" name="private" value="1"' . ($private ? ' checked' : '') . '>';
$text .= '&nbsp;';
$text .= $langs->trans("CreateThirdPartyAndContact");
$htmltext = $langs->trans("ToCreateContactWithSameName");
print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
print '</label>';
print '</div>';
print "<br>\n";
} else {
print '<script type="text/javascript">';
print '$(document).ready(function () {
$("#selectcountry_id").change(function() {
document.formsoc.action.value="create";
document.formsoc.submit();
});
});';
print '</script>' . "\n";
}
}
dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');