Commit graph

151292 commits

Author SHA1 Message Date
Laurent Destailleur
8a4f550d64 Debug v20 2024-07-09 17:33:27 +02:00
Laurent Destailleur
74d4c59b17 CSS 2024-07-09 16:33:10 +02:00
Laurent Destailleur
82070c43b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-09 03:03:18 +02:00
Laurent Destailleur
a722a82a60 Move line at better place for final v20 2024-07-09 03:02:56 +02:00
jyhere
2bf38d09ed FIX: $rappro property should match the updated value (Account::updateconciliation()) (#30311) 2024-07-08 23:50:43 +02:00
jyhere
2a18909e9d
FIX: $rappro property should match the updated value (Account::updateconciliation()) (#30311) 2024-07-08 23:44:58 +02:00
Alexandre SPANGARO
850cafb588
Add llxHeader body css for ai (#30307)
* Add llxHeader body css for ai

* Fix $title in cartes member
2024-07-08 22:10:25 +02:00
Eric - CAP-REL
e457ff4ab1
fix dol syslog message (#30306) 2024-07-08 21:52:03 +02:00
Frédéric FRANCE
2874e85728
fix phpdoc of tva_by_rate (#30308)
* fix phpdoc of tva_by_rate

* fix phpdoc of tva_by_thirdparty
2024-07-08 21:51:27 +02:00
Alexandre SPANGARO
ec3e26b1df
Add llxHeader body css for contact (#30309) 2024-07-08 21:50:58 +02:00
Alexandre SPANGARO
dd8f5cc9e1
Add llxHeader body css for contract (#30310)
* Add llxHeader body css for contract

* Add llxHeader body css for contract

* Add llxHeader body css for contract

* Fix codesniffer

* Fix codesniffer

* Fix codesniffer

* Fix codesniffer
2024-07-08 21:50:47 +02:00
atm-jonathan
58bba2d58c
missing token (#30313) 2024-07-08 21:46:59 +02:00
Alexandre SPANGARO
4abe433c22
NEW Propale - Can upload a file with drag and drop (#30315) 2024-07-08 21:46:36 +02:00
atm-jonathan
1e4cc39e3b
getNextValue() (#30316) 2024-07-08 21:46:07 +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
Laurent Destailleur
d78158f39d Typo 2024-07-08 16:51:15 +02:00
Laurent Destailleur
1ca30d8096 Better position of choice open/closed 2024-07-07 14:18:18 +02:00
Laurent Destailleur
4e8e0b82de Debug v20 2024-07-07 13:31:36 +02:00
Laurent Destailleur
f407503edf Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-06 17:54:43 +02:00
Laurent Destailleur
581900809c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-06 17:54:16 +02:00
Laurent Destailleur
4e9367e463 Fix error code 2024-07-06 17:53:24 +02:00
Laurent Destailleur
efa186431a Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-06 17:51:03 +02:00
Laurent Destailleur
c65660dc15 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-06 17:49:42 +02:00
Laurent Destailleur
11491bb067 Fix error code 2024-07-06 17:44:20 +02:00
Laurent Destailleur
6a3f044ba2 Clean code 2024-07-06 17:41:00 +02:00
Laurent Destailleur
829fe1dcc0 Debug v20 2024-07-06 16:29:43 +02:00
Laurent Destailleur
73d9c4a12e Debug v20 2024-07-06 16:27:23 +02:00
Laurent Destailleur
695342731c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-06 15:32:09 +02:00
Laurent Destailleur
04a1b6b1f5 Close #24842 2024-07-06 15:31:30 +02:00
Laurent Destailleur
cfd520e595 Clean code 2024-07-06 15:20:05 +02:00
Bahfir Abbes
007c91e448
Fix:Non tag special chars should be escaped before calling xml_parse_into_struct (#30300)
Fix:Non tag special chars should be escaped before calling xml_parse_into_struct
2024-07-06 15:11:18 +02:00
atm-lena
c4d7ffd01b
New main only login allowed serveral logins (#29877)
* Adding possibility to write several logins in MAIN_ONLY_LOGIN_ALLOWED

* Clean

* Clean

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2024-07-06 15:07:38 +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
Frédéric FRANCE
9a2db505f8
update ecmfile on product update (#30299)
* update ecmfile on product update

* update ecm

* update ecm

* update ecm
2024-07-06 14:34:22 +02:00
Alexandre SPANGARO
76f616796c
Add llxHeader body css for member (#30302)
* NEW : llxHeader body css for member

* NEW : llxHeader body css for member

* NEW : llxHeader body css for member

* NEW : llxHeader body css for member

* NEW : llxHeader body css for member

* NEW : llxHeader body css for member

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-06 14:32:06 +02:00
Frédéric FRANCE
f99beb9023
fix expects int (#30304) 2024-07-06 14:30:13 +02:00
Laurent Destailleur
eb5b3deddf Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2024-07-06 14:10:20 +02:00
Laurent Destailleur
8712c1c900 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
Conflicts:
	htdocs/product/card.php
2024-07-06 14:04:23 +02:00
Laurent Destailleur
146c9e5732 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-06 14:00:32 +02:00
Laurent Destailleur
9ddc8dd93c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-07-06 13:59:47 +02:00
Laurent Destailleur
0a88dc95a5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-07-06 13:59:13 +02:00
Laurent Destailleur
86362599c1 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-07-06 13:55:04 +02:00
Laurent Destailleur
ca39809658 Fix #30256 2024-07-06 13:53:54 +02:00
Laurent Destailleur
4c6f4839ea Better fix for #30256 2024-07-06 13:49:34 +02:00
Laurent Destailleur
f1b5902c28 Enhance popup of social contribution ref 2024-07-06 13:42:05 +02:00
Laurent Destailleur
875a8dc2ef Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-06 05:07:45 +02:00
Laurent Destailleur
4207048672 Debug css v20 2024-07-06 05:07:14 +02:00
Laurent Destailleur
2f14f9cbab Clean code 2024-07-06 04:21:32 +02:00
IC-Mathieu
fbcc463a6f
ADD_HOOK_IN_SITUATION (#30240)
* ADD_HOOK_SITUATION

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-06 03:54:33 +02:00
dolibarr95
ed207cfb2f
NEW : manage several type of dangerous goods for a same parcel (#30238)
* NEW : manage several type of dangerous goods for a same parcel

Manage several type of dangerous goods for a same parcel Before :
dangerous_goods : smallint (so only 1 type can be defined eg 3) After
dangerous_goods : varchar so can be a list of numbers eg 3,5,8

* Update llx_expedition_package.sql

> Adding a default value to default '0' to keep compatibility seems required.

* Update 20.0.0-21.0.0.sql

> You must include migration change into same PR so PR is atomic. Include change of #30237

* Update llx_expedition_package.sql

space missing

* Update 20.0.0-21.0.0.sql

> -- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
2024-07-06 03:34:48 +02:00