Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-26 22:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
147,462 Commits 39 Branches 191 Tags
a41622707e3d44f778e8978f94de8f038956fd73
Commit Graph

240 Commits

Author SHA1 Message Date
Alexandre SPANGARO
8995247192 Merge branch '22.0' into 22_asset5 2025-12-11 04:29:53 +01:00
Laurent Destailleur
5a81106174 Merge pull request #36522 from lippoliv/fix-accelerated-depreciation-lines-when-disabled 
do not create accelerated deprecation lines if disabled
 2025-12-11 02:01:00 +01:00
Alexandre SPANGARO
2abd7a561f CI 2025-12-08 10:10:39 +01:00
Alexandre SPANGARO
a60f0a9dda FIX Accountancy - Problem calculating exercises with different tax periods on fixed assets 2025-12-08 09:56:42 +01:00
Alexandre SPANGARO
c480cd4801 FIX Accountancy - Reverse accounting account in depreciation expense entries for fixed assets 2025-12-05 08:58:00 +01:00
lippoliv
959308c910 fix line indentation 2025-12-04 10:20:38 +01:00
lippoliv
bb06e850f1 do not create accelerated deprecation lines if disabled 2025-12-04 10:15:50 +01:00
Laurent Destailleur
2e9ec3a9da Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-10-02 15:59:53 +02:00
Laurent Destailleur
a046419145 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-10-02 15:59:08 +02:00
Laurent Destailleur
b0d08278f0 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-10-02 15:53:12 +02:00
Laurent Destailleur
b2fce5052f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-10-02 15:52:05 +02:00
Marc de Lima Lucio
ffe07999cf FIX: pgsql: error when calculating depreciations (#34213) 
* FIX: pgsql: error when calculating depreciations

* FIX: asset deprectiation: optimize sql

* FIX: travis
 2025-10-02 02:39:29 +02:00
ldestailleur
36b00c5951 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-02 14:59:18 +02:00
ldestailleur
14c2db425d Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-02 14:53:12 +02:00
ldestailleur
ca11136092 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-06-02 14:37:54 +02:00
ldestailleur
11d357b79e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-06-02 14:31:05 +02:00
Marc de Lima Lucio
a42593db0d FIX: asset depreciation: php warnings (#34219) 2025-05-22 21:17:58 +02:00
Marc de Lima Lucio
491ecaccfe FIX: asset depreciation: division by zero (#34218) 2025-05-20 20:32:08 +02:00
Laurent Destailleur
dae2597a90 Fix CI 2025-05-11 00:14:25 +02:00
ldestailleur
3a9a41c63e Fix asset 2025-05-10 21:04:30 +02:00
ldestailleur
62e305f7fa Debug the asset module. Can't delete. 2025-05-10 21:03:27 +02:00
Alexandre SPANGARO
162876df7b Asset - wrong status for disposal (#33898) 
* Review of module asset

* Review of module asset
 2025-04-19 02:56:31 +02:00
Alexandre SPANGARO
ab0ce1d645 Review of module asset (#33847) 
* Fixed Asset - Update translation of the module

* Fix asset create name

* Fix ref field

* Update module Asset

* Fix CI

* Fix CI

* Fix comment
 2025-04-15 17:21:45 +02:00
Frédéric FRANCE
869d7af747 comment test not needed (#33504) 2025-03-19 13:48:56 +01:00
MDW
9dcf7fa0f5 Qual:Fix phan notices (multiple) (#33465) 2025-03-15 11:26:19 +01:00
MDW
4168a16151 Qual: Fix ifsql argument type 2025-02-09 20:14:22 +01:00
Laurent Destailleur (aka Eldy)
57a3daa358 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 15:03:44 +01:00
Laurent Destailleur (aka Eldy)
a97c2447a1 Debug v21 2025-02-06 15:02:55 +01:00
Laurent Destailleur (aka Eldy)
732f97d73c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2025-02-05 00:40:06 +01:00
Laurent Destailleur (aka Eldy)
b024b95948 Fix typo 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
56710ce9b7 FIX CVE-2024-55227 and CVE-2024-55228 CSRF when 
MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is
on (hidden option not on by default)
 2025-01-09 19:35:01 +01:00
Laurent Destailleur (aka Eldy)
de321e8f01 Fix typo 2025-01-09 02:01:49 +01:00
Laurent Destailleur (aka Eldy)
c0250e4c91 FIX CVE-2024-55227 CSRF when MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY is 
on (hidden option not on by default)
 2025-01-08 17:41:45 +01:00
Pichi1966
855b609e43 Update assetdepreciationoptions.class.php 2024-12-10 00:52:04 +01:00
MDW
ec2a1928ba Qual: Update fields phpdoc to include fields that are defined/used in some cases 
# Qual: Update fields phpdoc to include fields that are defined/used in some cases

comment, copytoclipboard, autofocusoncreated are documented and used in some cases for the
$fields definition
 2024-12-05 02:36:50 +01:00
Frédéric FRANCE
13b8f5feff keep only commonobject property oldcopy (#32123) 
* clean properties

* clean properties

* clean properties

* clean properties

* clean phpcs

* clean phan

* clean code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-11-27 21:59:41 +01:00
Frédéric FRANCE
c51011b8d1 fix CI phpstan (#32001) 
* Update project.class.php

* Update assetmodel.class.php

* Update assetmodel.class.php

* test

* Update assetmodel.class.php

* Update assetmodel.class.php

* Update assetmodel.class.php

* Update assetmodel.class.php

* Update project.class.php

* Update project.class.php
 2024-11-19 15:40:37 +01:00
Laurent Destailleur
1386d8c388 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-11-19 04:21:29 +01:00
Marc de Lima Lucio
da70b46647 FIX: asset: missing ref_ext field used in CommonObject::isExistingObject() (#31870) 2024-11-17 01:43:43 +01:00
Marc de Lima Lucio
b6dfc496a2 FIX: assets: division by zero when trying to calculate depreciation on assets that don't have it (#31858) 
* FIX: assets: division by zero when trying to calculate depreciation on assets that don't have it

* FIX: assets: division by zero when trying to calculate depreciation on assets that don't have it, part 2
 2024-11-16 10:51:24 +01:00
Laurent Destailleur
e8c79df0e4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 13:45:06 +01:00
Laurent Destailleur
16fcb19072 Fix phpstan 2024-11-13 13:42:03 +01:00
Laurent Destailleur
6065b605d4 Fix phpstan 2024-11-13 13:41:03 +01:00
Pichi1966
e98402ab64 NEW FY Changed Period handle in Module Asset (#31618) 
* NEW FY Changed Period handle in Module Asset 

NEW This is the code modification to take in consideration any changed in fiscal year period adjustments to shortened or extended periods (e.g., fiscal years of 9 or 15 months)

* Clean asset.class.php
 2024-10-29 17:44:47 +01:00
Pichi1966
d2316eb6e1 NEW Const ASSET_ROUND_INTEGER_NUMBER_UPWARDS for ASSET Module. Compatibily to migrate from other accounting solutions. (#31615) 
* NEW CONST ASSET_ROUND_INTEGER_NUMBER_UPWARDS 

New CONST ASSET_ROUND_INTEGER_NUMBER_UPWARDS

During several months, we worked with 3 accounting experts in migrating from Quadratus to Dolibarr several assets.(more than 200). We compared all of them ot get same result in Dolibarr. During this test we discoverd that Quadratus has an option to round upwards all the calculated asset values (less the last one). With this const and the code attach we get same result. This is really helpful to migration and also clarity in the lines.  
Update asset.class.php Round upwards AssetCalculationThis new CONSTUpdate asset.class.php Round upwards AssetCalculation

* Update asset.class.php
 2024-10-29 17:31:38 +01:00
Pichi1966
a0b6e9522e FIX Update asset.class.php PHP Error and $depreciation_date_end (#31611) 
This fix corrects 2 issues:
- PHP Error required (float)
- $depreciation_date_end was incorrect with an extra day. This was impacting last calculation period.
e.g; 5 years period starting the 30/09/2019 means $depreciation_date_end = 29/09/2024. It was returning 30/09/2024
 2024-10-28 19:57:21 +01:00
Frédéric FRANCE
7dfa9b7d33 remove unused code (#31610) 
* remove unused code

* remove unused code

* fix typo

* fix

* fix

* fix
 2024-10-28 19:49:01 +01:00
Pichi1966
0fa6eb329e FIX Asset Module Update assetdepreciationoptions.class.php (#31589) 
Issue avoidind displaying Asset Depreciation Fields and avoiding CalculationDepreciation
 2024-10-28 00:42:22 +01:00
Laurent Destailleur
38fa5d28db Debug v21 2024-10-26 20:03:22 +02:00
MDW
0ac595364b Qual: Fix phan/phpstan notices in class files (part 1) (#31501) 
* Ignore phpstan configuration for spelling

* Qual: Fix phan notices in class files
 2024-10-25 21:00:02 +02:00