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

Fix regression in default set of accounting accounts

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-14 19:10:06 +01:00
parent 8954f7415b
commit e29ef08ee7
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -732,17 +732,16 @@ class AccountingAccount extends CommonObject
/** /**
* Return Suggest accounting accounts to bind * Return Suggest accounting accounts to bind
* *
* @param Societe $buyer Societe Object Buyers * @param Societe $buyer Object buyer
* @param $seller Company Object seller * @param Societe $seller Object seller
* @param Product $product Product object sell or buy * @param Product $product Product object sell or buy
* @param Facture $facture Facture * @param Facture $facture Facture
* @param FactureLigne $factureDet Facture Det * @param FactureLigne $factureDet Facture Det
* @param array $accountingAccount array of Account account * @param array $accountingAccount Array of Account account
* @param string $type Customer / Supplier * @param string $type Customer / Supplier
* * @return array Accounting accounts suggested
* @return array Accounting accounts suggested
*/ */
public function getAccountingCodeToBind(Societe $buyer, $seller, Product $product, Facture $facture, FactureLigne $factureDet, $accountingAccount = array(), $type = '') public function getAccountingCodeToBind(Societe $buyer, Societe $seller, Product $product, Facture $facture, FactureLigne $factureDet, $accountingAccount = array(), $type = '')
{ {
global $conf; global $conf;
global $hookmanager; global $hookmanager;
@ -755,21 +754,21 @@ class AccountingAccount extends CommonObject
$reshook = $hookmanager->executeHooks('accoutancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks('accoutancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks
if (empty($reshook)) { if (empty($reshook)) {
if ($type=='customer') { if ($type == 'customer') {
$const_name = "SOLD"; $const_name = "SOLD";
} elseif ($type=='supplier') { } elseif ($type == 'supplier') {
$const_name = "BUY"; $const_name = "BUY";
} }
require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
$isBuyerInEEC = isInEEC($buyer); $isBuyerInEEC = isInEEC($buyer);
$isSellerInEEC = isInEEC($seller); $isSellerInEEC = isInEEC($seller);
$code_l = ''; $code_l = ''; // Default value for generic product/service
$code_p = ''; $code_p = ''; // Value for the product/service in parameter ($product)
$code_t = ''; $code_t = ''; // Default value of product account for the thirdparty
$suggestedid = ''; $suggestedid = '';
// Level 1: Search suggested default account for product/service // Level 1 (define $code_l): Search suggested default account for product/service
$suggestedaccountingaccountbydefaultfor = ''; $suggestedaccountingaccountbydefaultfor = '';
if ($factureDet->product_type == 1) { if ($factureDet->product_type == 1) {
if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country) if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) { // If buyer in same country than seller (if not defined, we assume it is same country)
@ -814,7 +813,7 @@ class AccountingAccount extends CommonObject
$code_l = ''; $code_l = '';
} }
// Level 2: Search suggested account for product/service (similar code exists in page index.php to make automatic binding) // Level 2 (define $code_p): Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
$suggestedaccountingaccountfor = ''; $suggestedaccountingaccountfor = '';
if ((($buyer->country_code == $seller->country_code) || empty($buyer->country_code))) { if ((($buyer->country_code == $seller->country_code) || empty($buyer->country_code))) {
// If buyer in same country than seller (if not defined, we assume it is same country) // If buyer in same country than seller (if not defined, we assume it is same country)
@ -866,7 +865,7 @@ class AccountingAccount extends CommonObject
} }
} }
// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding) // Level 3 (define $code_t): Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) { if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
if (!empty($buyer->code_compta)) { if (!empty($buyer->code_compta)) {
$code_t = $buyer->code_compta; $code_t = $buyer->code_compta;
@ -888,6 +887,7 @@ class AccountingAccount extends CommonObject
$suggestedaccountingaccountfor = 'deposit'; $suggestedaccountingaccountfor = 'deposit';
} }
// If $suggestedid could not be guessed yet, we set it from the generic default accounting code $code_l
if (empty($suggestedid) && empty($code_p) && !empty($code_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) { if (empty($suggestedid) && empty($code_p) && !empty($code_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) {
if (empty($this->accountingaccount_codetotid_cache[$code_l])) { if (empty($this->accountingaccount_codetotid_cache[$code_l])) {
$tmpaccount = new self($this->db); $tmpaccount = new self($this->db);

6
htdocs/accountancy/customer/list.php
View File

@ -586,9 +586,9 @@ if ($result) {
$suggestedid=$return['suggestedid']; $suggestedid=$return['suggestedid'];
$suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor']; $suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
$suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor']; $suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor'];
$code_sell_l=$return['code_sell_l']; $code_sell_l=$return['code_l'];
$code_sell_p=$return['code_sell_p']; $code_sell_p=$return['code_p'];
$code_sell_t=$return['code_sell_t']; $code_sell_t=$return['code_t'];
} }
//var_dump($return); //var_dump($return);

6
htdocs/accountancy/supplier/list.php
View File

@ -595,9 +595,9 @@ if ($result) {
$suggestedid=$return['suggestedid']; $suggestedid=$return['suggestedid'];
$suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor']; $suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
$suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor']; $suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor'];
$code_buy_l=$return['code_buy_l']; $code_buy_l=$return['code_l'];
$code_buy_p=$return['code_buy_p']; $code_buy_p=$return['code_p'];
$code_buy_t=$return['code_buy_t']; $code_buy_t=$return['code_t'];
} }
//var_dump($return); //var_dump($return);