mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-08 00:52:01 +01:00
Debug v23
This commit is contained in:
@@ -932,7 +932,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
|
||||
// If customer code was forced to "required", we ask it at creation to avoid error later
|
||||
if (getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) {
|
||||
$tmpcompany = new Societe($db);
|
||||
$tmpcompany->name = $companyname;
|
||||
$tmpcompany->name = (string) $companyname;
|
||||
$tmpcompany->get_codeclient($tmpcompany, 0);
|
||||
$customercode = $tmpcompany->code_client;
|
||||
$formquestion[] = array(
|
||||
|
||||
@@ -5092,6 +5092,7 @@ if ($action == 'create') {
|
||||
if ($objectidnext && $statusreplacement == 0) {
|
||||
print '<div class="error">'.$langs->trans("ErrorCantCancelIfReplacementInvoiceNotValidated").'</div>';
|
||||
} else {
|
||||
$close = array();
|
||||
// Code
|
||||
$close[1]['code'] = 'badcustomer';
|
||||
$close[2]['code'] = 'abandon';
|
||||
|
||||
@@ -5512,7 +5512,7 @@ abstract class CommonObject
|
||||
$product_static = new Product($this->db);
|
||||
$product_static->fetch($line->fk_product);
|
||||
|
||||
$product_static->ref = $line->ref; //can change ref in hook
|
||||
$product_static->ref = (string) $line->ref; //can change ref in hook
|
||||
$product_static->label = !empty($line->label) ? $line->label : ""; //can change label in hook
|
||||
|
||||
$text = $product_static->getNomUrl(1);
|
||||
@@ -5729,7 +5729,7 @@ abstract class CommonObject
|
||||
} elseif (!empty($line->fk_product)) {
|
||||
$productstatic = new Product($this->db);
|
||||
$productstatic->id = $line->fk_product;
|
||||
$productstatic->ref = $line->ref;
|
||||
$productstatic->ref = (string) $line->ref;
|
||||
$productstatic->type = $line->fk_product_type;
|
||||
if (empty($productstatic->ref)) {
|
||||
$line->fetch_product();
|
||||
|
||||
@@ -331,7 +331,7 @@ class MouvementStock extends CommonObject
|
||||
if (getDolGlobalInt('PRODUIT_SOUSPRODUITS')) {
|
||||
$productChildrenNb = $product->hasFatherOrChild(1);
|
||||
}
|
||||
if (($product->type != Product::TYPE_SERVICE || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) && ($productChildrenNb == 0 || getDolGlobalInt('PRODUIT_SOUSPRODUITS_ALSO_ENABLE_PARENT_STOCK_MOVE'))) {
|
||||
if ($product->isStockManaged() && ($productChildrenNb == 0 || getDolGlobalInt('PRODUIT_SOUSPRODUITS_ALSO_ENABLE_PARENT_STOCK_MOVE'))) {
|
||||
$movestock = 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -4672,7 +4672,7 @@ class Societe extends CommonObject
|
||||
}
|
||||
}
|
||||
|
||||
$name = $socname;
|
||||
$name = (string) $socname;
|
||||
$alias = $socalias ? $socalias : '';
|
||||
|
||||
// Positionne parameters
|
||||
|
||||
@@ -1431,6 +1431,8 @@ if (getDolGlobalString('TAKEPOS_DIRECT_PAYMENT')) {
|
||||
$menus[$r++] = array('title' => '<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("DirectPayment").' <span class="opacitymedium">('.$langs->trans("Cash").')</span></div>', 'action' => 'DirectPayment();');
|
||||
}
|
||||
|
||||
$customprinterallowed = false;
|
||||
|
||||
// BAR RESTAURANT specific menu
|
||||
if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
|
||||
// Button to print receipt before payment
|
||||
|
||||
Reference in New Issue
Block a user