jpb
|
b1cba14718
|
merge conflict
|
2021-08-12 09:36:34 +02:00 |
|
Laurent Destailleur
|
c36bb0fbf7
|
Merge branch 'develop' into patch-163
|
2021-08-11 21:43:42 +02:00 |
|
Laurent Destailleur
|
9e54dc0dcb
|
typo
|
2021-08-11 21:31:14 +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 |
|
jpb
|
f99ba2c1e1
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
|
2021-08-04 17:26:23 +02:00 |
|
Hystepik
|
e02d93c401
|
Merge branch 'develop' into develop#1
|
2021-08-04 16:15:50 +02:00 |
|
Laurent Destailleur
|
ea6cfeb0e8
|
NEW Increase size of params of action for emailcollector
|
2021-08-03 19:21:18 +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 |
|
jpb
|
15578c2ec2
|
merge conflict
|
2021-07-30 10:57:04 +02:00 |
|
ksar
|
3e3751e161
|
Add url field
#18212
|
2021-07-27 22:13:19 +02:00 |
|
Florian HENRY
|
f4fd4d8e7d
|
new: ref fourn and ref customer same size as ref product
|
2021-07-27 12:09:04 +02:00 |
|
jpb
|
97287af987
|
add field to object product, add sql
|
2021-07-19 14:03:03 +02:00 |
|
lmarcouiller
|
1fb99a3185
|
Update to match eldy changes
|
2021-07-16 15:47:17 +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 |
|
lmarcouiller
|
f68f98cbdd
|
New : language support for knowledgemanagement module
|
2021-07-16 09:59: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
|
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 |
|
evarisk-theo
|
8496c9e57f
|
Merge branch 'Dolibarr:develop' into add-ticket-categories-data-model
|
2021-07-12 09:09:53 +02:00 |
|
Laurent Destailleur
|
41016039b6
|
Fix missing very old table
|
2021-07-11 19:39:18 +02:00 |
|
Laurent Destailleur
|
ab030936c3
|
Fix missing commit on tables
|
2021-07-11 19:15:16 +02:00 |
|
Laurent Destailleur
|
032b44996c
|
Debug v14
|
2021-07-11 19:09:51 +02:00 |
|
Laurent Destailleur
|
802ac58f9a
|
Clean v14
|
2021-07-11 18:56:15 +02:00 |
|
Laurent Destailleur
|
87241c94a3
|
Code comment
|
2021-07-05 14:41:40 +02:00 |
|
Théo David
|
de847250b1
|
NEW #18046 Add ticket categories data model
|
2021-07-01 17:55:54 +02:00 |
|
Laurent Destailleur
|
bda36337cd
|
Prepare fix #yogosha6443
|
2021-06-30 17:22:36 +02:00 |
|
Laurent Destailleur
|
5697e86c09
|
Fix columns for export/import profile
|
2021-06-21 14:12:33 +02:00 |
|
Laurent Destailleur
|
3754c2c3c9
|
Fix name of field
|
2021-06-17 00:59:11 +02:00 |
|
Laurent Destailleur
|
d04fe12ce9
|
# WARNING: head commit changed in the meantime
Clean code
|
2021-06-14 15:05:54 +02:00 |
|
Laurent Destailleur
|
9f177a0c63
|
Debug v14
|
2021-06-06 16:36:41 +02:00 |
|
Laurent Destailleur
|
34955b1cf9
|
Fix sql
|
2021-06-04 12:48:18 +02:00 |
|
Laurent Destailleur
|
4d42235670
|
Complete experimental module knowledge management
|
2021-05-18 20:46:14 +02:00 |
|
Laurent Destailleur
|
9a8bd2c24b
|
Add missing field
Fix duplicate / in url
|
2021-05-17 06:13:26 +02:00 |
|
Laurent Destailleur
|
5e0f2f9781
|
Debug v14. Fix regression.
|
2021-05-12 22:35:21 +02:00 |
|
Laurent Destailleur
|
3ea6cd1c66
|
Fix missing columns
|
2021-05-12 08:53:29 +02:00 |
|
Laurent Destailleur
|
6019df2dfc
|
Merge branch 'batch_status_dict' of
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict
# Conflicts:
# htdocs/langs/fr_FR/productbatch.lang
|
2021-05-06 17:29:41 +02:00 |
|
lmarcouiller
|
209682e710
|
Fix #17361 : changes into mysql/tables of export_model
|
2021-05-05 11:30:13 +02:00 |
|
Laurent Destailleur
|
d6617f82ca
|
Merge branch 'develop' into develop
|
2021-05-04 00:23:28 +02:00 |
|
Laurent Destailleur
|
03e8f2aee1
|
Fix for performance troubles
|
2021-05-03 18:49:37 +02:00 |
|
Laurent Destailleur
|
28b1d83ae9
|
Make some performance enhancements
|
2021-05-03 18:29:21 +02:00 |
|
daraelmin
|
8457fef1a2
|
Update llx_adherent_type.sql
|
2021-05-01 20:10:17 +02:00 |
|
altairis-noe
|
38bba5dddc
|
Merge branch 'develop' into batch_status_dict
|
2021-04-29 13:13:41 +02:00 |
|
altairis-noe
|
f7182d43fd
|
add entity in c_productbatch_qcstatus key
|
2021-04-29 13:00:47 +02:00 |
|
altairis-noe
|
762f41ea86
|
llx_c_productbatch_qcstatus as dictionnary name
|
2021-04-29 12:49:15 +02:00 |
|
lmarcouiller
|
6da32015f4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
|
2021-04-29 09:45:30 +02:00 |
|
Antonin MARCHAL
|
6dafb98707
|
Merge branch 'develop' of https://github.com/ibuiv/dolibarr into develop
|
2021-04-29 01:20:42 +02:00 |
|
Antonin MARCHAL
|
c89830b25b
|
fix(sql) pmp added to create table both migration and install
|
2021-04-29 01:17:21 +02:00 |
|