Commit Graph

79149 Commits

Author SHA1 Message Date
Frédéric FRANCE
2ac908ffcf
work on migration script 2019-10-01 19:59:49 +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
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
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
Laurent Destailleur
8b778a8154 More log 2019-10-01 11:05:27 +02:00
stickler-ci
5e075d5d30 Fixing style errors. 2019-10-01 06:39:26 +00:00
Frédéric FRANCE
f6f6ed3e0c
Merge remote-tracking branch 'upstream/develop' into zapier2 2019-10-01 07:56:45 +02:00
Frédéric FRANCE
6a7170f725
Merge remote-tracking branch 'upstream/develop' into phpcalendar 2019-10-01 07:55:09 +02:00
Frédéric FRANCE
534948d734
Merge remote-tracking branch 'upstream/develop' into patch-12 2019-10-01 07:53:25 +02:00
Frédéric FRANCE
c57c8eee88
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 07:41:10 +02:00
Laurent Destailleur
41bfc89544 Fix travis for pgsql 2019-10-01 01:42:08 +02:00
Laurent Destailleur
bd76c1da11 Look and feel v10 2019-10-01 01:35:11 +02:00
Frédéric FRANCE
0c9956ab96
work on socpeople list 2019-10-01 00:37:10 +02:00
Frédéric FRANCE
420d972280
work on socpeople list 2019-10-01 00:35:08 +02:00
Frédéric FRANCE
be051e0f9d
work on socpeople list 2019-10-01 00:10:33 +02:00
Laurent Destailleur
83ddf5ac8d Disable test of pgsql installation 2019-09-30 22:50:48 +02:00
Frédéric FRANCE
f3f2ab8aad
Update box_commandes.php 2019-09-30 22:45:28 +02:00
Frédéric FRANCE
466e48761c
Update box_supplier_orders.php 2019-09-30 22:43:13 +02:00
Frédéric FRANCE
d0e9e9568a
Update box_prospect.php 2019-09-30 22:40:07 +02:00
Frédéric FRANCE
11c3b6c967
zapier 2019-09-30 22:21:32 +02:00
Laurent Destailleur
ebc79cf5ea Clean travis file 2019-09-30 22:13:21 +02:00
Frédéric FRANCE
b8dea76760
zapier api 2019-09-30 22:09:11 +02:00
Laurent Destailleur
edf1c74519 Add log of errors 2019-09-30 22:04:32 +02:00
Frédéric FRANCE
b74a93e194
zapier trigger 2019-09-30 22:03:42 +02:00
Laurent Destailleur
155ccc95db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 22:00:52 +02:00
Laurent Destailleur
af3bee6fcf Remove warning 2019-09-30 21:59:42 +02:00
Laurent Destailleur
91b7e81085 Fix warnings 2019-09-30 21:51:42 +02:00
Frédéric FRANCE
f2ac207df5
Update api_boms.class.php 2019-09-30 21:51:04 +02:00
Laurent Destailleur
73beec6526
Merge pull request #11994 from atm-john/develop_fix_event_back_url
FIX : Action com redirection
2019-09-30 21:48:07 +02:00
Frédéric FRANCE
3ba48fde93
Update api_invoices.class.php 2019-09-30 21:44:37 +02:00
Frédéric FRANCE
f3a38ef1af
Update api_orders.class.php 2019-09-30 21:41:07 +02:00
Frédéric FRANCE
31418c2e42
check php-calendar extension 2019-09-30 21:14:25 +02:00