@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | if (getDolGlobalString($paramcreditorlong)) { |
| 151 | 151 | $creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show |
| 152 | 152 | } elseif (getDolGlobalString($paramcreditor)) { |
| 153 | - $creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show |
|
| 153 | + $creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | // Set by newpayment.php |
| 280 | 280 | $currencyCodeType = $_SESSION['currencyCodeType']; |
| 281 | 281 | $FinalPaymentAmt = $_SESSION["FinalPaymentAmt"]; |
| 282 | - $paymentType = $_SESSION['PaymentType']; // Value can be 'Mark', 'Sole', 'Sale' for example |
|
| 282 | + $paymentType = $_SESSION['PaymentType']; // Value can be 'Mark', 'Sole', 'Sale' for example |
|
| 283 | 283 | // From env |
| 284 | 284 | $ipaddress = $_SESSION['ipaddress']; |
| 285 | 285 | |
@@ -382,10 +382,10 @@ discard block |
||
| 382 | 382 | $ipaddress = $_SESSION['ipaddress']; |
| 383 | 383 | } |
| 384 | 384 | if (empty($TRANSACTIONID)) { |
| 385 | - $TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_... |
|
| 385 | + $TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_... |
|
| 386 | 386 | if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) { |
| 387 | 387 | // For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2 |
| 388 | - $TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml'); |
|
| 388 | + $TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml'); |
|
| 389 | 389 | } |
| 390 | 390 | } |
| 391 | 391 | if (empty($FinalPaymentAmt)) { |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | |
| 491 | 491 | // Set amount for the subscription: |
| 492 | 492 | // - First check the amount of the member type. |
| 493 | - $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
| 493 | + $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
| 494 | 494 | $amountexpected = empty($amountbytype[$typeid]) ? 0 : $amountbytype[$typeid]; |
| 495 | 495 | // - If not found, take the default amount |
| 496 | 496 | if (empty($amountexpected) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) { |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | dol_syslog("Failed to validate member (bad currency check): " . $errmsg, LOG_ERR, 0, '_payment'); |
| 528 | 528 | } |
| 529 | 529 | |
| 530 | - if (! $error) { |
|
| 530 | + if (!$error) { |
|
| 531 | 531 | // We validate the member (no effect if it is already validated) |
| 532 | 532 | $result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible |
| 533 | 533 | if ($result < 0 || empty($object->datevalid)) { |
@@ -690,7 +690,7 @@ discard block |
||
| 690 | 690 | $thirdparty = new Societe($db); |
| 691 | 691 | $thirdparty->fetch($thirdparty_id); |
| 692 | 692 | |
| 693 | - include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php'; // This also set $stripearrayofkeysbyenv |
|
| 693 | + include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php'; // This also set $stripearrayofkeysbyenv |
|
| 694 | 694 | $stripe = new Stripe($db); |
| 695 | 695 | //$stripeacc = $stripe->getStripeAccount($service); Already defined previously |
| 696 | 696 | |
@@ -705,7 +705,7 @@ discard block |
||
| 705 | 705 | |
| 706 | 706 | if (preg_match('/^pi_/', $TRANSACTIONID)) { |
| 707 | 707 | // This may throw an error if not found. |
| 708 | - $chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID); // payment_intent (pi_...) |
|
| 708 | + $chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID); // payment_intent (pi_...) |
|
| 709 | 709 | } else { |
| 710 | 710 | // This throw an error if not found |
| 711 | 711 | $chpi = \Stripe\Charge::retrieve($TRANSACTIONID); // old method, contains the charge id (ch_...) |
@@ -908,7 +908,7 @@ discard block |
||
| 908 | 908 | $paiement->paiementid = $paymentTypeId; |
| 909 | 909 | $paiement->num_payment = ''; |
| 910 | 910 | $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
| 911 | - $paiement->ext_payment_id = $TRANSACTIONID; // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue. |
|
| 911 | + $paiement->ext_payment_id = $TRANSACTIONID; // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue. |
|
| 912 | 912 | //$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer->id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key']; // TODO LDR It would be better if we could store this. Do we have customer->id and publishable_key ? |
| 913 | 913 | $paiement->ext_payment_site = $service; |
| 914 | 914 | |
@@ -1037,8 +1037,8 @@ discard block |
||
| 1037 | 1037 | $paiement->paiementid = $paymentTypeId; |
| 1038 | 1038 | $paiement->num_payment = ''; |
| 1039 | 1039 | $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
| 1040 | - $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ... |
|
| 1041 | - $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ... |
|
| 1040 | + $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ... |
|
| 1041 | + $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ... |
|
| 1042 | 1042 | |
| 1043 | 1043 | if (!$error) { |
| 1044 | 1044 | $paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | $paiement->datep = $now; |
| 1170 | 1170 | $paiement->paymenttype = $paymentTypeId; |
| 1171 | 1171 | $paiement->num_payment = ''; |
| 1172 | - $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
|
| 1172 | + $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
|
| 1173 | 1173 | $paiement->ext_payment_id = $TRANSACTIONID; |
| 1174 | 1174 | $paiement->ext_payment_site = $service; |
| 1175 | 1175 | |
@@ -1386,7 +1386,7 @@ discard block |
||
| 1386 | 1386 | $db->rollback(); |
| 1387 | 1387 | } |
| 1388 | 1388 | |
| 1389 | - if (! $error) { |
|
| 1389 | + if (!$error) { |
|
| 1390 | 1390 | // Sending mail |
| 1391 | 1391 | $thirdparty = new Societe($db); |
| 1392 | 1392 | $resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc); |
@@ -1749,8 +1749,8 @@ discard block |
||
| 1749 | 1749 | $paiement->paiementid = $paymentTypeId; |
| 1750 | 1750 | $paiement->num_payment = ''; |
| 1751 | 1751 | $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
| 1752 | - $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ... |
|
| 1753 | - $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ... |
|
| 1752 | + $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ... |
|
| 1753 | + $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ... |
|
| 1754 | 1754 | |
| 1755 | 1755 | if (!$error) { |
| 1756 | 1756 | $paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents |
@@ -1847,7 +1847,7 @@ discard block |
||
| 1847 | 1847 | // Set by newpayment.php |
| 1848 | 1848 | $currencyCodeType = empty($_SESSION['currencyCodeType']) ? '' : $_SESSION['currencyCodeType']; |
| 1849 | 1849 | $FinalPaymentAmt = empty($_SESSION["FinalPaymentAmt"]) ? '' : $_SESSION["FinalPaymentAmt"]; |
| 1850 | - $paymentType = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType']; // Seems used by paypal only |
|
| 1850 | + $paymentType = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType']; // Seems used by paypal only |
|
| 1851 | 1851 | |
| 1852 | 1852 | if (is_object($object) && method_exists($object, 'call_trigger')) { |
| 1853 | 1853 | // Call trigger |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) { |
| 407 | 407 | // It seems document has never been generated, or was generated and then deleted. |
| 408 | 408 | // So we try to regenerate it with its default template. |
| 409 | - $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 409 | + $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 410 | 410 | $object->generateDocument($defaulttemplate, $langs); |
| 411 | 411 | } |
| 412 | 412 | |
@@ -477,7 +477,7 @@ discard block |
||
| 477 | 477 | if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) { |
| 478 | 478 | // It seems document has never been generated, or was generated and then deleted. |
| 479 | 479 | // So we try to regenerate it with its default template. |
| 480 | - $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 480 | + $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 481 | 481 | $object->generateDocument($defaulttemplate, $langs); |
| 482 | 482 | } |
| 483 | 483 | |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) { |
| 529 | 529 | // It seems document has never been generated, or was generated and then deleted. |
| 530 | 530 | // So we try to regenerate it with its default template. |
| 531 | - $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 531 | + $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 532 | 532 | $object->generateDocument($defaulttemplate, $langs); |
| 533 | 533 | } |
| 534 | 534 | |
@@ -634,7 +634,7 @@ discard block |
||
| 634 | 634 | if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) { |
| 635 | 635 | // It seems document has never been generated, or was generated and then deleted. |
| 636 | 636 | // So we try to regenerate it with its default template. |
| 637 | - $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 637 | + $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 638 | 638 | $object->generateDocument($defaulttemplate, $langs); |
| 639 | 639 | } |
| 640 | 640 | $directdownloadlink = $object->getLastMainDocLink('', 0, 0); |
@@ -683,7 +683,7 @@ discard block |
||
| 683 | 683 | if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) { |
| 684 | 684 | // It seems document has never been generated, or was generated and then deleted. |
| 685 | 685 | // So we try to regenerate it with its default template. |
| 686 | - $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 686 | + $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used. |
|
| 687 | 687 | $object->generateDocument($defaulttemplate, $langs); |
| 688 | 688 | } |
| 689 | 689 | |
@@ -685,7 +685,7 @@ |
||
| 685 | 685 | //print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n"; |
| 686 | 686 | // Other attributes |
| 687 | 687 | $parameters['tdclass'] = 'titlefieldauto'; |
| 688 | -$parameters['tpl_context'] = 'public'; // define template context to public |
|
| 688 | +$parameters['tpl_context'] = 'public'; // define template context to public |
|
| 689 | 689 | include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php'; |
| 690 | 690 | // Comments |
| 691 | 691 | print '<tr>'; |
@@ -45,11 +45,11 @@ discard block |
||
| 45 | 45 | if (!defined("NOSESSION")) { |
| 46 | 46 | define("NOSESSION", '1'); |
| 47 | 47 | } |
| 48 | -if (! defined('NOREQUIREHTML')) { |
|
| 49 | - define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php |
|
| 48 | +if (!defined('NOREQUIREHTML')) { |
|
| 49 | + define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php |
|
| 50 | 50 | } |
| 51 | -if (! defined('NOREQUIREAJAX')) { |
|
| 52 | - define('NOREQUIREAJAX', '1'); // Do not load ajax.lib.php library |
|
| 51 | +if (!defined('NOREQUIREAJAX')) { |
|
| 52 | + define('NOREQUIREAJAX', '1'); // Do not load ajax.lib.php library |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | $mtid = GETPOST('mtid'); |
| 65 | 65 | $email = GETPOST('email'); |
| 66 | -$tag = GETPOST('tag'); // To retrieve the emailing, and recipient |
|
| 66 | +$tag = GETPOST('tag'); // To retrieve the emailing, and recipient |
|
| 67 | 67 | $unsuscrib = GETPOST('unsuscrib'); |
| 68 | 68 | $securitykey = GETPOST('securitykey'); |
| 69 | 69 | |
@@ -158,7 +158,7 @@ |
||
| 158 | 158 | )); |
| 159 | 159 | |
| 160 | 160 | // Retrieve all extrafields if not already not know (should not happen) |
| 161 | - if (! is_object($extrafields)) { |
|
| 161 | + if (!is_object($extrafields)) { |
|
| 162 | 162 | $extrafields = new ExtraFields($this->db); |
| 163 | 163 | $extrafields->fetch_name_optionals_label($product->table_element); |
| 164 | 164 | } |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 171 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 172 | 172 | /** |
| 173 | 173 | * List all price expressions |
| 174 | 174 | * |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | public function list_price_expression() |
| 178 | 178 | { |
| 179 | - // phpcs:enable |
|
| 179 | + // phpcs:enable |
|
| 180 | 180 | $sql = "SELECT rowid, title, expression"; |
| 181 | 181 | $sql .= " FROM " . $this->db->prefix() . $this->table_element; |
| 182 | 182 | $sql .= " ORDER BY title"; |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | |
| 206 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 206 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 207 | 207 | /** |
| 208 | 208 | * Returns any existing rowid with specified title |
| 209 | 209 | * |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | public function find_title($title) |
| 214 | 214 | { |
| 215 | - // phpcs:enable |
|
| 215 | + // phpcs:enable |
|
| 216 | 216 | $sql = "SELECT rowid"; |
| 217 | 217 | $sql .= " FROM " . $this->db->prefix() . $this->table_element; |
| 218 | 218 | $sql .= " WHERE title = '" . $this->db->escape($title) . "'"; |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | return 1; |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 561 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 562 | 562 | /** |
| 563 | 563 | * Update next_update into database |
| 564 | 564 | * |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | */ |
| 570 | 570 | public function update_next_update($next_update, $user = null, $notrigger = 0) |
| 571 | 571 | { |
| 572 | - // phpcs:enable |
|
| 572 | + // phpcs:enable |
|
| 573 | 573 | $error = 0; |
| 574 | 574 | |
| 575 | 575 | $this->next_update = $next_update; |
@@ -603,7 +603,7 @@ discard block |
||
| 603 | 603 | } |
| 604 | 604 | } |
| 605 | 605 | |
| 606 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 606 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
| 607 | 607 | /** |
| 608 | 608 | * Update last_status into database |
| 609 | 609 | * |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | */ |
| 615 | 615 | public function update_status($last_status, $user = null, $notrigger = 0) |
| 616 | 616 | { |
| 617 | - // phpcs:enable |
|
| 617 | + // phpcs:enable |
|
| 618 | 618 | $error = 0; |
| 619 | 619 | |
| 620 | 620 | $this->last_status = $last_status; |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | $action = GETPOST('action', 'aZ09'); |
| 51 | 51 | $value = GETPOST('value', 'alpha'); |
| 52 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 52 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 53 | 53 | |
| 54 | 54 | $label = GETPOST('label', 'alpha'); |
| 55 | 55 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | // type can be empty string or 0 or 1 |
| 51 | 51 | $type = GETPOST('type', 'int'); |
| 52 | 52 | $mode = GETPOSTINT('mode'); |
| 53 | -$status = ((GETPOSTINT('status') >= 0) ? GETPOSTINT('status') : - 1); // status buy when mode = customer , status purchase when mode = supplier |
|
| 54 | -$status_purchase = ((GETPOSTINT('status_purchase') >= 0) ? GETPOSTINT('status_purchase') : - 1); // status purchase when mode = customer |
|
| 53 | +$status = ((GETPOSTINT('status') >= 0) ? GETPOSTINT('status') : - 1); // status buy when mode = customer , status purchase when mode = supplier |
|
| 54 | +$status_purchase = ((GETPOSTINT('status_purchase') >= 0) ? GETPOSTINT('status_purchase') : - 1); // status purchase when mode = customer |
|
| 55 | 55 | $outjson = (GETPOSTINT('outjson') ? GETPOSTINT('outjson') : 0); |
| 56 | 56 | $price_level = GETPOSTINT('price_level'); |
| 57 | 57 | $action = GETPOST('action', 'aZ09'); |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | // Multiprice (1 price per level) |
| 165 | 165 | if (!$found && isset($price_level) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) { // If we need a particular price level (from 1 to 6) |
| 166 | 166 | $sql = "SELECT price, price_ttc, price_base_type,"; |
| 167 | - $sql .= " tva_tx, default_vat_code"; // Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on. |
|
| 167 | + $sql .= " tva_tx, default_vat_code"; // Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on. |
|
| 168 | 168 | $sql .= " FROM " . MAIN_DB_PREFIX . "product_price "; |
| 169 | 169 | $sql .= " WHERE fk_product = " . ((int) $id); |
| 170 | 170 | $sql .= " AND entity IN (" . getEntity('productprice') . ")"; |
@@ -177,12 +177,12 @@ discard block |
||
| 177 | 177 | $objp = $db->fetch_object($result); |
| 178 | 178 | if ($objp) { |
| 179 | 179 | $found = true; |
| 180 | - $outprice_ht = price($objp->price); // formatted for language user because is inserted into input field |
|
| 181 | - $outprice_ttc = price($objp->price_ttc); // formatted for language user because is inserted into input field |
|
| 180 | + $outprice_ht = price($objp->price); // formatted for language user because is inserted into input field |
|
| 181 | + $outprice_ttc = price($objp->price_ttc); // formatted for language user because is inserted into input field |
|
| 182 | 182 | $outpricebasetype = $objp->price_base_type; |
| 183 | 183 | if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) { |
| 184 | 184 | $outtva_tx_formated = price($objp->tva_tx); // formatted for language user because is inserted into input field |
| 185 | - $outtva_tx = price2num($objp->tva_tx); // international numeric |
|
| 185 | + $outtva_tx = price2num($objp->tva_tx); // international numeric |
|
| 186 | 186 | $outdefault_vat_code = $objp->default_vat_code; |
| 187 | 187 | } else { |
| 188 | 188 | // The common and default behaviour. |
@@ -226,8 +226,8 @@ discard block |
||
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | // VAT to use and default VAT for product are set to same value by default |
| 229 | - $product_outtva_tx_formated = $outtva_tx_formated; |
|
| 230 | - $product_outtva_tx = $outtva_tx; |
|
| 229 | + $product_outtva_tx_formated = $outtva_tx_formated; |
|
| 230 | + $product_outtva_tx = $outtva_tx; |
|
| 231 | 231 | $product_outdefault_vat_code = $outdefault_vat_code; |
| 232 | 232 | |
| 233 | 233 | // If we ask the price according to buyer, we change it. |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | $match = preg_grep('/(' . preg_quote($htmlname, '/') . '[0-9]+)/', array_keys($_GET)); |
| 296 | 296 | sort($match); |
| 297 | 297 | |
| 298 | - $idprod = (empty($match[0]) ? '' : $match[0]); // Take first key found into GET array with matching $htmlname123 |
|
| 298 | + $idprod = (empty($match[0]) ? '' : $match[0]); // Take first key found into GET array with matching $htmlname123 |
|
| 299 | 299 | |
| 300 | 300 | if (GETPOST($htmlname, 'alpha') == '' && (!$idprod || !GETPOST($idprod, 'alpha'))) { |
| 301 | 301 | print json_encode(array()); |