Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 13:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

18639 Commits

Author SHA1 Message Date
Laurent Destailleur
d2d7fb4b04 Fix management of collapsing of extrafields separators. 2019-08-21 03:38:57 +02:00
Laurent Destailleur
c60fc6c3d4 Add param logcontext on dol_syslog 2019-08-20 13:57:25 +02:00
florian HENRY
4c61e3e381 merge develop 2019-08-19 17:23:47 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
cc3fd0f1f6 Merge pull request #11679 from atm-john/develop_new_task_progress_bar 
FIX/NEW task widget and add task progress bar
 2019-08-19 10:05:16 +02:00
Laurent Destailleur
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
 2019-08-19 00:02:26 +02:00
Laurent Destailleur
3a0057f6a3 FIX too many record in sql request. Whena criteria is a filter, we must 
use an inner join.
 2019-08-18 23:59:24 +02:00
Laurent Destailleur
c989a63360 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/langs/en_US/cashdesk.lang
 2019-08-18 20:54:06 +02:00
Laurent Destailleur
4fd68798a3 Fix phpcs 2019-08-18 20:38:51 +02:00
Laurent Destailleur
d8d927547f Fix option ACCOUNTANCY_SHOW_EXPORT_FILES_MENU 2019-08-18 19:09:53 +02:00
Laurent Destailleur
2f46b40da2 Prepare feature "Never show this message again" 2019-08-18 18:36:18 +02:00
Laurent Destailleur
7e4cf224ec Merge branch 'develop' into develop_new_task_progress_bar 2019-08-18 05:38:45 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
b8e1cc8d16 Enhance #11643 2019-08-18 03:42:38 +02:00
Laurent Destailleur
5351d78a96 Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
18eb2a83fe FIX #11671 CVE-2019-15062 2019-08-17 22:17:27 +02:00
Laurent Destailleur
d21e557100 FIX #11671 CVE-2019-15062 2019-08-17 22:16:27 +02:00
Laurent Destailleur
ae7ba9ff54 Doc 2019-08-17 15:15:52 +02:00
Laurent Destailleur
467ad3ed22 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/product/stock/card.php
 2019-08-16 21:48:46 +02:00
Laurent Destailleur
898996da4a FIX vulenrability in uploading file found by 美创科技安全实验室 2019-08-16 21:45:13 +02:00
Laurent Destailleur
d51a651ab4 Fix phpcs 2019-08-16 17:35:12 +02:00
Laurent Destailleur
a746075dbe Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2019-08-16 17:04:28 +02:00
Laurent Destailleur
9692ea5faf FIX #11671 CVE-2019-15062 2019-08-16 16:41:53 +02:00
Laurent Destailleur
1f2eb31e41 Set utf-8 in lowercase 2019-08-16 06:06:36 +02:00
Laurent Destailleur
318b27e084 Fix link 2019-08-16 05:33:45 +02:00
Laurent Destailleur
63520e1d9b Fix link 2019-08-16 05:32:24 +02:00
Laurent Destailleur
62438b61f0 Better error message 2019-08-16 05:14:20 +02:00
Laurent Destailleur
9a455cf1d6 Fix link 2019-08-16 05:03:48 +02:00
Laurent Destailleur
d5ce7fbaaf Fix links 2019-08-16 05:01:54 +02:00
Laurent Destailleur
7580efbd4e Fix link replacement 2019-08-16 04:32:06 +02:00
Laurent Destailleur
2510c1e5e4 Better help text 2019-08-16 03:05:55 +02:00
Laurent Destailleur
08038e5078 FIX save of empty files 2019-08-16 02:31:06 +02:00
Laurent Destailleur
31c26edaf7 Fix link 2019-08-16 00:31:55 +02:00
Laurent Destailleur
0045428c6c Fix link 2019-08-15 23:45:28 +02:00
Laurent Destailleur
8874a0f3c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 23:39:11 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 2019-08-15 23:39:02 +02:00
Laurent Destailleur
b8406f842d Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list 
Fix total on list and amount opened on thirdparty card (for supplier)
 2019-08-15 21:14:03 +02:00
Laurent Destailleur
6430c74793 Merge pull request #11168 from hregis/develop_menu 
NEW add new function "setEntity()" and better compatibility with Multicompany
 2019-08-15 21:00:05 +02:00
Laurent Destailleur
163ae6d81a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 20:42:51 +02:00
Laurent Destailleur
12e6dabc43 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-15 20:41:56 +02:00
Laurent Destailleur
a8afb4549a Merge pull request #11634 from fmarcet/9.0 
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
 2019-08-15 20:22:27 +02:00
Laurent Destailleur
c0ac8daa61 Introduce the color theme "flashy" to use the high contrast color as an 
option because colors seems too agressive for sensible eyes.
 2019-08-15 20:18:12 +02:00
Laurent Destailleur
0cde1b5c93 Merge pull request #11676 from ptibogxiv/patch-222 
Fix force recalculate price with multicurrency
 2019-08-15 19:53:54 +02:00
Laurent Destailleur
9f18b3d690 Update commonobject.class.php 2019-08-15 19:53:38 +02:00
Laurent Destailleur
38fc05866d Merge pull request #11619 from simnandez/10.0 
Fix: allow access from any other class that inherits Form class.
 2019-08-15 19:48:41 +02:00
Laurent Destailleur
c131af5ae1 FIX #11672 2019-08-15 19:16:52 +02:00
Laurent Destailleur
6b514966b5 Merge pull request #11672 from wdammak/patch-41 
Update objectline_edit.tpl.php
 2019-08-15 19:16:09 +02:00
Laurent Destailleur
76ae2695b2 Merge pull request #11690 from OPEN-DSI/new-expedition-list-massaction 
NEW add mass actions and FIX type ent array not defined in shipment list
 2019-08-15 19:14:34 +02:00
Laurent Destailleur
1c372251de Merge pull request #11691 from jtraulle/feature-rest-api-supplierinvoices-payments 
NEW Add GET and POST /supplierinvoices/payments REST API endpoints.
 2019-08-15 19:13:32 +02:00
Laurent Destailleur
9cb5ba35dd Merge pull request #11681 from hregis/10.0_mc 
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
 2019-08-15 19:08:42 +02:00