Laurent Destailleur
|
422e33a68b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
|
2020-04-12 17:01:44 +02:00 |
|
Laurent Destailleur
|
8e246f2a18
|
Prepare 11.0.4
|
2020-04-12 16:54:54 +02:00 |
|
Laurent Destailleur
|
acbbffdb7f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-04-12 16:54:15 +02:00 |
|
Laurent Destailleur
|
1cda760621
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
|
2020-04-12 16:54:09 +02:00 |
|
Laurent Destailleur
|
94ae75c2a0
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-04-12 16:53:07 +02:00 |
|
Laurent Destailleur
|
eebf48b27c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
|
2020-04-12 16:52:58 +02:00 |
|
Laurent Destailleur
|
2e27355dec
|
FIX #13569
|
2020-04-12 16:51:35 +02:00 |
|
Laurent Destailleur
|
b1bae5f3dd
|
Merge pull request #13569 from tuxgasy/Fix_breaking_selectForFormsList
Keep compatibility with old object declaration
|
2020-04-12 16:48:08 +02:00 |
|
Laurent Destailleur
|
697043bbd3
|
Update html.form.class.php
|
2020-04-12 16:47:56 +02:00 |
|
Laurent Destailleur
|
acab0200a6
|
Update html.form.class.php
|
2020-04-12 16:46:21 +02:00 |
|
Laurent Destailleur
|
e9ee7a23e6
|
Merge pull request #13573 from frederic34/patch-11
Update actioncomm.class.php
|
2020-04-12 16:42:07 +02:00 |
|
Laurent Destailleur
|
faa9b98b39
|
Merge pull request #13571 from frederic34/patch-7
Add table_ref_field to fichinterrec class
|
2020-04-12 16:41:48 +02:00 |
|
Laurent Destailleur
|
b3d58ededd
|
Merge pull request #13577 from frederic34/patch-13
Update llx_blockedlog.sql
|
2020-04-12 16:41:14 +02:00 |
|
Laurent Destailleur
|
b60ed2ca05
|
Merge pull request #13574 from andreubisquerra/master
TakePOS connector update
|
2020-04-12 16:39:44 +02:00 |
|
Laurent Destailleur
|
3cc68c6972
|
Merge pull request #13579 from atm-maxime/fix_variants_links
Fix #13576 : links on variants
|
2020-04-12 16:38:56 +02:00 |
|
Laurent Destailleur
|
a38e273ae8
|
Merge pull request #13583 from atm-maxime/fix_default_workdayhour
Fix #13468 setup working days and hours
|
2020-04-12 16:38:36 +02:00 |
|
Laurent Destailleur
|
51eea01505
|
Merge pull request #13584 from pstructures/develop
Installation issue
|
2020-04-12 16:38:08 +02:00 |
|
Laurent Destailleur
|
4640eb3fe2
|
Merge pull request #13578 from frederic34/patch-14
Update llx_categorie_website_page.key.sql
|
2020-04-12 16:37:43 +02:00 |
|
Laurent Destailleur
|
ba2c035556
|
Merge pull request #13580 from atm-maxime/fix_composition_token
Fix missing token on product composition
|
2020-04-12 16:36:48 +02:00 |
|
Laurent Destailleur
|
d842c7d603
|
Merge pull request #13585 from frederic34/patch-15
doxygen
|
2020-04-12 16:36:37 +02:00 |
|
Laurent Destailleur
|
7d430c08d0
|
Look and feel v12
|
2020-04-12 16:36:25 +02:00 |
|
Frédéric FRANCE
|
044a6192b6
|
doxygen
|
2020-04-12 16:26:19 +02:00 |
|
Matt Sidnell
|
7c72e40659
|
Installation issue
Installation SQL issue due to a ';' instead of a ','.
|
2020-04-12 15:21:14 +01:00 |
|
Maxime Kohlhaas
|
20e684ec69
|
Fix #13468 setup working days and hours
|
2020-04-12 15:30:58 +02:00 |
|
Laurent Destailleur
|
0916017519
|
Fix addreplace hook
|
2020-04-12 15:29:13 +02:00 |
|
Laurent Destailleur
|
d7784887d1
|
More font awesome picto
|
2020-04-12 14:58:50 +02:00 |
|
Tobias Sekan
|
ef38b5a015
|
fix wrong delete code line
|
2020-04-12 13:59:24 +02:00 |
|
Sekan, Tobias
|
ab870dd532
|
Switch to new category API in project list view
|
2020-04-12 13:30:02 +02:00 |
|
Laurent Destailleur
|
6b16a3ad39
|
NEW Can check all events in one click in setup of audited events
|
2020-04-12 13:25:19 +02:00 |
|
Tobias Sekan
|
3934902b9d
|
Merge pull request #14 from Dolibarr/develop
pull from develop
|
2020-04-12 13:02:34 +02:00 |
|
Maxime Kohlhaas
|
3ca0d48b37
|
Fix warning on shipment because of count func
|
2020-04-12 10:45:30 +02:00 |
|
Maxime Kohlhaas
|
8bca68cfba
|
Fix missing token on product composition
|
2020-04-12 10:39:16 +02:00 |
|
Maxime Kohlhaas
|
3f59ca6418
|
Fix #13576 : links on variants
|
2020-04-12 10:13:37 +02:00 |
|
Frédéric FRANCE
|
33a926e251
|
Update llx_categorie_website_page.key.sql
|
2020-04-12 09:08:27 +02:00 |
|
Frédéric FRANCE
|
9a1e3c1a74
|
Update llx_blockedlog.sql
|
2020-04-12 08:59:56 +02:00 |
|
Frédéric FRANCE
|
a91139f2d8
|
add user
|
2020-04-12 00:57:08 +02:00 |
|
Frédéric FRANCE
|
c06cf2eb8d
|
info categorie
|
2020-04-12 00:47:14 +02:00 |
|
Frédéric FRANCE
|
b05ea6573e
|
info categorie
|
2020-04-12 00:37:05 +02:00 |
|
Frédéric FRANCE
|
251f6d0cb1
|
Update facture-rec.class.php
|
2020-04-11 22:53:45 +02:00 |
|
andreubisquerra
|
323a62f1e7
|
travis fix
|
2020-04-11 22:38:59 +02:00 |
|
Frédéric FRANCE
|
e2660fd31c
|
Update actioncomm.class.php
|
2020-04-11 22:38:28 +02:00 |
|
andreubisquerra
|
5dc3b8dfd5
|
Travis fix
|
2020-04-11 22:36:46 +02:00 |
|
Frédéric FRANCE
|
88f18ec3ce
|
can't remove actioncomm if there is a category
|
2020-04-11 22:24:50 +02:00 |
|
jove@bisquerra.com
|
78b43ddb1f
|
TakePOS connector update
|
2020-04-11 22:19:36 +02:00 |
|
Frédéric FRANCE
|
b6ffcd0a6b
|
Update fichinterrec.class.php
|
2020-04-11 21:10:21 +02:00 |
|
Frédéric FRANCE
|
e9aa27d731
|
Update facture-rec.class.php
|
2020-04-11 21:06:33 +02:00 |
|
TuxGasy
|
fecfe2e3a1
|
Keep compatibility with old object declaration
|
2020-04-11 18:37:06 +02:00 |
|
Laurent Destailleur
|
6eab2ec295
|
Fix Replacement
|
2020-04-11 18:29:42 +02:00 |
|
Laurent Destailleur
|
ca8e1f3ea5
|
NEW Can replace a string into all pages in website module
|
2020-04-11 18:18:53 +02:00 |
|
Maxime Kohlhaas
|
f5ab957faf
|
FIX #13535 : state in italian address
|
2020-04-11 17:56:23 +02:00 |
|