Commit Graph

14267 Commits

Author SHA1 Message Date
Laurent Destailleur
bbbcf57756 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-29 19:25:59 +02:00
Laurent Destailleur
2f4c84f4b5 Debug v20 2024-06-29 13:23:05 +02:00
Laurent Destailleur
1104b95137 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-27 13:47:27 +02:00
Laurent Destailleur
0a15655720 Debug v20 2024-06-27 10:41:55 +02:00
Laurent Destailleur
20d71bd381 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-25 11:17:05 +02:00
Laurent Destailleur
fc5c3d2e35 Doc 2024-06-25 11:16:45 +02:00
Marc
46c950c7ff
NEW #24946 (#30102)
* FIX #24946

* FIX #24946
2024-06-25 11:16:34 +02:00
Christian Humpel
ada3ed0a7c
Fix: different behavior on extrafield updates. (#30150) 2024-06-25 10:44:36 +02:00
Laurent Destailleur
2e938fe9ef Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-24 12:44:28 +02:00
Laurent Destailleur
1e1058b29a Debug v20 2024-06-24 12:35:27 +02:00
Laurent Destailleur
c54a97e923 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-24 01:47:18 +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
Alexandre SPANGARO
4ef8c76697
Situation invoice #29897 - Work on facture card (#30117)
* Situation invoice #29897 -  Work on facture card

* Situation invoice #29897 - Work on facture card
2024-06-22 19:18:09 +02:00
thibdrev
b43fc088b4
qual: fix PHAN warnings for compta/facture/card.php (#30110)
htdocs/compta/facture/card.php	1133	TypeError PhanTypeMismatchProperty Assigning $originentity of type non-empty-array|non-empty-string to property but \Facture->entity is int

htdocs/compta/facture/card.php	1968	TypeError PhanTypeMismatchProperty Assigning price2num($retained_warranty) of type string to property but \Facture->retained_warranty is float
2024-06-22 16:05:30 +02:00
Alexandre SPANGARO
aa0c182e6d
Situation invoice #29897 - Uniformize language key (#30115) 2024-06-22 15:58:07 +02:00
Laurent Destailleur
b4cc409a37 Debug v20 2024-06-22 15:07:39 +02:00
Laurent Destailleur
d393a0d5ee Debug v20 2024-06-22 14:48:16 +02:00
Laurent Destailleur
00580d3105 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-21 03:48:13 +02:00
Laurent Destailleur
21f1383816 Clean code 2024-06-21 03:46:45 +02:00
Laurent Destailleur
f93a921333 css 2024-06-21 03:26:03 +02:00
Laurent Destailleur
b834d249c1 NEW Add column "comment" in list of payment 2024-06-21 03:21:51 +02:00
Laurent Destailleur
a737e9ef36 Fix click on checkbox 2024-06-21 03:02:10 +02:00
Laurent Destailleur
b1c045eb01 Debug v20 2024-06-20 20:39:07 +02:00
Laurent Destailleur
e3fb4e7d30 Fix show_photo on null 2024-06-20 20:12:16 +02:00
Laurent Destailleur
e9f0d3d704 FIx #26011 2024-06-20 12:33:22 +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
Laurent Destailleur
5319d5930c Add token 2024-06-19 14:43:46 +02:00
Zephyriony
4a643c8780
FIX #30067 (#30075) 2024-06-19 03:13:47 +02:00
Laurent Destailleur
03a8a154c3 Merge manually another part of PR #29897 2024-06-18 21:52:25 +02:00
Laurent Destailleur
1e4babaff8 Add method get_allprev_progress() manually for #29897 2024-06-18 21:45:19 +02:00
Laurent Destailleur
f7c84c6621 Merge manually first step for situation invoice from #29897 2024-06-18 20:21:56 +02:00
Laurent Destailleur
2966537c44 Fix #30053 2024-06-18 16:24:05 +02:00
Laurent Destailleur
cd68a097bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-17 13:48:34 +02:00
Laurent Destailleur
f413481f7d Clean code 2024-06-17 13:48:15 +02:00
Frédéric FRANCE
7690fd7191
phpstan ignore level 4 (#30047) 2024-06-17 13:17:38 +02:00
Christian Humpel
a7dc50f7c5
Fix #30022 (#30024) 2024-06-15 15:11:01 +02:00
Lucas Marcouiller
0a1eb954d7
Fix warnings and deprecated (#29999)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-13 08:51:22 +02:00
ems-co
20d9f4048c
FIX|Fix Bug #[29838 Expense payment in accounting report] (#30006)
Fixed the issue where the expense report payment is not calculated in the Accounting-> reporting -> income/expense months.
2024-06-13 08:07:55 +02:00
Frédéric FRANCE
c9f9e44454
add phpdoc (#29982)
* add phpdoc

* token

* token
2024-06-11 01:06:52 +02:00
Frédéric FRANCE
939c4df83c
fix warning (#29981) 2024-06-11 01:03:26 +02:00
Mathieu Moulin
abcb1dad4b
Define CommonObject relation in CommonObjectLine classes (#29956) 2024-06-10 16:08:39 +02:00
Zephyriony
2bfa92983c
NEW : Execute doActions on statistics pages (#29851)
* NEW : Execute doActions on statistics pages

* Update index.php

* Update index.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-09 13:39:00 +02:00
Lucas Marcouiller
3c06fe163e
Fix #29843 warning division by zero (#29848)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-06-09 03:20:06 +02:00
Eric
000efd5221
Fix #29640: (#29939)
* FIX REPLENISH MANY FOURN WHEN ORDER ALREADY CREATE (#29710)

* fix restrictedArea on selectobject (#29882)

* Fix travis

* Fix : expense report reapproval email, wrong date format + missing parameter (#29874)

* delete_linked_contact is < 0 in case of error

---------

Co-authored-by: IC-Mathieu <95343351+IC-Mathieu@users.noreply.github.com>
Co-authored-by: Rémi Champlon <85104766+Kazimir42@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@users.sourceforge.net>
Co-authored-by: Maxime Kohlhaas <maxime@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-09 01:11:03 +02:00
boudet jean pascal
02eb66d9f4
New user author modele fac rec (#29858)
* add conf  in fac_rec

* pre-commit

* Update facture.class.php

Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>

* Update facture.class.php

Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>

---------

Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-08 12:37:07 +02:00
lamrani abdelwadoud
5eede37cb0
FIX checking if file was open (#29871) 2024-06-07 16:30:53 +02:00
Laurent Destailleur
856600470d Debug v20 2024-06-05 11:57:17 +02:00
Laurent Destailleur
ae90b1123f Debug v20 2024-06-04 18:55:34 +02:00
Laurent Destailleur
d20ab1a0d0 Debug v20 2024-06-04 02:44:15 +02:00
Laurent Destailleur
fc797b2b75 Debug v20 2024-06-04 02:38:04 +02:00