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 |
|
Laurent Destailleur
|
9a52bff36a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-15 14:37:19 +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 |
|
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
|
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
|
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 |
|
Laurent Destailleur
|
82757e6d03
|
Move files
|
2020-01-15 12:23:14 +01:00 |
|
Laurent Destailleur
|
1a21a7a1e2
|
Merge pull request #12847 from homer8173/develop
DBF2DB & import from table
|
2020-01-15 12:15:04 +01:00 |
|
Laurent Destailleur
|
5772dce460
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2020-01-15 12:09:21 +01:00 |
|
Laurent Destailleur
|
07b12e507f
|
Merge pull request #12841 from bb2a/patch-10
Addition of delivery times substitution
|
2020-01-15 12:08:07 +01:00 |
|
Laurent Destailleur
|
28248b3364
|
Merge pull request #12844 from tuxgasy/professional_id_roumain
New: Professional identifiers for Roumania
|
2020-01-15 12:07:34 +01:00 |
|
Laurent Destailleur
|
dd244255fa
|
Merge pull request #12840 from bb2a/patch-9
NEW Addition of delivery times in substitution variables
|
2020-01-15 12:07:04 +01:00 |
|
Laurent Destailleur
|
4066de94b6
|
Merge pull request #12848 from atm-ph/fix_11.0_colum_type
Fix column type to be as llx_facture
|
2020-01-15 12:05:54 +01:00 |
|
Laurent Destailleur
|
b4a309a251
|
Prepare 10.0.7
|
2020-01-15 12:00:25 +01:00 |
|
Laurent Destailleur
|
610655333d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-01-15 11:56:58 +01:00 |
|
Laurent Destailleur
|
c8ff847480
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/modulebuilder/index.php
|
2020-01-15 11:56:46 +01:00 |
|
Laurent Destailleur
|
0442105bd4
|
Fix Generation of zip of module
|
2020-01-15 11:55:27 +01:00 |
|
Laurent Destailleur
|
54fa476d1a
|
Merge pull request #12842 from aspangaro/11.0_p3
FIX : Loan Look & feel v11
|
2020-01-15 11:45:06 +01:00 |
|
Laurent Destailleur
|
14d59f43af
|
Trans
|
2020-01-15 11:33:02 +01:00 |
|
Tobias Sekan
|
503671a307
|
Fix lint error
|
2020-01-15 10:21:36 +01:00 |
|
Tobias Sekan
|
c47da64476
|
A few fixes
|
2020-01-15 10:13:55 +01:00 |
|
Tobias Sekan
|
a893b42202
|
Show extra short php function overview
|
2020-01-15 10:02:18 +01:00 |
|
Tobias Sekan
|
ee024c173f
|
Merge pull request #4 from Dolibarr/develop
merge into develop
|
2020-01-15 09:59:02 +01:00 |
|