Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
ldestailleur
2025-09-04 17:32:58 +02:00
parent 5977e95200 f82283a22e
commit d7204bbb19
7 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/mailing/targetemailing.php
View File

@@ -782,7 +782,7 @@ if ($object->fetch($id) >= 0) {
print '</form>';
print "\n<!-- List o selected targets -->\n";
print "\n<!-- List of selected targets -->\n";
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';

10
htdocs/core/class/commoninvoice.class.php
View File

@@ -81,24 +81,24 @@ abstract class CommonInvoice extends CommonObject
public $date_lim_reglement;
/**
* @var ?int
* @var ?int Payment term ID
*/
public $cond_reglement_id; // Id in llx_c_paiement
/**
* @var string|int Code in llx_c_paiement
* @var string|int Code in llx_c_paiement
*/
public $cond_reglement_code; // Code in llx_c_paiement
/**
* @var string
* @var string Label in llx_c_paiement
*/
public $cond_reglement_label;
/**
* @var string Code in llx_c_paiement
* @var string Label for doc in llx_c_paiement
*/
public $cond_reglement_doc;
/**
* @var ?int
* @var ?int Payment method ID (cheque, cash, ...)
*/
public $mode_reglement_id;
/**

6
htdocs/core/class/commonobject.class.php
View File

@@ -447,19 +447,19 @@ abstract class CommonObject
public $barcode_type_coder;
/**
* @var int Payment method ID (cheque, cash, ...)
* @var ?int Payment method ID (cheque, cash, ...)
* @see setPaymentMethods()
*/
public $mode_reglement_id;
/**
* @var int Payment terms ID
* @var ?int Payment terms ID
* @see setPaymentTerms()
*/
public $cond_reglement_id;
/**
* @var int Demand reason ID
* @var ?int Demand reason ID
*/
public $demand_reason_id;

17
htdocs/fourn/class/fournisseur.commande.class.php
View File

@@ -217,32 +217,37 @@ class CommandeFournisseur extends CommonOrder
public $source;
/**
* @var int Payment conditions ID
* @var int ID
*/
public $fk_project;
/**
* @var ?int Payment conditions ID
*/
public $cond_reglement_id;
/**
* @var string Payment conditions code
* @var string Payment conditions code
*/
public $cond_reglement_code;
/**
* @var string Payment conditions label
* @var string Payment conditions label
*/
public $cond_reglement_label;
/**
* @var string Payment conditions label on documents
* @var string Payment conditions label on documents
*/
public $cond_reglement_doc;
/**
* @var int Account ID
* @var int Account ID
*/
public $fk_account;
/**
* @var int Payment choice ID
* @var ?int Payment choice ID
*/
public $mode_reglement_id;

4
htdocs/fourn/class/fournisseur.facture-rec.class.php
View File

@@ -156,7 +156,7 @@ class FactureFournisseurRec extends CommonInvoice
public $fk_project;
/**
* @var int
* @var ?int Payment method ID (cheque, cash, ...)
*/
public $mode_reglement_id;
/**
@@ -172,7 +172,7 @@ class FactureFournisseurRec extends CommonInvoice
*/
public $cond_reglement_doc;
/**
* @var int
* @var int Payment term ID
*/
public $cond_reglement_id;

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

@@ -1027,7 +1027,7 @@ if (empty($reshook)) {
$object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml');
$object->model_pdf = GETPOST('model', 'alphanohtml');
$object->fk_project = GETPOSTINT('projectid');
$object->cond_reglement_id = (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
$object->cond_reglement_id = (GETPOSTINT('type') == 3 ? 1 : GETPOSTINT('cond_reglement_id'));
$object->mode_reglement_id = GETPOSTINT('mode_reglement_id');
$object->fk_account = GETPOSTINT('fk_account');
$object->amount = (float) price2num(GETPOST('amount')); // FIXME: FactureFournisseur::$amount is deprecated and not used?

4
htdocs/societe/class/societe.class.php
View File

@@ -586,11 +586,11 @@ class Societe extends CommonObject
public $remise_supplier_percent;
/**
* @var int
* @var ?int Default Payment method ID (cheque, cash, ...)
*/
public $mode_reglement_id;
/**
* @var int
* @var ?int Default Payment term
*/
public $cond_reglement_id;
/**