Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
127,913 Commits 36 Branches 190 Tags
58ba3e31fadd6b7a39e41a6481c2fbeb51cfdbc0
Commit Graph

128 Commits

Author SHA1 Message Date
Laurent Destailleur
b10e7b9d57 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-06 22:10:18 +02:00
Laurent Destailleur
9288084ae0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-07-06 22:08:04 +02:00
Laurent Destailleur
4e1d9f13ea Fix migration 2023-07-05 22:10:35 +02:00
Eric Seigne
770ecceea0 fix #25275: tms default timestamp 2023-07-05 17:54:15 +02:00
Laurent Destailleur
35e066ff8b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-27 01:05:04 +02:00
Quentin VIAL-GOUTEYRON
db8fb196c9 FIX SQL migration file 2023-06-23 13:51:24 +02:00
Laurent Destailleur
51bf3f0686 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-19 19:14:44 +01:00
Laurent Destailleur
9a192e443e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-19 19:05:47 +01:00
Laurent Destailleur
c895f366a1 Fix sql 2023-03-19 11:36:06 +01:00
Laurent Destailleur
502badad4b Better error management 2023-03-19 11:32:46 +01:00
Laurent Destailleur
701c5b915f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-13 14:01:32 +01:00
Laurent Destailleur
239f7a1eb0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-13 13:58:03 +01:00
Florian HENRY
8bd6f070aa FIX: product ref fourn same size in supplier order/invoice as in product price fourn 2023-02-09 17:22:45 +01:00
Chl
b4d4c42cfb FIX #20476 discrepancy between MySQL & PostgreSQL default value 2022-07-22 21:10:23 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-09 16:53:53 +02:00
Laurent Destailleur
65eb11efdf Fix sql migration 2022-05-08 17:39:53 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2022-05-06 12:46:26 +02:00
Laurent Destailleur
e3b777ad5b Merge pull request #20649 from FHenry/15.0_fix_createtable_without_migration_script 
fix: CREATE TABLE llx_element_tag without migration script
 2022-05-04 17:15:53 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
 2022-04-29 17:35:36 +02:00
Laurent Destailleur
e1aaeeef29 FIX #20140 #20301 2022-04-29 16:57:23 +02:00
matll42
ff35bf8d47 FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type 2022-04-29 16:53:48 +02:00
HENRY Florian
9acb1b2f88 Update 14.0.0-15.0.0.sql 2022-04-16 11:14:04 +02:00
Florian HENRY
bed974ebae Merge branch '15.0' of github.com:Dolibarr/dolibarr into 15.0_fix_createtable_without_migration_script 2022-04-15 10:22:33 +02:00
Florian HENRY
24bb6c6f83 fix: clean mess up around element_tag table 2022-04-15 10:20:52 +02:00
Laurent Destailleur
4e34649fc2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2022-04-14 16:10:23 +02:00
Laurent Destailleur
5e76c1a45d Fix doc 2022-04-12 21:59:34 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
876a013ded Fix migration 2022-03-17 19:09:58 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Laurent Destailleur
fa707c6015 Fix error from v12 2022-03-07 15:20:55 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
32f2eb8c94 Debug v15 2022-02-28 12:13:06 +01:00
Laurent Destailleur
b393a1277f Update 14.0.0-15.0.0.sql 2022-02-17 19:50:21 +01:00
Alfredo Altamirano
88a33c730a FIX #20042 Update Mexican legal entities 2022-02-11 02:01:25 -06:00
Laurent Destailleur
21f0264683 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 13:02:48 +01:00
Laurent Destailleur
760b8caa31 Fix migration 2022-02-10 11:26:36 +01:00
Laurent Destailleur
86da9c610e Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance 
NEW: leave requests: add field into type dictionary to block request if balance is negative
 2022-02-04 20:23:04 +01:00
Anthony Berton
6fdbda93f8 Update 14.0.0-15.0.0.sql 2022-01-28 02:28:55 +01:00
Laurent Destailleur
4b00ddb0b5 Merge pull request #19866 from atm-gauthier/FIX_hrm_divers 
FIX : rankorder + vacant positions
 2022-01-25 14:02:44 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
Anthony Berton
f093e01cec Update 14.0.0-15.0.0.sql 2022-01-18 19:34:18 +01:00
Gauthier PC portable 024
255d8ba753 FIX : rankorder + vacant positions 2022-01-18 10:59:10 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
00108589fd Fix creation of fields tms into sql scripts 2022-01-11 01:00:31 +01:00
Laurent Destailleur
3a6b5199ec Debug module intracomm 2022-01-08 01:19:04 +01:00
Laurent Destailleur
fcb10df570 Fix size of origintype 2021-12-17 09:54:03 +01:00
Laurent Destailleur
494e9a2745 Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-12-16 19:12:06 +01:00
Laurent Destailleur
3abb3f5018 Debug inventory feature 2021-12-12 00:05:31 +01:00