Commit Graph

3809 Commits

Author SHA1 Message Date
Laurent Destailleur
9730a83d9c Fix phpstan missing parenthesis 2024-11-12 14:42:07 +01:00
Laurent Destailleur
6c7c12b4b4 Rename variables 2024-11-12 14:20:08 +01:00
Andrew Burks
c8e8651c66 NEW [Accounting] Allow grouping taxes with primary line price (#26732)
* Fix expense report journal entries bind to user

WAS: expense report payments did not fill out $tabtb (credit) to associate with their $tabpay (debit). The case would always fall through to 'NotDefined' and require manual adjustment.

NEW: if a user is associated with the expense report, then that user will get an associated credit line ($tabtp) generated.

* allow grouping tax with actual cost for accounting

Provides the ability for taxes paid in expense reports (ER_JOURNAL_GROUP_TAX_WITH_LINES) or purchases (AC_JOURNAL_GROUP_TAX_WITH_LINES) to get grouped with the main expense/purchase line and associated with the accounting account for the item itself. This is in contrast to the default behavior designed around VAT which splits off any taxes paid into a separate accounting account for each type of tax.

* fixed out of date reference

fixed merge error

* fixed linting issues

whitespace around braces and if/else keywords

* Update bankjournal.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-12 14:14:36 +01:00
MDW
9ec4618199 Qual: Fix FunctionArray phan notices (#31754)
* Qual: Fix FunctionArray phan notices

* Fix class name in typing of htdocs/modulebuilder/index.php

* Fix customreports phpdoc

* Adjust file type after completeFileArrayWithDatabaseInfo

* Further phpdoc typing improvements

* More phpdoc

* Improve typing with cast on position field

* Force phpstan version

* Add phpstan exception

* Fix array index type + adjust phan config comment
2024-11-11 14:48:18 +01:00
Frédéric FRANCE
661059ca9a fix phpstan (#31763)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-11 14:33:53 +01:00
Laurent Destailleur
37df9c3524 export 2024-11-10 18:42:57 +01:00
Laurent Destailleur
579aa77d76 Fix phpstan 2024-11-10 18:40:24 +01:00
Frédéric FRANCE
15490b292f fix phpstan and fix CI (#31739)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2024-11-10 11:16:23 +01:00
Alexandre SPANGARO
48d5d2b831 NEW Accountancy - Add general account on thirdparty - Code user part (#31676)
* NEW Accountancy - Add general account on thirdparty - SQL Part

* NEW Accountancy - Add general account on thirdparty - Code customer part

* NEW Accountancy - Add general account on thirdparty - Code customer part

* NEW Accountancy - Add general account on thirdparty - Code customer part

* Fix Phan

* Use isModEnabled

* NEW Accountancy - Add general account on thirdparty - Code supplier part

* Fix phan

* Fix phan

* Fix phan

* Use list of account instead of  simple input

* Use list of account instead of simple input

* Tabs

* NEW Accountancy - Add general account on thirdparty - Code user part

* NEW Accountancy - Add general account on thirdparty - Code user part

* Fix indent

* Fix indent

* Remove duplicate language key

* Fix phan

* Fix phan

* Update card.php

* Fix accountancy export CSV

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-07 18:40:58 +01:00
Frédéric FRANCE
41a4f42b31 add phpdoc and clean phpstan baseline (#31717)
* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc

* add phpdoc

* add phpdoc
2024-11-07 17:31:40 +01:00
Laurent Destailleur
4bdd848bbe Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-06 13:26:08 +01:00
Alexandre SPANGARO
07f737cea4 Missing token and clean code (#31689)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-05 15:25:09 +01:00
Frédéric FRANCE
1adc883b56 add baseline exclude for phpstan (#31632)
* add baseline exclude for phpstan

* update

* update

* update

* update

* update

* merge

* restore one filter

* delete old errors

* fix

* fix

* fix

* $moreforfilter can t be empty

* fix

* enable check

* refresh baseline

* add phpdoc

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-04 23:53:20 +01:00
Laurent Destailleur
2e4cba02cd Fix missing token 2024-11-04 18:49:35 +01:00
Laurent Destailleur
a417426729 Fix missing token and clean code 2024-11-04 18:45:56 +01:00
Alexandre SPANGARO
3c81211b80 NEW Custom accounting reports (#31673)
* NEW Custom accounting reports

* Copyright

* FIX Pre-commit

* FIX Pre-commit

* Fix Phan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-04 16:38:17 +01:00
Laurent Destailleur
2e56340386 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-30 17:46:36 +01:00
Laurent Destailleur
2be35d53eb Look and feel v21 2024-10-30 14:08:43 +01:00
Laurent Destailleur
3ce89f951f Fix merge 2024-10-29 21:14:41 +01:00
Laurent Destailleur
5f00b8cccd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-29 21:04:35 +01:00
Laurent Destailleur
405eeb891e Fix tooltip 2024-10-29 21:02:57 +01:00
Frédéric FRANCE
3929d4ba31 fix phpstan in conf class (#31630)
* fix phpstan

* fix phan
2024-10-29 21:02:10 +01:00
Laurent Destailleur
10fe6f1f9f Fix option ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE 2024-10-29 14:38:08 +01:00
Laurent Destailleur
6a7fac3545 Fix #31609 2024-10-28 19:15:44 +01:00
Laurent Destailleur
52ece961f0 Look and feel v21 2024-10-27 02:03:44 +01:00
Laurent Destailleur
5b80b06da7 Clean code: Merge page of export options into the main page of options 2024-10-27 02:10:10 +02:00
Laurent Destailleur
c41274dbd1 Debug v21 2024-10-26 21:09:09 +02:00
Laurent Destailleur
2a39e9edca Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-26 15:56:30 +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
Laurent Destailleur
405a741726 Fix doxygen 2024-10-25 14:30:51 +02:00
Alexandre SPANGARO
3e9068c1c6 FIX Accountancy - Loan - Error on transfer (#31546) 2024-10-25 13:42:46 +02:00
Alexandre Janniaux
0bdd209d06 QUAL: AccountancySystem: maintenance work to uniformize and clean up (#31391)
* accountancysystem: inherit CommonObject

This provides the common methods on the database objects like error
handling.

* accountancysystem: improve error reporting

Forward the database error to the caller when an error happens.

* accountancysystem: clean up class

The fields that were completely unused are removed. $ref is still kept
since it was filled by AccountancySystem::fetch(), but marqued as
deprecated to incite using the newer more descriptive pcg_version field.

* Update accountancysystem.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-19 03:37:44 +02:00
kkhelifa-opendsi
90a545637e NEW : Add hook after the line is processed in the sell journal page (#31439) 2024-10-19 01:38:36 +02:00
Alexandre Janniaux
4146c0df89 accountancysystem: fix object create() method (#31390)
The accountancysystem::create() method is not used in the code, and thus
was not updated, especially after the introduction of the whole new
accountancy system. The method is at least useful for the tests so fix
it to create values like in every other tests.
2024-10-14 16:50:32 +02:00
Alexandre SPANGARO
4a91c2c734 NEW Accountancy - Add general account on thirdparty - Code supplier part (#31318)
* NEW Accountancy - Add general account on thirdparty - SQL Part

* NEW Accountancy - Add general account on thirdparty - Code customer part

* NEW Accountancy - Add general account on thirdparty - Code customer part

* NEW Accountancy - Add general account on thirdparty - Code customer part

* Fix Phan

* Use isModEnabled

* NEW Accountancy - Add general account on thirdparty - Code supplier part

* Fix phan

* Fix phan

* Fix phan

* Use list of account instead of  simple input

* Use list of account instead of simple input

* Tabs

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-14 12:05:07 +02:00
MDW
53cfbc35be Qual: Fix several phan & stan notices (#31308)
* Qual: Fix several phan & stan notices

# Qual: Fix several phan & stan notices

Several fixes in files while fixing UnknownClass notices

* Qual: Update prepare_head PHPDoc return types

# Qual: Update prepare_head PHPDoc return types

Provide detailed array return types for prepare_head functions.

* Fix new phan notice

* Better loadLangs typing and fix call to loadLangs

* Fix new issues (stats)

* Other fixes of new issues

* Qual: update phan baseline
2024-10-14 01:59:44 +02:00
Alexandre SPANGARO
c4409e44f9 QUAL Use table_element in sql querries (#31355)
* Use table element in sql querries

* Use table element in sql querries

* Use also $this->db->prefix()

* Use table_element in sql querries
2024-10-13 16:47:47 +02:00
Alexandre SPANGARO
6fe1adec7d NEW Accountancy - Add general account on thirdparty - Code customer part (#31294)
* NEW Accountancy - Add general account on thirdparty - SQL Part

* NEW Accountancy - Add general account on thirdparty - Code customer part

* NEW Accountancy - Add general account on thirdparty - Code customer part

* NEW Accountancy - Add general account on thirdparty - Code customer part

* Fix Phan

* Use isModEnabled

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-09 01:51:12 +02:00
Alexandre SPANGARO
dfa1a5dd6e NEW Accountancy - Option to select the label operation (#31200)
* NEW Accountancy - Option to select the label operation

* NEW Accountancy - Option to select the label operation

* NEW Accountancy - Option to select the label operation

* NEW Accountancy - Option to select the label operation

* Fix codespell

* Fix CodeSniffer

* Fix Phan

* Some fix

* User function csvClean

* User function csvClean
2024-10-06 14:06:20 +02:00
MDW
f70c945931 Qual: Fix phan/stan notices (#31271)
# Qual: Fix phan/stan notices in relation with UnknownObjectMethodCall

Fix notices in classes with UnknownObjectMethodCall notices or classes
related with these.
2024-10-05 18:55:36 +02:00
thomas-Ngr
88879e0708 Add triggers on Bookkeeping class (#31204) 2024-10-03 20:52:39 +02:00
MDW
2d0b1de36f Qual: Add codespell entries to catch some css typos (#31222)
# Qual: Add codespell entries to catch some css typos

Added some codespell entries based on the observed typos in css
tags
2024-10-03 19:36:59 +02:00
Laurent Destailleur
2c518be378 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-30 20:10:47 +02:00
Francis Appels
f101423901 FIX State dropdown is not working on User card #31198 (#31205)
* FIX State dropdown is not working on User card #31198

* Fix phan
2024-09-30 16:50:54 +02:00
Laurent Destailleur
7eb375d398 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-09-30 16:21:37 +02:00
Laurent Destailleur
afc77a5bca Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-09-30 14:04:49 +02:00
Laurent Destailleur
fde37d8172 Fix deadlock situation by adding a constant in hope to save user 2024-09-30 13:36:30 +02:00
Laurent Destailleur
91fe8213fa Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-09-30 13:26:43 +02:00
Laurent Destailleur
946726779c Fix test on setup 2024-09-30 13:23:04 +02:00
Laurent Destailleur
7b61965042 FIX autoselect the fiscal period by default 2024-09-30 13:19:39 +02:00