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

6378 Commits

Author SHA1 Message Date
jpb
b1cba14718 merge conflict 2021-08-12 09:36:34 +02:00
Laurent Destailleur
745af0f025 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-11 21:54:35 +02:00
Laurent Destailleur
d66df5cb60 Complete #15548 2021-08-11 21:53:21 +02:00
Laurent Destailleur
c36bb0fbf7 Merge branch 'develop' into patch-163 2021-08-11 21:43:42 +02:00
Laurent Destailleur
3befe8f383 Update 12.0.0-13.0.0.sql 2021-08-11 21:34:11 +02:00
Laurent Destailleur
9e54dc0dcb typo 2021-08-11 21:31:14 +02:00
Laurent Destailleur
21df418468 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-10 19:28:44 +02:00
Laurent Destailleur
2c5e0a595b Fix init data missing 2021-08-09 17:58:08 +02:00
Laurent Destailleur
e91c5fc1c5 Clean code 2021-08-09 17:55:26 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Laurent Destailleur
739d8e1c6b Fix data structure 2021-08-09 16:19:23 +02:00
Laurent Destailleur
305314c04e Fix data structure 2021-08-09 16:18:33 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Laurent Destailleur
ea6cfeb0e8 NEW Increase size of params of action for emailcollector 2021-08-03 19:21:18 +02:00
Laurent Destailleur
5ec3245119 Migration 2021-08-03 17:15:55 +02:00
Laurent Destailleur
78358d4ea1 Merge pull request #18190 from frederic34/migration_cat_tickets 
add categories tickets migration
 2021-08-03 17:13:06 +02:00
UT from dolibit
b801188801 Update llx_c_actioncomm.sql 2021-08-02 12:12:57 +02:00
Frédéric FRANCE
099164c043 Merge remote-tracking branch 'upstream/develop' into migration_cat_tickets 2021-08-02 09:01:27 +02:00
Laurent Destailleur
7f28ad325b Merge pull request #18208 from dolibit-ut/patch-364 
Update llx_00_c_country.sql
 2021-08-01 14:55:29 +02:00
Laurent Destailleur
b332d02d20 Merge pull request #18248 from cfoellmann/agenda-fcomm-cancel 
NEW add agenda auto creation on supplier_order cancellation
 2021-07-31 17:02:08 +02:00
Laurent Destailleur
cb2c7d1485 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 17:00:00 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
1e8f27975d Merge pull request #18207 from dolibit-ut/patch-363 
Update llx_20_c_departements.sql
 2021-07-31 13:30:53 +02:00
jpb
15578c2ec2 merge conflict 2021-07-30 10:57:04 +02:00
Florian HENRY
6f3080c67c send mail from ConfOrBooth list to attendees or santd company 2021-07-29 19:24:12 +02:00
Christian Foellmann
8d87bdcf7e add sql data for fresh install 2021-07-29 08:18:55 +02:00
Christian Foellmann
b9cb04d4b7 Merge branch 'develop' into agenda-fcomm-cancel 2021-07-29 08:14:02 +02:00
ksar
3e3751e161 Add url field 
#18212
 2021-07-27 22:13:19 +02:00
Christian Foellmann
faf50a5aaa add agenda auto creation on supplier_order cancellation 2021-07-27 15:06:28 +02:00
Florian HENRY
f4fd4d8e7d new: ref fourn and ref customer same size as ref product 2021-07-27 12:09:04 +02:00
UT from dolibit
8920590e28 Update llx_00_c_country.sql 
Singapour  -->  Singapore 
Iles Aland  -->  Åland Island 
Samoa américaines  -->  American Samoa 
Antarctique  -->  Antarctica 
Antigua-et-Barbuda  -->  Antigua and Barbuda 
Azerbaïdjan  -->  Azerbaijan
 2021-07-23 12:48:25 +02:00
UT from dolibit
38b34b1f19 Update llx_20_c_departements.sql 
Panama
 2021-07-23 12:25:59 +02:00
Frédéric FRANCE
f2dc3be051 add categories tickets migration 2021-07-21 08:40:07 +02:00
Laurent Destailleur
afa6ced6c9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2021-07-21 01:29:22 +02:00
Laurent Destailleur
dbed6bc0da Fix #yogosha6678 2021-07-21 01:18:48 +02:00
Laurent Destailleur
e02fbadcd7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2021-07-21 00:41:40 +02:00
Laurent Destailleur
e4bb5ed008 Fix phpcs 2021-07-21 00:35:08 +02:00
Laurent Destailleur
2383fd02c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-20 23:20:22 +02:00
Laurent Destailleur
e25171b9f5 Fix phpcs 2021-07-20 23:03:19 +02:00
Laurent Destailleur
cea35bd208 Fix pass was lost on error 2021-07-20 22:14:11 +02:00
jpb
367e839239 change class css and behavior js 2021-07-20 13:56:30 +02:00
jpb
97287af987 add field to object product, add sql 2021-07-19 14:03:03 +02:00
Laurent Destailleur
0ccc2d9033 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-16 15:01:11 +02:00
Laurent Destailleur
501bc853af Fix default value 2021-07-16 12:44:15 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/functions.lib.php
 2021-07-13 13:14:27 +02:00
Laurent Destailleur
7a589921fe Fix #18142 2021-07-13 13:10:19 +02:00
Laurent Destailleur
4c29a3ad99 Fix migration 2021-07-13 13:06:28 +02:00
Laurent Destailleur
df3d88570c Fix missing column in migration 2021-07-13 11:39:08 +02:00
Laurent Destailleur
6f4090f567 Merge pull request #18127 from evarisk-theo/add-ticket-categories-data-model 
add: ticket categories data model
 2021-07-12 13:19:47 +02:00