Commit Graph

7121 Commits

Author SHA1 Message Date
Laurent Destailleur
bd57bcf617 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-15 19:52:31 +02:00
Laurent Destailleur
4f9a0ba81b Fix css 2024-07-15 19:27:11 +02:00
Laurent Destailleur
147a8bfaee Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/categories/viewcat.php
	htdocs/contrat/card.php
	htdocs/contrat/list.php
	htdocs/eventorganization/conferenceorbooth_list.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
2024-07-11 10:44:39 +02:00
Alexandre SPANGARO
128769811c Add css bodylist on list (#30334)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-11 00:45:05 +02:00
Laurent Destailleur
8a4f550d64 Debug v20 2024-07-09 17:33:27 +02:00
Frédéric FRANCE
2707475a12 fix phpstan (#30319)
* fix phpstan

* fix phpstan expects int, false given ...

* fix phpstan expects int, true given ...
2024-07-08 21:45:35 +02:00
Rémi Champlon
d2907b68c0 NEW : Add pagination data to some api routes (#29895)
* Add pagination date

* Spaces to tabs

* fix
2024-07-06 15:04:11 +02:00
Laurent Destailleur
1c52869e3b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-05 16:59:07 +02:00
Zephyriony
e7f694cddf NEW #30044 (#30071)
* FIX #30044

* Update list.php

* Update list.php

* Update pdf.lib.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-04 21:47:21 +02:00
Philippe Grand
d78c045c95 New branch 03 07 2024 (#30253)
* fix : Warning: Undefined variable  in /home/httpd/vhosts/aflac.fr/domains/dol190.aflac.fr/httpdocs/compta/bank/various_payment/list.php on line 370

* backward

* update

* fix : Fatal error: Uncaught Error: Class 'DiscountAbsolute' not found in /home/httpd/vhosts/vialab.fr/domains/dolibarr.vialab.fr/httpdocs/fourn/commande/list.php on line 461
2024-07-04 20:47:25 +02:00
Laurent Destailleur
a9bdd17668 Fix url 2024-07-03 02:06:01 +02:00
atm-jonathan
5794d6bbc1 missing newToken() (#30239) 2024-07-03 02:04:06 +02:00
Zephyriony
4170bd410c NEW Opacity for finished lines (#30219)
* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-01 14:17:44 +02:00
Frédéric FRANCE
c6d44671f5 clean date phpdoc (#30221) 2024-07-01 12:55:16 +02:00
Alexandre SPANGARO
96afcaa476 Better comments (#30200)
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-30 21:02:50 +02:00
Frédéric FRANCE
4b275dc148 add phpdoc (#30208)
* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* clean phpdoc
2024-06-30 19:39:01 +02:00
Laurent Destailleur
b532e3b0a3 Test 2024-06-30 15:32:18 +02:00
Laurent Destailleur
675e761297 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
2024-06-30 04:11:04 +02:00
Laurent Destailleur
db61320098 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/price.php
	htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
	htdocs/user/list.php
2024-06-30 04:05:46 +02:00
Laurent Destailleur
b2e288f8ec Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/menus/standard/eldy.lib.php
2024-06-30 03:53:16 +02:00
Laurent Destailleur
f64e4b4981 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-29 20:53:10 +02:00
Lucas Marcouiller
2cf322184e Fix php 8.3 warnings (#30160)
* Fix php 8.3 warnings

* fix deprecation

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-06-26 17:04:05 +02:00
Laurent Destailleur
8f5b98be43 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-25 13:50:27 +02:00
Laurent Destailleur
4374ecebad Fix CSRF = 3 for cancel and clone 2024-06-25 12:31:24 +02:00
boudet jean pascal
028e5fd1d3 FIX add token in link validate and clone button uri generate an error wi… (#30144)
* add token in link validate and clone  button uri generate an error with MAIN_SECURITY_CSRF_WITH_TOKEN to 3

* remove dot

---------

Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-25 12:14:48 +02:00
Laurent Destailleur
adb354f97a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-23 14:00:12 +02:00
Laurent Destailleur
d393a0d5ee Debug v20 2024-06-22 14:48:16 +02:00
Laurent Destailleur
9788caa298 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-22 13:01:21 +02:00
Laurent Destailleur
9e7daee7b3 Fix look and feel v20 2024-06-22 13:00:29 +02:00
Laurent Destailleur
96a1d5aeb5 Debug v20 2024-06-22 02:51:10 +02:00
Benjamin Falière
833780b84e NEW(Supplier): Add classe_element_line property for supplier related classes (#30060)
* NEW(CommandeFournisseur): add proporty CommandeFournisseur:class_element_line

* Fix typo

* NEW(supplier): Add classe_element line property for supplier classes

---------

Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
2024-06-19 19:51:25 +02:00
Laurent Destailleur
4e416a0382 Doxygen 2024-06-19 15:03:25 +02:00
Laurent Destailleur
e30ee02357 Fix for #30077 (renaming method will be done later when situation
invoice integration will be completed)
2024-06-19 14:57:45 +02:00
Frédéric FRANCE
7127b9d499 add token csrf level 3 (#29987)
* add token csrf level 3

* fix

* add token
2024-06-11 20:02:40 +02:00
Frédéric FRANCE
c9f9e44454 add phpdoc (#29982)
* add phpdoc

* token

* token
2024-06-11 01:06:52 +02:00
Laurent Destailleur
37750e0afc css 2024-06-10 18:22:34 +02:00
Laurent Destailleur
41078480f4 Debug v20 2024-06-10 17:56:05 +02:00
Mathieu Moulin
abcb1dad4b Define CommonObject relation in CommonObjectLine classes (#29956) 2024-06-10 16:08:39 +02:00
UltraViolet33
ee75ffe823 FIX update date_echeance of supplier invoices when we update invoice date in the past (#29886)
When we update the date of supplier invoices in the past, the date_echeance was not updated if the new calculated date_echeance is before the current date_echeance.
The same goes if we update the payment term of supplier invoice, the date echeance is not updated if the new calculted date_echeance is before the current date_echeance.
With this PR, when we update the supplier invoice date or payment term, the date_echeance is updated even if the new calculated date_echeance
 is before the current date_echeance.

Co-authored-by: Ulysse Valdenaire <uvaldenaire@easya.solutions>
2024-06-07 18:06:31 +02:00
Laurent Destailleur
f71d938728 Debug v20 2024-06-06 03:33:52 +02:00
Laurent Destailleur
856600470d Debug v20 2024-06-05 11:57:17 +02:00
Frédéric FRANCE
741e75ee47 add phpdoc (#29832)
* add phpdoc

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* add phpdoc

* fix phan

* fix phan
2024-06-04 14:46:54 +02:00
Laurent Destailleur
9c9773b74f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-05-31 16:17:53 +02:00
Zephyriony
9be7464ea3 Update fournisseur.commande.class.php (#29786)
Correction of a bug. When cloning, the date of the cloned order was retained in the new order.
2024-05-31 16:00:24 +02:00
Frédéric FRANCE
bae0c17811 clean code (#29800)
* clean code

* clean code

* clean code

* clean code

* clean code

* clean code

* Update adherent.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-31 15:09:41 +02:00
Laurent Destailleur
82908a30eb Clean phan warnings 2024-05-30 13:37:17 +02:00
Laurent Destailleur
06579013df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-05-28 02:44:11 +02:00
Laurent Destailleur
d805edea64 Debug v20 2024-05-28 02:11:55 +02:00
Florent Poinsaut
495b6f0440 NEW Supplier Order canceled notification (#26882)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-25 14:38:35 +02:00
Sylvain Legrand
ace675d6bd NEW Add option to change all service dates at once (#29348)
* New option to change all service dates at once

* Update objectline_title.tpl.php

* Update objectline_title.tpl.php

* Update objectline_title.tpl.php
2024-05-25 13:12:35 +02:00