Laurent Destailleur
|
e6cd071e02
|
Fix email templates
|
2021-09-16 12:31:33 +02:00 |
|
Laurent Destailleur
|
3a04fc557b
|
Fix email templates
|
2021-09-16 12:30:46 +02:00 |
|
Laurent Destailleur
|
0fc51b6564
|
Fix email content
|
2021-09-16 12:10:40 +02:00 |
|
Laurent Destailleur
|
b18e0e3d1e
|
Add missing translation key
|
2021-09-16 12:04:46 +02:00 |
|
Laurent Destailleur
|
3f7a75b0a3
|
FIX translation into email for member at membership validation.
|
2021-09-15 19:02:17 +02:00 |
|
Laurent Destailleur
|
f3fcb7a48a
|
Fix insertion of email templates
|
2021-09-14 16:59:49 +02:00 |
|
lmarcouiller
|
977fa99681
|
update knowledgemanagement.key name
|
2021-09-13 11:39:08 +02:00 |
|
lmarcouiller
|
4762fd9c2e
|
Close #18678 : Implemention of tags/categories KM
|
2021-09-13 11:22:55 +02:00 |
|
Laurent Destailleur
|
11b6259130
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/langs/en_US/admin.lang
|
2021-09-10 11:40:45 +02:00 |
|
Laurent Destailleur
|
7526cb3b8b
|
Fix VAT rate label and add Mali default vat rate
|
2021-09-10 09:44:06 +02:00 |
|
Laurent Destailleur
|
5a87d94b3c
|
Add missing fields into llx_holiday
|
2021-09-09 20:38:25 +02:00 |
|
Laurent Destailleur
|
fa28621709
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/reception/list.php
|
2021-09-09 16:11:29 +02:00 |
|
Laurent Destailleur
|
478918bd45
|
Fix phpunit
|
2021-09-09 15:59:43 +02:00 |
|
Laurent Destailleur
|
654bf4d672
|
Fix name of index #18623
|
2021-09-09 15:07:55 +02:00 |
|
Laurent Destailleur
|
e332ca88e4
|
Fix missing sql
|
2021-09-09 15:06:30 +02:00 |
|
Laurent Destailleur
|
f1758b6f0c
|
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields
14.0 fix salary extrafields are no more available
|
2021-09-09 14:58:54 +02:00 |
|
Laurent Destailleur
|
3c215730db
|
Merge pull request #18639 from Hystepik/develop_v14#1
Fix #18633 : fix error message
|
2021-09-09 04:56:54 +02:00 |
|
Laurent Destailleur
|
77b8d91895
|
Update 13.0.0-14.0.0.sql
|
2021-09-09 04:56:25 +02:00 |
|
Laurent Destailleur
|
ca2aa6d031
|
Clean comment
|
2021-09-09 04:37:08 +02:00 |
|
Laurent Destailleur
|
32a09e9494
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/salaries/paiement_salary.php
|
2021-09-07 17:47:00 +02:00 |
|
Laurent Destailleur
|
1fda7d43ef
|
Fix sql
|
2021-09-07 17:45:22 +02:00 |
|
Laurent Destailleur
|
0edf2f344b
|
Fix sql
|
2021-09-07 17:38:46 +02:00 |
|
lmarcouiller
|
f3babd2819
|
Fix #18633 : fix error message
|
2021-09-07 13:59:36 +02:00 |
|
Laurent Destailleur
|
7b43d07a36
|
Fix sql
|
2021-09-07 13:01:18 +02:00 |
|
Gauthier PC portable 024
|
383c92f6c6
|
FIX : migration script
|
2021-09-06 14:52:11 +02:00 |
|
Gauthier PC portable 024
|
be1c08ddfe
|
FIX : salary extrafields don't work and table is not well named
|
2021-09-06 12:30:39 +02:00 |
|
jpb
|
06b9f90383
|
merge conflict
|
2021-09-06 09:52:28 +02:00 |
|
jpb
|
65a2486f94
|
merge conflict
|
2021-09-06 09:43:52 +02:00 |
|
ptibogxiv
|
8850bd774c
|
Update 14.0.0-15.0.0.sql
|
2021-09-04 19:37:36 +02:00 |
|
ptibogxiv
|
c276882442
|
Update 14.0.0-15.0.0.sql
|
2021-09-04 19:36:57 +02:00 |
|
ptibogxiv
|
885237f3ac
|
Update llx_knowledgemanagement_knowledgerecord.sql
|
2021-09-04 19:32:15 +02:00 |
|
Laurent Destailleur
|
138af805b3
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-09-04 14:11:38 +02:00 |
|
Laurent Destailleur
|
87b33c09e0
|
Merge pull request #18595 from FHenry/14_eventorg
NEW : Can register an attendees on project global (and also on conférence)
|
2021-09-03 20:50:21 +02:00 |
|
Florian HENRY
|
96f9f8ae98
|
work on event
|
2021-09-03 15:40:33 +02:00 |
|
Laurent Destailleur
|
cd313d7506
|
Save type (manufacture/disassemble) on MO.
|
2021-09-02 15:23:31 +02:00 |
|
Laurent Destailleur
|
8600d8d00d
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-09-01 22:50:06 +02:00 |
|
Laurent Destailleur
|
03cfea2504
|
Fix const setup
|
2021-09-01 19:06:58 +02:00 |
|
Laurent Destailleur
|
4b7b54e196
|
Update 14.0.0-15.0.0.sql
|
2021-09-01 16:32:25 +02:00 |
|
Laurent Destailleur
|
3b236f677d
|
Update llx_product_association.sql
|
2021-09-01 16:31:16 +02:00 |
|
Laurent Destailleur
|
0aa4868c34
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-08-31 13:14:01 +02:00 |
|
Laurent Destailleur
|
426894f6a6
|
Fix not null column
|
2021-08-30 21:44:09 +02:00 |
|
Adrien Raze
|
317876eb0c
|
NEW : Update SQL : install and migration
|
2021-08-30 15:48:22 +02:00 |
|
jpb
|
fcd485f614
|
merge conflict
|
2021-08-18 09:16:28 +02:00 |
|
Laurent Destailleur
|
3bc8a7345c
|
Merge branch 'develop' into develop#1
|
2021-08-18 00:37:23 +02:00 |
|
Laurent Destailleur
|
f38b9eb1c4
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-08-17 19:02:29 +02:00 |
|
Laurent Destailleur
|
47b4fd3769
|
Complete migration
|
2021-08-17 19:02:16 +02:00 |
|
Laurent Destailleur
|
b96dd7a796
|
Merge branch 'develop' into patch-422
|
2021-08-17 19:00:46 +02:00 |
|
Laurent Destailleur
|
92d6ad9597
|
Removed old simple POS module ('cashdesk' module)
|
2021-08-17 04:57:53 +02:00 |
|
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 |
|
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
|
5ec3245119
|
Migration
|
2021-08-03 17:15:55 +02:00 |
|
Laurent Destailleur
|
d3515253b2
|
Update 13.0.0-14.0.0.sql
|
2021-08-03 17:15:13 +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 |
|
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 |
|
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
|
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 |
|
Laurent Destailleur
|
7533c9e3a5
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/fr_FR/interventions.lang
|
2021-07-12 12:01:53 +02:00 |
|
Laurent Destailleur
|
977600e3a5
|
v15
|
2021-07-12 11:55:30 +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 |
|