Commit Graph

9729 Commits

Author SHA1 Message Date
Laurent Destailleur
92a88441ac Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping
Dev multifilter jounal on bookeping
2020-12-30 13:19:27 +01:00
Laurent Destailleur
8149478c77 Merge pull request #15308 from aspangaro/14a2
NEW: Dictionary for availability - Add column position
2020-12-30 13:12:27 +01:00
Laurent Destailleur
17b68a30d7 Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +01:00
Regis Houssin
7832fa213f FIX Stickler line exceeds 500 characters; contains 527 characters 2020-12-30 11:34:59 +01:00
Regis Houssin
7c5248d105 FIX and the world turn again 2020-12-30 11:27:03 +01:00
Regis Houssin
aec01a95fc FIX again and again 2020-12-29 17:48:52 +01:00
Regis Houssin
acabb045fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-29 17:12:18 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56:39 +01:00
Regis Houssin
20cd9cbbc7 FIX avoid warning php 8.0 2020-12-29 16:25:29 +01:00
Regis Houssin
6e0832fb38 FIX WIP avoid warning with php 8.0 2020-12-29 15:59:39 +01:00
Alexandre SPANGARO
9f0434eb69 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-12-29 04:50:32 +01:00
Florian HENRY
1e438b686e fix stickler 2020-12-28 21:32:46 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Laurent Destailleur
8b696ced3b Clean code 2020-12-28 12:38:33 +01:00
Laurent Destailleur
1546805b9e Merge pull request #15500 from frederic34/patch-10
NEW add db fields note_public note_private for ecm
2020-12-27 15:07:51 +01:00
Florian HENRY
1b6a4fc4ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction 2020-12-24 15:00:15 +01:00
Laurent Destailleur
5ef3ffbdc6 Fix warning 2020-12-24 03:03:38 +01:00
Laurent Destailleur
6c2a17b29a Fix warning 2020-12-24 02:59:00 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
02daf09928 Fix for php8 2020-12-23 23:06:34 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Florian HENRY
311a555cc0 Merge github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2020-12-22 12:52:14 +01:00
Florian HENRY
fefc9040ab NEW : Display extrafields (for lines/det into line tr instead of ugly other tr 2020-12-22 12:52:01 +01:00
Florian Mortgat
64a62bf2c2 FIX (PR #15346 comment) use dol_mktime, not mktime 2020-12-22 09:37:30 +01:00
Laurent Destailleur
04d249cef0 Merge pull request #15792 from frederic34/notifications
simplify notications class
2020-12-21 18:14:04 +01:00
Laurent Destailleur
7d0e71165a Clean code 2020-12-21 14:40:27 +01:00
Laurent Destailleur
7fae5ea800 Code clean 2020-12-20 18:21:34 +01:00
Frédéric FRANCE
b7b35f4cd4 simplify notications class 2020-12-20 11:04:21 +01:00
Laurent Destailleur
8d21eab6ab Fix buttond not working 2020-12-20 06:06:24 +01:00
Laurent Destailleur
6066a92b9d Fix API to get country 2020-12-19 22:34:33 +01:00
Laurent Destailleur
fe93ee4d08 Debug website module for multilanguage 2020-12-19 13:03:40 +01:00
Laurent Destailleur
90d8299c92 Fix purge tool 2020-12-18 13:24:02 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c Ajax combo at a better place (after select) 2020-12-17 21:42:10 +01:00
Laurent Destailleur
a67068ab7b Fix warnings 2020-12-17 18:08:56 +01:00
Laurent Destailleur
b0d524beed Debug v13 2020-12-17 11:57:12 +01:00
Laurent Destailleur
05cb2653f3 Merge pull request #15749 from StephaneLesage/companycard-directedit-type
Direct edition of type of company in card
2020-12-15 13:54:06 +01:00
Laurent Destailleur
2ae1aac5a4 Fix setup 2020-12-15 11:18:29 +01:00
Laurent Destailleur
f2a4f880ca Fix warning 2020-12-15 10:49:07 +01:00
David Bensel
bc9f7c83f4 update 2020-12-14 22:40:47 +03:00
Laurent Destailleur
9595504b56 Fix graph 2020-12-14 19:57:59 +01:00
stickler-ci
d32d3060cc Fixing style errors. 2020-12-14 09:15:06 +00:00
Stephane Lesage
5e4cc7fcfd companycard-directedit-typent 2020-12-14 10:14:31 +01:00
Laurent Destailleur
d739fa1951 Fix log 2020-12-13 18:32:55 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Frédéric FRANCE
346fe8ae85 clean 2020-12-12 22:35:51 +01:00
Laurent Destailleur
3521a736fc Fix warnings 2020-12-12 19:49:13 +01:00
Frédéric FRANCE
4664ac1a1c socialnetworks links 2020-12-12 17:00:23 +01:00