Commit Graph

81180 Commits

Author SHA1 Message Date
Frédéric FRANCE
010b2723b6 work on migration script 2019-10-01 20:14:06 +02:00
Frédéric FRANCE
2ac908ffcf work on migration script 2019-10-01 19:59:49 +02:00
florian HENRY
d48f0fa791 resolve conflixt 2019-10-01 18:07:59 +02:00
Frédéric FRANCE
5821caa7fc work on migration script 2019-10-01 18:02:39 +02:00
Frédéric FRANCE
9755d15f52 work on migration script 2019-10-01 17:51:44 +02:00
Laurent Destailleur
68055e579f Check array is array 2019-10-01 16:26:55 +02:00
Laurent Destailleur
8ad81a092a Clean code 2019-10-01 16:19:54 +02:00
Laurent Destailleur
1ff8b879a8 Fix phpcs 2019-10-01 16:10:35 +02:00
Laurent Destailleur
29a2601b9d Merge pull request #11567 from inoveaconseil/ContextDashboard
WIP: Context dashboard
2019-10-01 15:21:35 +02:00
Laurent Destailleur
ce090d43a0 Close #8907 2019-10-01 15:01:29 +02:00
Laurent Destailleur
b79831ec39 Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Laurent Destailleur
4928a999a0 Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype
FIX : change product type must be allowed if we activate hidden conf
2019-10-01 14:41:52 +02:00
Laurent Destailleur
d448998762 Update card.php 2019-10-01 14:41:25 +02:00
Laurent Destailleur
741037ab13 Merge pull request #12007 from frederic34/patch-12
The variable $out seems to be never defined.
2019-10-01 14:40:06 +02:00
Laurent Destailleur
d6198a1e33 Fix billed time is empty 2019-10-01 13:47:29 +02:00
Laurent Destailleur
cd242523a5 Fix billed time is empty 2019-10-01 13:47:12 +02:00
Frédéric FRANCE
52b0a0d609 The variable $out seems to be never defined. 2019-10-01 13:45:18 +02:00
Laurent Destailleur
f91242c66c Fix css 2019-10-01 13:37:08 +02:00
Laurent Destailleur
9a88a1caa2 CSS 2019-10-01 13:20:29 +02:00
Laurent Destailleur
2d42afc686 FIX Filter on project on ticket list 2019-10-01 12:36:39 +02:00
Laurent Destailleur
800da4f30a FIX Filter on project on ticket list 2019-10-01 12:36:22 +02:00
Laurent Destailleur
9b607a3105 FIX navigation on ticket tab of projects 2019-10-01 12:29:58 +02:00
Laurent Destailleur
b08df75adb FIX navigation on ticket tab of projects 2019-10-01 12:28:56 +02:00
Frédéric FRANCE
3b9bf2b06a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
Laurent Destailleur
326d176c95 NEW Add last change date of page "Other setup". Can sort on name/date 2019-10-01 12:17:53 +02:00
Laurent Destailleur
fa921739ec Remove duplicate code 2019-10-01 12:03:17 +02:00
Laurent Destailleur
11e01f5c86 Use correct style for table header 2019-10-01 12:02:28 +02:00
Frédéric FRANCE
64381ac4d6 Update api_boms.class.php 2019-10-01 11:37:29 +02:00
Laurent Destailleur
956b46d920 Fix warnings 2019-10-01 11:37:15 +02:00
Frédéric FRANCE
7872a93605 Update box_commandes.php 2019-10-01 11:36:33 +02:00
Frédéric FRANCE
4ff65ce586 Update box_supplier_orders.php 2019-10-01 11:36:29 +02:00
Frédéric FRANCE
d201515514 Update box_prospect.php 2019-10-01 11:36:24 +02:00
Laurent Destailleur
322786cabe Look and feel v10 2019-10-01 11:36:06 +02:00
Laurent Destailleur
15e646cc62 Fix bad name of trigger 2019-10-01 11:34:35 +02:00
Laurent Destailleur
6ee17022c0 Fix bad key for type of contact of resources 2019-10-01 11:34:01 +02:00
Laurent Destailleur
35fdaaf355 Fix bad key for type of contact of resources 2019-10-01 11:33:43 +02:00
Laurent Destailleur
c7da05e4a1 Fix bad name of trigger 2019-10-01 11:28:10 +02:00
Laurent Destailleur
6ebd060315 Use php var with same name than html var 2019-10-01 11:23:38 +02:00
Laurent Destailleur
0828000626 Merge pull request #12005 from laudeco/feature/filter_contacts
working solution about filtering the contacs of one company
2019-10-01 11:19:29 +02:00
Laurent Destailleur
0f4f5d47f2 Update company.lib.php 2019-10-01 11:18:53 +02:00
Laurent Destailleur
955d9daf38 Update company.lib.php 2019-10-01 11:18:14 +02:00
Laurent Destailleur
76bd09cfb5 Merge pull request #12002 from frederic34/patch-18
Update box_supplier_orders.php to show email
2019-10-01 11:16:40 +02:00
Laurent Destailleur
f151dc1951 Merge pull request #12000 from frederic34/zapier2
zapier trigger
2019-10-01 11:16:27 +02:00
Laurent Destailleur
1c92c2d8bc Merge pull request #11993 from frederic34/patch-12
Update chargesociales.class.php for doxygen
2019-10-01 11:15:45 +02:00
Laurent Destailleur
1954cb201d Merge pull request #11998 from frederic34/patch-14
Update api_invoices.class.php for doxygen
2019-10-01 11:15:11 +02:00
Laurent Destailleur
cc3e34d340 Merge pull request #11997 from frederic34/patch-13
Update api_orders.class.php for doxygen
2019-10-01 11:13:55 +02:00
Laurent Destailleur
c7fa4c91ce Merge pull request #11996 from frederic34/phpcalendar
check php-calendar extension
2019-10-01 11:13:38 +02:00
Laurent Destailleur
2d8e3aad5b Merge pull request #12001 from frederic34/patch-17
Update box_prospect.php to show email
2019-10-01 11:13:01 +02:00
Laurent Destailleur
c079c69579 Merge pull request #11999 from frederic34/patch-15
Update api_boms.class.php
2019-10-01 11:12:48 +02:00
Laurent Destailleur
34a8e582fd Merge pull request #12003 from frederic34/patch-19
Update box_commandes.php to show email
2019-10-01 11:12:32 +02:00