Commit Graph

89109 Commits

Author SHA1 Message Date
Norbert Penel
3c2dd7db7c Fix modulbuilder create forms
'fk_product' => array('type' => 'integer:Product:product/class/product.class.php' ...
the input was arriving with a select2 instead of an ajax search
2020-01-15 20:11:34 +01:00
Laurent Destailleur
a68da82bec Code comment of export 2020-01-15 20:11:04 +01:00
Laurent Destailleur
87f0fe7c43
Merge pull request #12854 from homer8173/patch-15
Fix modulbuilder create forms
2020-01-15 20:10:36 +01:00
Laurent Destailleur
536f835a3e
Merge pull request #12850 from atm-john/10.0_fix_export_explode
FIX complex export model loading
2020-01-15 20:09:32 +01:00
Laurent Destailleur
1d489325a9
Merge pull request #12851 from OPEN-DSI/fix-product-list-sql-fields-repeated
FIX remove repeated sql fields in product list
2020-01-15 19:50:59 +01:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Norbert Penel
09c9ee97d9
Fix modulbuilder create forms
'fk_product' => array('type' => 'integer:Product:product/class/product.class.php' ...
the input was arriving with a select2 instead of an ajax search
2020-01-15 18:36:57 +01:00
Laurent Destailleur
9d370f7c36
Merge pull request #12378 from aspangaro/11.0_a7
NEW Expedition list - Add date start & date end
2020-01-15 17:56:20 +01:00
Laurent Destailleur
5dde548133
Merge pull request #12377 from aspangaro/11.0_a6
NEW Customer command list - Add date start & date end
2020-01-15 17:55:47 +01:00
Laurent Destailleur
e5e7f19f48
Merge pull request #12367 from aspangaro/11.0_a4
NEW Salaries list - Add date start & date end
2020-01-15 17:54:03 +01:00
Laurent Destailleur
132bb67d14
Merge pull request #12364 from aspangaro/11.0_a1
NEW Propal list - Add date start & date end
2020-01-15 17:52:55 +01:00
Laurent Destailleur
4e4a810484
Merge pull request #12368 from aspangaro/11.0_a5
NEW Various payment list - Add search date start & date end & subledger account
2020-01-15 17:51:59 +01:00
Alexandre SPANGARO
a198ca5c43
Merge branch 'develop' into 12.0_a1 2020-01-15 17:00:02 +01:00
Alexandre SPANGARO
3577643a16 Merge branch 'develop' into 12.0_a1 2020-01-15 16:57:54 +01:00
Laurent Destailleur
28d5901da4 Fix error of mysqldump not thrown in some cases 2020-01-15 16:45:13 +01:00
VESSILLER
53ddbc1eb5 FIX remove repeated sql fields in product list 2020-01-15 16:24:04 +01:00
Laurent Destailleur
ed0e4b53d4 Fix error in mysqldump 2020-01-15 16:11:31 +01:00
Laurent Destailleur
3bd95c205d Tooltip to understand the new dictionary of holidays 2020-01-15 14:54:17 +01:00
Laurent Destailleur
141ca20269 Trans 2020-01-15 14:44:53 +01:00
Laurent Destailleur
9a52bff36a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 14:37:19 +01:00
John Botella
10c973f38f Fix complex export model loading 2020-01-15 14:36:44 +01:00
Laurent Destailleur
62b84810bd Exclude includes in dev 2020-01-15 14:25:16 +01:00
Laurent Destailleur
e938f46672
Merge pull request #12426 from frederic34/actioncomm_category
NEW categories for actioncomm
2020-01-15 14:21:54 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
a803feb842
Merge pull request #12474 from openthink-laurent/add-wysiwyg-editor-description-field-projects
Add WYSIWYG editor to description field of projects
2020-01-15 14:18:42 +01:00
stickler-ci
eddc38e37f Fixing style errors. 2020-01-15 13:18:25 +00:00
Laurent Destailleur
f64b3262c3
Merge pull request #12475 from ptibogxiv/patch-279
NEW add WYSiWYG on member type's description
2020-01-15 14:18:08 +01:00
Laurent Destailleur
e15b96c37d
Merge branch 'develop' into updtask 2020-01-15 14:16:43 +01:00
Laurent Destailleur
373420edc0
Merge pull request #12476 from ptibogxiv/patch-280
NEW add total of value in product stat
2020-01-15 14:11:01 +01:00
Laurent Destailleur
ad7da80353
Merge pull request #12479 from OPEN-DSI/new-product-list-units
NEW add units in product list
2020-01-15 14:09:50 +01:00
Laurent Destailleur
64564e75ae Add entity into unique key 2020-01-15 13:55:17 +01:00
Laurent Destailleur
5e3b38118a
Merge pull request #12691 from atm-florianm/FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks
FIX bookmark URLs get truncated to 255 chars
2020-01-15 13:53:30 +01:00
Laurent Destailleur
ce2b0b9cad Trans 2020-01-15 13:51:06 +01:00
Laurent Destailleur
ef540c6c72
Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks 2020-01-15 13:50:03 +01:00
Laurent Destailleur
18324962c5 Better help 2020-01-15 13:41:07 +01:00
Laurent Destailleur
34829644ed Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/tasks/time.php
2020-01-15 13:38:28 +01:00
Laurent Destailleur
6196f5412b Fix date format 2020-01-15 13:37:04 +01:00
Laurent Destailleur
be9decf06d Fix date format 2020-01-15 13:36:22 +01:00
Laurent Destailleur
0d413c47b1 Fix duplicate info 2020-01-15 13:33:11 +01:00
Laurent Destailleur
486bb5cd0b Removed useless include 2020-01-15 13:24:23 +01:00
Laurent Destailleur
43bf0a79e6
Merge pull request #12770 from guillaumematheron/develop
NEW 2 new options when creating an invoice from time spent on a project : by period or by task
2020-01-15 13:23:25 +01:00
Laurent Destailleur
8e269c5e64 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/modules/modSociete.class.php
	htdocs/filefunc.inc.php
2020-01-15 13:19:37 +01:00
Laurent Destailleur
0a1a07aa22
Merge pull request #12839 from atm-gauthier/10.0_fix_importSocieteWithExtrafields
FIX : We want to be able to import data for extrafields of entity 0 too
2020-01-15 13:12:56 +01:00
Laurent Destailleur
d771efe37c Fix phpcs 2020-01-15 13:08:29 +01:00
Laurent Destailleur
6e367b6406 Fix detection 2020-01-15 12:56:36 +01:00
Laurent Destailleur
db17a08144 Fix distrib in ping 2020-01-15 12:52:04 +01:00
Laurent Destailleur
64d66be321
Merge pull request #12849 from TobiasSekan/ShowExtraPhpInfo
New: Show additional short php infos
2020-01-15 12:29:48 +01:00
Laurent Destailleur
e58c2c5110 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 12:26:48 +01:00
Laurent Destailleur
2f36e0cb1c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-15 12:26:22 +01:00
Laurent Destailleur
1d3d26e185 Fix phpcs 2020-01-15 12:26:11 +01:00