Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
This commit is contained in:
commit
70de814c3c
@ -69,7 +69,7 @@ if (! empty($conf->propal->enabled)) $propalstatic=new Propal($db);
|
|||||||
if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db);
|
if (! empty($conf->commande->enabled)) $orderstatic=new Commande($db);
|
||||||
if (! empty($conf->fournisseur->enabled)) $supplierorderstatic=new CommandeFournisseur($db);
|
if (! empty($conf->fournisseur->enabled)) $supplierorderstatic=new CommandeFournisseur($db);
|
||||||
|
|
||||||
llxHeader();
|
llxHeader("",$langs->trans("CommercialArea"));
|
||||||
|
|
||||||
print load_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png');
|
print load_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png');
|
||||||
|
|
||||||
|
|||||||
@ -285,7 +285,7 @@ if (empty($reshook))
|
|||||||
$object->name_alias = GETPOST('name_alias');
|
$object->name_alias = GETPOST('name_alias');
|
||||||
}
|
}
|
||||||
|
|
||||||
$object->address = GETPOST('address', 'alpha');
|
$object->address = GETPOST('address');
|
||||||
$object->zip = GETPOST('zipcode', 'alpha');
|
$object->zip = GETPOST('zipcode', 'alpha');
|
||||||
$object->town = GETPOST('town', 'alpha');
|
$object->town = GETPOST('town', 'alpha');
|
||||||
$object->country_id = GETPOST('country_id', 'int');
|
$object->country_id = GETPOST('country_id', 'int');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user