2
0
forked from Wavyzz/dolibarr
Commit Graph

3833 Commits

Author SHA1 Message Date
Frédéric France
6f2611cf74 fix phan 2024-12-17 18:36:52 +01:00
Frédéric France
6623a3c23d remove no more used code 2024-12-17 17:59:21 +01:00
Laurent Destailleur (aka Eldy)
81e64ed9a4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-12-17 16:59:13 +01:00
Laurent Destailleur (aka Eldy)
91eb9fc9fb Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-12-17 16:54:55 +01:00
Laurent Destailleur
be5f58f2b0 Merge pull request #32377 from alexandre-janniaux/tab-sells-journal/1
Qual: sellsjournal: remove tab character in SQL
2024-12-17 02:51:53 +01:00
Alexandre Janniaux
45f6905bae FIX #32376: lettering: fix ifsql() called with invalid $check parameter
The $check is supposed to be a check retuning a boolean. By being an
`if (value)` check instead of being an `if (value IS NOT NULL)` check,
postgresql complains the types are not correct:

        Error ERROR: 42804: argument of CASE/WHEN must be type boolean,
        not type integer LINE 1: ...k, tl2.fk_doc FROM ( SELECT DISTINCT
        (CASE WHEN tll.fk_fac... ^ LOCATION: coerce_to_boolean,
        parse_coerce.c:1176

Regression from commit cfc162a31d.
2024-12-15 18:39:40 +01:00
Alexandre Janniaux
1c7deda18d sellsjournal: remove tab character in SQL
It shows as the following in the logs:

        GROUP BY fk_facture
        \x09AND fk_facture IN (8)
            AND fd.total_ttc <> 0
            AND fd.fk_code_ventilation <= 0
            fd.product_type <= 2
        WHERE
        \x09llx_facturedet as fd
        FROM
2024-12-15 17:56:25 +01:00
Pichi1966
b86c1b22f4 Update Closure Income Labels 2024-12-09 12:46:47 +01:00
Leonardo Pedroza
cd2ea4e66f Fix: accountancy import for FEC files to avoid double escaped values in query ( '\'D\'') 2024-12-09 11:37:46 +01:00
Pichi1966
25e3224121 Close #30039 and port code on this one
This will help to better and understand and follow this fix
2024-12-08 11:36:26 +01:00
Pichi1966
7e3624ee27 Clean Spaces versu tab 2024-12-01 19:08:53 +01:00
Pichi1966
89fc9ac8ea FIX Accounting Closure Duplicates and more Update bookkeeping.class.php
FIX I did further testing and investigation and I fixed the following issues that stop doing a full closure without duplicate lines generated by an unclean database :

    - different label_compte with same account number
    - removing label_compte is raising an issue and the code in the line around 2770 $bookkeeping->label_compte = $obj->label_compte;
    - different subledger_label with same subledger_account
    - empty versus null values for subledger_label and subledger_account
    - opening_balance is 0 as it creates a bookkeeping entry for now.  

FIX - Update Accounting closure with missing too many A-Nouveau #30039)
2024-12-01 18:55:31 +01:00
Frédéric FRANCE
286c3d1093 fix sql ticket list (#32080)
* fix sql ticket list

* fix sql ticket list

* fix phpstan

* fix

* fix
2024-11-28 12:11:50 +01:00
Frédéric FRANCE
1b6ee9e654 fix phpdoc (#32097)
* fix phpdoc

* Update accountancycategory.class.php

* fix phpstan

* fix phpstan

* fix phpstan

* fix phan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-28 11:15:56 +01:00
Frédéric FRANCE
ee54d1c372 fix CI (#32089)
* fix CI

* fix CI

* fix CI

* fix CI
2024-11-25 18:57:57 +01:00
Laurent Destailleur
3f6f128d3b Debug v21 2024-11-24 14:28:15 +01:00
Laurent Destailleur
627f81acd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-11-24 14:01:36 +01:00
Frédéric FRANCE
daae68f9d3 Fix phpstan (#32005)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2024-11-19 21:02:05 +01:00
Laurent Destailleur
e9e1175134 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-19 04:04:10 +01:00
Frédéric FRANCE
45b07ca0a1 fix phpstan (#31988)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2024-11-18 21:21:40 +01:00
Sébastien NASSIET
02eb16a703 FIX#31159 - TVA Account by country is not used (#31984)
* FIX#31159

* FIX#31159
2024-11-18 15:49:52 +01:00
Alexandre SPANGARO
73171867e0 Accountancy personalized reports - Prepare report page (#31935) 2024-11-16 20:58:09 +01:00
Frédéric FRANCE
2c4d1038d0 fix phpstan (#31805)
* fix

* fix

* fix

* fix

* fix
2024-11-13 22:37:17 +01:00
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