Commit graph

151292 commits

Author SHA1 Message Date
Laurent Destailleur
33a2c49e1d Debug v20 - Fix amount of membership payments 2024-07-20 16:01:54 +02:00
Laurent Destailleur
442e798002 Debug v20 - Fix option ADHERENT_CREATE_EXTERNAL_USER_LOGIN. 2024-07-20 13:59:26 +02:00
Laurent Destailleur
23bfc5d153 Fix trans of option 2024-07-20 12:06:05 +02:00
Laurent Destailleur
93d96f37cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-19 15:39:33 +02:00
Laurent Destailleur
3a9931c0bb NEW Add a test mode into the setup of AI prompts 2024-07-19 15:38:52 +02:00
Laurent Destailleur
c4f29dca59 NEW Can set a class on the tr lines of form setup lines 2024-07-19 12:06:37 +02:00
Lucas Marcouiller
c8fb079893
FIX bank categorie table name (#30415)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-07-18 23:57:19 +02:00
Laurent Destailleur
7fef62e5e0 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 22:55:45 +02:00
Laurent Destailleur
6d5e42b360 Debug v20 2024-07-18 22:51:16 +02:00
Laurent Destailleur
8ef33b0cd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 19:18:58 +02:00
Laurent Destailleur
1496043967 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 19:17:46 +02:00
Laurent Destailleur
97c83c2cbb Debug v20 2024-07-18 19:17:15 +02:00
MaximilienR-easya
5d811a8c73
Finished event end time (#30123)
* Add when you set to finished an event, it set to now the end time if it is undefined

* Fix comment
2024-07-18 18:56:07 +02:00
Laurent Destailleur
14f44052ee Fix translation wrong. Missing empty line. 2024-07-18 18:10:14 +02:00
Laurent Destailleur
9e45367826 Code comment 2024-07-18 17:26:18 +02:00
Laurent Destailleur
dab9b4ae13 Debug v20 2024-07-18 14:53:40 +02:00
Laurent Destailleur
e956c052c4 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 06:39:34 +02:00
Laurent Destailleur
5ff47f31f0 Fix css 2024-07-18 06:22:43 +02:00
Laurent Destailleur
6213c167fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 02:44:55 +02:00
Laurent Destailleur
a39d55474f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 02:44:35 +02:00
Laurent Destailleur
b303be54fd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-18 02:41:28 +02:00
Laurent Destailleur
47aa13b91f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-18 02:36:08 +02:00
Laurent Destailleur
9d4951e85b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-18 02:35:53 +02:00
Laurent Destailleur
8857aebb70 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-07-18 02:33:28 +02:00
Laurent Destailleur
f14833f856 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-07-18 02:33:03 +02:00
Laurent Destailleur
6c7bc18ae1 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-07-18 02:32:25 +02:00
Laurent Destailleur
193faf6813 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-07-18 02:30:50 +02:00
MaximilienR-easya
ee14c9d3e4
Fix les lien de téléchargement de facture fournisseur sur la page vue d'ensemble des projets (#30350)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-18 00:46:43 +02:00
lamrani abdelwadoud
56667da139
New Export stock inventory (#30401)
* New Export stock with correction

* Fix Travis CI errors
2024-07-18 00:45:23 +02:00
thibdrev
4fe1c1227c
qual: phpdoc for product.class.php (#30413)
* qual: phpdoc for product.class.php

* Tabs must be used to indent lines; spaces are not allowed
2024-07-18 00:42:04 +02:00
Laurent Destailleur
4d6392d50a FIX error management on update extrafield 2024-07-17 21:26:05 +02:00
Laurent Destailleur
3141d69d7b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-17 20:33:08 +02:00
Laurent Destailleur
a2c46d4e1f Fix for port socket 2024-07-17 20:31:36 +02:00
Pichi1966
f8da618789
FIX : issue to get the right files exported in Quadratrus export.php (#30004)
* FIX : issue to get the right files exported in Quadratrus export.php

The export of files does not work correctly when using Accounting option export Quadratus with file export.
The files are not attached to the zip until we uncommment the 3 lines of this PR.

* Update export.php
2024-07-17 20:07:40 +02:00
Laurent Destailleur
3aadad0cea Fix or and 2024-07-17 19:48:48 +02:00
Laurent Destailleur
ed1cf80f0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-17 19:47:39 +02:00
Laurent Destailleur
33e377e2c7 QUAL: Clean code 2024-07-17 19:47:13 +02:00
Joachim Kueter
b1b6c91f22
FIX #30397: for direct debit payments, BIC is optional (#30398)
* Fix missing loading trans file

* allow withdrawals without SEPA/BIC code (just IBAN)

* fix pre-commit formatting check

* fix Travis

* fix and, or

* fix formatting

---------

Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net>
2024-07-17 19:45:56 +02:00
Florian Charlaix
4479b1e662
FIX Conflict with autoload (#30399)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-17 19:43:18 +02:00
Alexandre SPANGARO
50646e70a0
FIX Accountancy - Generate entries of expense report with localtax (#30411)
* FIX User List - Function is show in wrong column when module HRM enabled

* FIX Accountancy - Generate entries of expense report with localtax. $cpttva don't exist
2024-07-17 19:42:12 +02:00
Laurent Destailleur
4dba4f3e71 css 2024-07-17 16:39:11 +02:00
Laurent Destailleur
dc8adb4635 CSS and code comment 2024-07-17 16:23:24 +02:00
Christian Humpel
8d86f54729
Fix #30187 (#30409)
BOM columns if "Stock management supports Services" is active.
2024-07-17 16:05:06 +02:00
thibdrev
df1f9bc0bc
qual: better phpdoc and use of isProduct(), isService() and isStockManaged() (#30405)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-17 15:46:14 +02:00
Laurent Destailleur
7a57b704cc Fix phan 2024-07-17 14:53:14 +02:00
Laurent Destailleur
948fecb9b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-07-17 14:01:44 +02:00
Laurent Destailleur
607a62857f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-17 13:47:01 +02:00
Alexandre SPANGARO
26eb9b4948
Situation invoice - Fix column title (#30406) 2024-07-17 13:45:51 +02:00
Sami Filali
22def4f35a
Fix #30298 - billing contact in supplier proposal (#30404)
* add external contact with billing code in supplier_proposal pdf

* update with pr returns

* Update pdf_other.php

* fix inversing condition

* Update pdf_other.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-16 22:35:09 +02:00
Sami Filali
4aa5e4578a
NEW : add option to add external billing contact on the supplier_proposal pdf (#30298)
* add external contact with billing code in supplier_proposal pdf

* update with pr returns

* Update pdf_other.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-16 22:09:39 +02:00