Commit graph

123973 commits

Author SHA1 Message Date
Laurent Destailleur
5eb47adef1
Merge pull request #27065 from atm-jonathan/FIX_add_trad_menu_left_recruitment
add trad menu left recuitment
2023-12-14 02:23:27 +01:00
Laurent Destailleur
ebde4258a7
Merge pull request #27072 from frederic34/patch-3
fix error message
2023-12-14 01:35:54 +01:00
Laurent Destailleur
51c8c4f737 Fix bad table name 2023-12-14 00:23:00 +01:00
Frédéric FRANCE
ab7b9820d4
fix error message 2023-12-13 09:34:25 +01:00
Jonathan Lescaut
2c23b8db03 add trad menu left recuitment 2023-12-12 15:11:04 +01:00
Laurent Destailleur
b4af7a0061 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-12 15:04:13 +01:00
Laurent Destailleur
77a22ea78e Fix table was renamed 2023-12-12 15:01:23 +01:00
Laurent Destailleur
074ca4d63f
Merge pull request #27043 from Easya-Solutions/18.0_fix_fetch_societe
Manage ref_alias for fetch societe
2023-12-11 14:26:57 +01:00
tnegre
9aa1b32c07 Manage ref_alias for fetch societe 2023-12-11 09:54:50 +01:00
Laurent Destailleur
174a9a4cf8 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-07 16:20:43 +01:00
Laurent Destailleur
db71fd54cc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-07 16:20:34 +01:00
Laurent Destailleur
c1d4d5aa63 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-07 16:20:02 +01:00
Laurent Destailleur
dfc79f3673 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-07 16:19:21 +01:00
Laurent Destailleur
b741db349e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-12-07 16:18:31 +01:00
Laurent Destailleur
2eb2437793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-12-07 16:17:39 +01:00
Laurent Destailleur
0c2bcfa79e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-12-07 16:16:34 +01:00
Laurent Destailleur
ea7afeb007 Fix warning 2023-12-07 16:16:22 +01:00
Laurent Destailleur
c5d2d22528
Merge pull request #27007 from mdeweerd/fix/php7.0-compatibility
Fix PHP7.0 incompatibility (void is introduced in 7.1)
2023-12-06 18:04:38 +01:00
MDW
bcdb567dd7 Fix PHP7.0 incompatibility (void is introduced in 7.1) 2023-12-06 16:47:44 +01:00
Laurent Destailleur
3be75c56d7
Merge pull request #26972 from daraelmin/patch-1
FIX v18 SQL error in llx_c_forme_juridique.sql when installing
2023-12-06 15:59:04 +01:00
Laurent Destailleur
61591d8094
Merge pull request #26976 from rycks/14.0_fix_create_bank_account_with_empty_solde_field
fix sql error in case of balance is empty
2023-12-06 15:52:53 +01:00
Laurent Destailleur
e732a3b989
Merge pull request #27000 from W1W1-M/fix-pdf-cornas-page-head-cell-width
FIX pdf cornas page head multicell width (backport v17)
2023-12-06 15:39:47 +01:00
Laurent Destailleur
8be16aea52 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-06 15:20:00 +01:00
William Mead
f74073f1a3 Added contributor details 2023-12-06 15:18:25 +01:00
William Mead
b53420e64e Refactored & adjusted page head width 2023-12-06 15:17:29 +01:00
Laurent Destailleur
388eb1119e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-06 15:10:46 +01:00
Laurent Destailleur
ea0c97a5d5 FIX #26735 FIX #26994 2023-12-06 15:10:30 +01:00
Eric Seigne
5601fab14f fix sql error in case of balance is empty 2023-12-05 10:41:02 +01:00
daraelmin
9a151ebe2c
FIX v18 SQL error in llx_c_forme_juridique.sql when installing
insert into llx_c_forme_juridique (fk_pays, code, libelle) values (0, ‹ 0 ›,‹ - ›);

 And

insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,‹ 00 ›,‹ Organisme de placement collectif en valeurs mobilières sans personnalité morale ›);

throws an error as the column 'code' is integer not varchar and value must be unique

see : https://www.dolibarr.fr/forum/t/nouvelle-instalation-forme-juridiques-des-tiers-pratiquement-vide/44489/4
2023-12-05 08:19:28 +01:00
Laurent Destailleur
4b6299ca15 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
2023-12-04 21:02:10 +01:00
Laurent Destailleur
2777cf843e FIX menu auguria 2023-12-04 20:57:35 +01:00
Laurent Destailleur
3d08acb69e Fix menu auguria 2023-12-04 20:55:30 +01:00
Laurent Destailleur
a6425991d6
Merge pull request #26958 from moreauftheobald/17.0
17.0: Correct bug in init_menu_auguria.sql Impossible to activate Menu
2023-12-04 20:44:59 +01:00
moreauf
97434c89bd 17.0: Correct bug in init_menu_auguria.sql Impossible to activate Menu 2023-12-04 12:29:22 +01:00
Laurent Destailleur
9b8d0096e6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-02 14:20:50 +01:00
Laurent Destailleur
67dbfe118c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-02 12:48:00 +01:00
Laurent Destailleur
bae5934af7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-12-02 12:46:23 +01:00
Laurent Destailleur
09da842b68 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-12-02 12:44:33 +01:00
Laurent Destailleur
a79e016321
Merge pull request #26906 from rycks/14.0_fix_join_file_on_sendEmailsRemindersOnInvoiceDueDate
fix #26862 but on 14.0 where that bug was present
2023-12-02 12:42:59 +01:00
HENRY Florian
0df3172678
fix: missing name of intervenant on Solieil PDF Model (#26917) 2023-12-01 19:50:37 +01:00
HENRY Florian
722e266afb
fix: add customer name ad sign date on PDF Soleil (#26919)
* fix: add customer anme ad sign date on PDF Soleil

* fix: review pos of text
2023-12-01 19:50:09 +01:00
Alban Durrheimer
98f8acc1a5
Update the product description in the Vinci PDF to limit the size of the description (#26924) 2023-12-01 19:42:16 +01:00
Eric Seigne
d6c97bd75e check if last_main_doc is not empty 2023-11-30 19:17:14 +01:00
Eric Seigne
951afdcb68 cleanup 2023-11-30 19:15:56 +01:00
Eric Seigne
7782ae4fd0 fix #26862 but on 14.0 where that bug was present 2023-11-30 19:12:26 +01:00
Laurent Destailleur
2eec78ccea Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-29 21:02:05 +01:00
Laurent Destailleur
2db1cc29d0 Prepare 18.0.4 2023-11-29 21:01:51 +01:00
Alexandre SPANGARO
ccfb5e2730
Debug v18 (#26877)
* Fix column name - Colspan problem

* Update DolibarrModules.class.php
2023-11-28 09:18:16 +01:00
Laurent Destailleur
9d67ca34d3 Fix count on nb of permission 2023-11-27 21:19:15 +01:00
Laurent Destailleur
f3ee48bfe0
Merge pull request #26870 from OPEN-DSI/18.0_fix_force_date_on_valid_invoice
FIX: Fix when options FAC_FORCE_DATE_VALIDATION and INVOICE_CHECK_POSTERIOR_DATE enabled
2023-11-27 19:27:24 +01:00