Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 11:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
136,669 Commits 36 Branches 190 Tags
033f0aa0a7f23165579f6af2a8e5b51e69e90e98
Commit Graph

8104 Commits

Author SHA1 Message Date
Laurent Destailleur
cbc28b0afd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-08-01 14:02:36 +02:00
Laurent Destailleur
534570a85b Disable deprecated entry 2024-08-01 13:39:27 +02:00
Laurent Destailleur
2068f29b44 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-08-01 10:51:25 +02:00
Laurent Destailleur
f82eabbab7 FIX #30513 FIX #30515 2024-08-01 10:48:17 +02:00
lamrani abdelwadoud
31a560422d New Preview mai topic value on Ckeditor (#30195) 
* New update for templateMail by creating files

* New updating for get php content

* Update html.formmail.class.php

* Fix updating content news

* Fix CTI Errors

* edit html file for news

* Add automaticaly subject value to editor

* Update html.formmail.class.php

* FIX name and path of file

* Fix path for files

* Fix errors variables

* replace file in ajax folder

* rename path

* update the news file

* fix phan errors

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-31 19:12:40 +02:00
Lucas Marcouiller
a671c91d3e QUAL bankline category table name (#30419) 
* FIX bankline category table name

* remove bad space

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-28 17:43:46 +02:00
Laurent Destailleur
6428a1d892 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-07-28 15:05:02 +02:00
Regis Houssin
221bdc78f6 FIX replace __ENTITY__ tag with id 1 (master entity) (#30478) 
* FIX replace __ENTITY__ tag with id 1 (master entity)

* FIX phan error
 2024-07-27 19:51:25 +02:00
Laurent Destailleur
fa915b775b Fix migration 2024-07-27 14:51:34 +02:00
Regis Houssin
7be611deb7 FIX Erreur SQL DB_ERROR_1170 BLOB/TEXT column 'url' used in key (#30479) 
specification without a key length
 2024-07-27 12:37:58 +02:00
Laurent Destailleur
fa700074c9 Fix missing migration due to bad table name in previous versions 2024-07-26 13:31:44 +02:00
Mohamed DAOUD
4dca8eb7bf add column to societe account table (#30442) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-25 18:23:31 +02:00
Laurent Destailleur
b494d26f95 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-25 14:51:48 +02:00
HENRY Florian
c7f5be1523 fix: bad table on add column (#30449) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-25 14:30:46 +02:00
Regis Houssin
a1ed02fa6d Fix 20 missing entity filter (#30466) 
* FIX missing entity filter for holiday types dict

* FIX wrong table name for field name

* FIX wrong table name (travis error)
 2024-07-25 14:30:07 +02:00
Laurent Destailleur
38d8d30c85 Code comment 2024-07-25 13:59:12 +02:00
Nicolas Stremsdoerfer
53e0c4cae7 Update 19.0.0-20.0.0.sql (#30429) 
table name error => index llx_c_holiday_types not created with 
Erreur DB_ERROR_1072 (Req 265): ALTER TABLE llx_c_holiday_types ADD UNIQUE INDEX uk_c_holiday_types (entity, code);
Key column 'entity' doesn't exist in table
 2024-07-21 21:49:26 +02:00
Laurent Destailleur
6ac589b0a9 NEW Introduce value 'password' formode of sanitization in GETPOST. 2024-07-21 14:44:14 +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
Shanty
8c4f3534cc NEW #28871 signed_status to commande (#30359) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-16 15:22:54 +02:00
Laurent Destailleur
19462bf5d5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-16 14:49:25 +02:00
Regis Houssin
f7fff4aae7 FIX missing entity field in holiday types dict (#30392) 
* FIX missing entity field in holiday types dict

* FIX sql syntax error
 2024-07-16 13:36:49 +02:00
Regis Houssin
226ce3f311 FIX dictionary can not have entity = 0 (#30393) 2024-07-16 12:41:08 +02:00
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
fff875c9e3 Fix bad length for url field for menus 2024-07-15 17:18:43 +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
Laurent Destailleur
74d4c59b17 CSS 2024-07-09 16:33:10 +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
04a1b6b1f5 Close #24842 2024-07-06 15:31:30 +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
Frédéric FRANCE
ea416aac93 replace old syntax, rename pdf models with same class name (#30271) 
* replace old syntax

* replace old syntax

* replace old syntax

* replace old syntax

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* rename files with same class name

* fix class with same name

* fix class with same name

* clean code
 2024-07-06 02:59:40 +02:00
Zephyriony
46435ceb44 QUAL Update inc.php (#29822) 
Adaptation of detect_dolibarr_main_data_root to handle more cases, especially when servers don't have htdocs

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-02 01:59:20 +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
Laurent Destailleur
4ba6b0d2f0 Clean language 2024-06-30 15:26:31 +02:00
Laurent Destailleur
6c02ba9f92 Doc 2024-06-30 12:19:34 +02:00
Laurent Destailleur
6ad4ebc81c Start implementation of STOCK_USE_WAREHOUSE_USAGE. 2024-06-30 12:16:41 +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
902065406b Debug v20 2024-06-27 09:20:04 +02:00
lamrani abdelwadoud
16ffc39735 New update for templateMail by creating files (#30151) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-26 18:01:00 +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
c8eee02b66 Add total field into contract 2024-06-24 11:18:52 +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
a4a7ee0805 Debug v20 2024-06-23 23:05:50 +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
62a7c7728b Debug v20 2024-06-23 13:57:35 +02:00
Laurent Destailleur
088f9e795b Removed not used field 2024-06-23 13:52:57 +02:00
dolibarr95
f15133562d Update llx_c_socialnetworks.sql LinkedIn link (#30121) 
Wrong link for LinkedIn social network
 2024-06-22 15:56:58 +02:00
Frédéric FRANCE
ba461fa2e7 fix migration19.0.0-20.0.0.sql (#30126) 2024-06-22 15:31:33 +02:00
Laurent Destailleur
587e6347ff Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-20 20:41:09 +02:00
Laurent Destailleur
4b0579366e Fix missing column entity 2024-06-20 15:05:03 +02:00