Commit Graph

78565 Commits

Author SHA1 Message Date
florian HENRY
ad92efaee1 add trans 2019-09-09 14:58:29 +02:00
florian HENRY
5961c29d23 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 14:53:30 +02:00
florian HENRY
ee931d0f25 fix travis 2019-09-09 14:53:23 +02:00
Laurent Destailleur
66a9fabd06 If you develop your own emailing target selector and used
parent::add_to_target(...), you must now use parent::addToTargets(...)
2019-09-09 14:18:25 +02:00
florian HENRY
42cd15400d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 14:12:34 +02:00
florian HENRY
42b3640a5a fix travis 2019-09-09 14:12:28 +02:00
Laurent Destailleur
0466ee1941 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 14:08:20 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
d3bc05de76
Merge pull request #11848 from atm-john/add_progress_to_global_task_list
Add progress to global task list
2019-09-09 13:08:53 +02:00
Laurent Destailleur
235cfa5a5b
Merge pull request #11846 from atm-john/fix_missing_total_progress
Fix missing total progress column
2019-09-09 13:07:10 +02:00
Laurent Destailleur
c7bab8681a Fix sql error #11845 2019-09-09 13:05:08 +02:00
Laurent Destailleur
2c0d7ba97d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 12:58:42 +02:00
Laurent Destailleur
21d84f63a5 Work on template 2019-09-09 12:58:32 +02:00
Laurent Destailleur
64506a3e00
Merge pull request #11843 from aspangaro/11.0_translation
Translation
2019-09-09 12:57:55 +02:00
florian HENRY
617e430998 fix stravis and sticker 2019-09-09 12:31:17 +02:00
Laurent Destailleur
063415814c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 12:28:48 +02:00
florian HENRY
63a83a0fa5 resolve conflict 2019-09-09 11:35:37 +02:00
Laurent Destailleur
ed02cdfddb Fix phpcs 2019-09-09 11:23:53 +02:00
Laurent Destailleur
071dad3233
Merge pull request #11844 from dgfmdrv/develop
FIX #10460 compatibility with MariaDB 10.4
2019-09-09 11:09:46 +02:00
Laurent Destailleur
8381b93e80 Fix init of public holidays 2019-09-09 11:06:54 +02:00
Laurent Destailleur
73c3fa40bf Update phpunit 2019-09-09 10:53:13 +02:00
Laurent Destailleur
15eaa5cbd8 NEW Public holidays are now in a table (no more hard coded per country) 2019-09-09 10:27:56 +02:00
florian HENRY
f5a669e02b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 10:16:09 +02:00
florian HENRY
bdb297a380 resolve conflict 2019-09-09 10:15:44 +02:00
Laurent Destailleur
1d74387125 Removed deprecated property ->numero (We must use ->num_payment) 2019-09-09 08:47:23 +02:00
Laurent Destailleur
6d38d58000 Trans 2019-09-08 21:31:10 +02:00
Laurent Destailleur
feca9a7ee3 Fix phpcs 2019-09-08 21:28:17 +02:00
Laurent Destailleur
5cc0b24f6f Fix param 2019-09-08 21:24:01 +02:00
Laurent Destailleur
47f72fb74c Update data file 2019-09-08 21:21:58 +02:00
Laurent Destailleur
1d311b2969 Fix scrutinizer 2019-09-08 21:21:33 +02:00
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
ATM john
a639724b92 Fix follow tasks and time spent 2019-09-08 18:13:15 +02:00
ATM john
fa5cda2e88 Fix missing total progress column 2019-09-08 18:03:14 +02:00
Alexandre SPANGARO
985cfab8e9 Traduction 2019-09-08 05:22:13 +02:00
Alexandre SPANGARO
3ddd123eb1 Traduction 2019-09-08 05:18:52 +02:00
david
48b2a11da2 FIX #10460 compatibility with MariaDB 10.4 2019-09-08 05:15:26 +02:00
Alexandre SPANGARO
d9fa32b555 Traduction 2019-09-08 05:00:24 +02:00
Alexandre SPANGARO
3a2b3d311a Traduction 2019-09-08 04:57:09 +02:00
Laurent Destailleur
d6f105c783 Work on MRP module 2019-09-07 15:44:48 +02:00
Laurent Destailleur
452c248a0d Show list of menus and permission on the modulebuilder. 2019-09-07 14:49:48 +02:00
Laurent Destailleur
44cb9738d6 Fix trans 2019-09-07 14:35:47 +02:00
Laurent Destailleur
5d6ccfdf00 Fix phpcs 2019-09-07 13:12:39 +02:00
Laurent Destailleur
f483c673aa
Merge pull request #9912 from atm-greg/Edit_priceHT_for_predefined_products
NEW add ability to edit price ht before adding a line
2019-09-07 11:30:13 +02:00
Laurent Destailleur
881b69d117
Merge branch 'develop' into Edit_priceHT_for_predefined_products 2019-09-07 11:29:49 +02:00
Laurent Destailleur
a5d04e8fd5
Update product.php 2019-09-07 11:26:21 +02:00
Laurent Destailleur
c7a90ad528
Update product.php 2019-09-07 11:25:58 +02:00
Laurent Destailleur
eb7f964268
Update objectline_create.tpl.php 2019-09-07 11:25:11 +02:00
Laurent Destailleur
30d2f84eb7 Remove a label that is no more used 2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289
Merge pull request #11793 from altatof/supplierorderstatus
Differentiate supplier orders status
2019-09-07 10:54:03 +02:00
Laurent Destailleur
7386ba61d7
Merge pull request #11673 from ptibogxiv/patch-221
NEW display supplier in objectline if defined
2019-09-07 10:50:32 +02:00