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

FIX Pb with VAT code when VAT code contains a number

Browse Source
This commit is contained in:
Laurent Destailleur 2021-01-15 19:43:02 +01:00
parent d36c406074
commit 7d37183f21
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/fourn/facture/card.php
View File

@ -656,10 +656,10 @@ if (empty($reshook))
if ($ret < 0) $error++; if ($ret < 0) $error++;
$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); $datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
$datedue = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']); $datedue = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
// Replacement invoice // Replacement invoice
if ($_POST['type'] == FactureFournisseur::TYPE_REPLACEMENT) if (GETPOST('type') == FactureFournisseur::TYPE_REPLACEMENT)
{ {
if ($datefacture == '') if ($datefacture == '')
{ {
@ -709,7 +709,7 @@ if (empty($reshook))
} }
// Credit note invoice // Credit note invoice
if ($_POST['type'] == FactureFournisseur::TYPE_CREDIT_NOTE) if (GETPOST('type') == FactureFournisseur::TYPE_CREDIT_NOTE)
{ {
$sourceinvoice = GETPOST('fac_avoir', 'int'); $sourceinvoice = GETPOST('fac_avoir', 'int');
if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE))
@ -828,7 +828,7 @@ if (empty($reshook))
} }
// Standard or deposit // Standard or deposit
if ($_POST['type'] == FactureFournisseur::TYPE_STANDARD || $_POST['type'] == FactureFournisseur::TYPE_DEPOSIT) if (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT)
{ {
if (GETPOST('socid', 'int') < 1) if (GETPOST('socid', 'int') < 1)
{ {
@ -857,10 +857,10 @@ if (empty($reshook))
$tmpproject = GETPOST('projectid', 'int'); $tmpproject = GETPOST('projectid', 'int');
// Creation facture // Creation facture
$object->ref = $_POST['ref']; $object->ref = GETPOST('ref', 'nohtml');
$object->ref_supplier = $_POST['ref_supplier']; $object->ref_supplier = GETPOST('ref_supplier', 'nohtml');
$object->socid = $_POST['socid']; $object->socid = GETPOST('socid', 'int');
$object->libelle = $_POST['label']; $object->libelle = GETPOST('label', 'nohtml');
$object->date = $datefacture; $object->date = $datefacture;
$object->date_echeance = $datedue; $object->date_echeance = $datedue;
$object->note_public = GETPOST('note_public', 'restricthtml'); $object->note_public = GETPOST('note_public', 'restricthtml');
@ -881,7 +881,7 @@ if (empty($reshook))
$object->fetch_thirdparty(); $object->fetch_thirdparty();
// If creation from another object of another module // If creation from another object of another module
if (!$error && $_POST['origin'] && $_POST['originid']) if (!$error && GETPOST('origin', 'alpha') && GETPOST('originid'))
{ {
// Parse element/subelement (ex: project_task) // Parse element/subelement (ex: project_task)
$element = $subelement = GETPOST('origin', 'alpha'); $element = $subelement = GETPOST('origin', 'alpha');
@ -1367,7 +1367,9 @@ if (empty($reshook))
$fk_unit = GETPOST('units', 'alpha'); $fk_unit = GETPOST('units', 'alpha');
$tva_tx = price2num($tva_tx); // When vat is text input field if (!preg_match('/\((.*)\)/', $tva_tx)) {
$tva_tx = price2num($tva_tx); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
}
// Local Taxes // Local Taxes
$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty); $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);