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

Merge branch '16a12_assets_code' of https://github.com/aspangaro/dolibarr into 16a12_assets_code

Browse Source
This commit is contained in:
Alexandre SPANGARO 2022-02-14 04:52:54 +01:00
commit 1cc8428f53
1 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
htdocs/accountancy/class/accountingjournal.class.php
View File

@ -394,12 +394,12 @@ class AccountingJournal extends CommonObject
case 1: // Various Journal case 1: // Various Journal
$data = $this->getAssetData($user, $type, $date_start, $date_end, $in_bookkeeping); $data = $this->getAssetData($user, $type, $date_start, $date_end, $in_bookkeeping);
break; break;
// case 2: // Sells Journal // case 2: // Sells Journal
// case 3: // Purchases Journal // case 3: // Purchases Journal
// case 4: // Bank Journal // case 4: // Bank Journal
// case 5: // Expense reports Journal // case 5: // Expense reports Journal
// case 8: // Inventory Journal // case 8: // Inventory Journal
// case 9: // hasnew Journal // case 9: // hasnew Journal
} }
} }
@ -519,8 +519,8 @@ class AccountingJournal extends CommonObject
$journal_data = array(); $journal_data = array();
foreach ($pre_data['elements'] as $pre_data_id => $pre_data_info) { foreach ($pre_data['elements'] as $pre_data_id => $pre_data_info) {
$element_static->id = $pre_data_id; $element_static->id = $pre_data_id;
$element_static->ref = (string)$pre_data_info["ref"]; $element_static->ref = (string) $pre_data_info["ref"];
$element_static->label = (string)$pre_data_info["label"]; $element_static->label = (string) $pre_data_info["label"];
$element_static->acquisition_value_ht = $pre_data_info["acquisition_value_ht"]; $element_static->acquisition_value_ht = $pre_data_info["acquisition_value_ht"];
$element_link = $element_static->getNomUrl(1, 'with_label'); $element_link = $element_static->getNomUrl(1, 'with_label');
@ -655,7 +655,7 @@ class AccountingJournal extends CommonObject
$lines[0][$accountancy_code_depreciation_asset] = -$last_cumulative_amount_ht; $lines[0][$accountancy_code_depreciation_asset] = -$last_cumulative_amount_ht;
$lines[0][$accountancy_code_asset] = $element_static->acquisition_value_ht; $lines[0][$accountancy_code_asset] = $element_static->acquisition_value_ht;
$disposal_amount_vat = $disposal_subject_to_vat ? (double)price2num($disposal_amount * $disposal_vat / 100, 'MT') : 0; $disposal_amount_vat = $disposal_subject_to_vat ? (double) price2num($disposal_amount * $disposal_vat / 100, 'MT') : 0;
$lines[1][$accountancy_code_receivable_on_assignment] = -($disposal_amount + $disposal_amount_vat); $lines[1][$accountancy_code_receivable_on_assignment] = -($disposal_amount + $disposal_amount_vat);
if ($disposal_subject_to_vat) $lines[1][$accountancy_code_vat_collected] = $disposal_amount_vat; if ($disposal_subject_to_vat) $lines[1][$accountancy_code_vat_collected] = $disposal_amount_vat;
$lines[1][$accountancy_code_proceeds_from_sales] = $disposal_amount; $lines[1][$accountancy_code_proceeds_from_sales] = $disposal_amount;
@ -857,19 +857,19 @@ class AccountingJournal extends CommonObject
$this->errors[] = $bookkeeping->errorsToString(); $this->errors[] = $bookkeeping->errorsToString();
} }
} }
// //
// if (!$error_for_line && !empty($conf->asset->enabled) && $this->nature == 1 && $bookkeeping->fk_doc > 0) { // if (!$error_for_line && !empty($conf->asset->enabled) && $this->nature == 1 && $bookkeeping->fk_doc > 0) {
// // Set last cumulative depreciation // // Set last cumulative depreciation
// require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php'; // require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
// $asset = new Asset($this->db); // $asset = new Asset($this->db);
// $result = $asset->setLastCumulativeDepreciation($bookkeeping->fk_doc); // $result = $asset->setLastCumulativeDepreciation($bookkeeping->fk_doc);
// if ($result < 0) { // if ($result < 0) {
// $error++; // $error++;
// $error_for_line++; // $error_for_line++;
// $journal_data[$element_id]['error'] = 'other'; // $journal_data[$element_id]['error'] = 'other';
// $this->errors[] = $asset->errorsToString(); // $this->errors[] = $asset->errorsToString();
// } // }
// } // }
} }
if ($error_for_line) { if ($error_for_line) {
@ -1002,7 +1002,8 @@ class AccountingJournal extends CommonObject
* @param string $account Accounting account number * @param string $account Accounting account number
* @return array Accounting account infos * @return array Accounting account infos
*/ */
function getAccountingAccountInfos($account) { function getAccountingAccountInfos($account)
{
if (!isset(self::$accounting_account_cached[$account])) { if (!isset(self::$accounting_account_cached[$account])) {
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php'; require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';