lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,626 Commits 43 Branches 150 Tags 886 MiB
de3a67f5bd
Commit Graph

5347 Commits

Author SHA1 Message Date
Laurent Destailleur
22719b90b6 Fix remove warning 2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
Laurent Destailleur
60c3cefc53 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:44:39 +02:00
Laurent Destailleur
69b2d03c47 FIX Api of documents work with value 'thirdparty' 2019-08-25 16:41:59 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
 2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
 2019-08-22 12:39:07 +02:00
Laurent Destailleur
cdda08c0d3 FIX #11685 2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card" 2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354
Merge pull request #11685 from ptibogxiv/patch-224 
FIX for MAIN_MAXTABS_IN_CARD = $i card
 2019-08-22 11:25:08 +02:00
Regis Houssin
90f60b0137 FIX add $context parameter in checkLoginPassEntity 2019-08-22 10:56:07 +02:00
Laurent Destailleur
b06dab6930 Fix add option to restore backward compatibility 2019-08-22 00:44:28 +02:00
Laurent Destailleur
bfbabbf626 Update geoip v1 2019-08-21 18:26:41 +02:00
Laurent Destailleur
689aa4979e Code comment 2019-08-21 17:28:54 +02:00
Laurent Destailleur
2c3b2cd1a0 Look and feel 2019-08-21 04:21:43 +02:00
Laurent Destailleur
c60fc6c3d4 Add param logcontext on dol_syslog 2019-08-20 13:57:25 +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
4fd68798a3 Fix phpcs 2019-08-18 20:38:51 +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
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
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
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
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
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
Laurent Destailleur
59625dceb5 Fix phpcs 2019-08-15 19:03:30 +02:00
Laurent Destailleur
b5d72edebc Can add more samples of pages. Add an exemple of page with dynamic 
content.
 2019-08-15 18:07:36 +02:00
Laurent Destailleur
c92488986b NEW Can have a preview of website template when loading a template 2019-08-15 02:32:07 +02:00
Laurent Destailleur
ca256a6635 Add shadow style 2019-08-15 01:58:22 +02:00
Laurent Destailleur
f81463af0c Update templates 2019-08-15 00:55:47 +02:00
Jean Traullé
4252a2c868
Merge branch 'develop' into feature-rest-api-supplierinvoices-payments 2019-08-14 23:35:35 +02:00
Jean Traullé
c739b95666
Fix codestyle 
lessc.class.php should be excluded from ruleset as it is an external lib
 2019-08-14 23:33:06 +02:00
Laurent Destailleur
f753799810 FIX Support #tag into url of website module 2019-08-14 23:27:34 +02:00
Jean Traullé
6d55af2530
Merge remote-tracking branch 'remotes/upstream/develop' into feature-rest-api-supplierinvoices-payments 2019-08-14 23:24:15 +02:00
Jean Traullé
1d2c2f8551
NEW Add payments GET and POST REST API endpoints for supplierinvoices. 2019-08-14 23:00:40 +02:00
Laurent Destailleur
0818571827 Work on the edit inline tool. 2019-08-14 19:48:52 +02:00
VESSILLER
b19817194d NEW add mass actions and FIX type ent array not defined in shipment list 2019-08-14 17:11:59 +02:00
VESSILLER
891cd155ea NEW add mass actions and FIX type ent array not defined in shipment list 2019-08-14 17:04:13 +02:00
Laurent Destailleur
10a3e773ce FIX Avoid to add new line in css file at each save 2019-08-14 16:28:41 +02:00
Laurent Destailleur
12bebdefbb Fix can replace PclZip with ZipArchive 2019-08-14 04:07:25 +02:00
Laurent Destailleur
fbf6cbe091 FIX Option to use ZipArchive instead of PclZip bugged with large files. 2019-08-14 04:07:02 +02:00
Laurent Destailleur
6de2118f11 FIX Bad error management in zip compress and web site export 
Conflicts:
	htdocs/website/index.php
 2019-08-14 04:06:29 +02:00
Laurent Destailleur
e1ab5089d7 FIX Missing some replacements in website module 
Conflicts:
	htdocs/website/index.php
 2019-08-14 04:02:57 +02:00
Laurent Destailleur
f1c6f1b375 Fix can replace PclZip with ZipArchive 2019-08-14 04:00:08 +02:00
Laurent Destailleur
b0172f136b FIX Option to use ZipArchive instead of PclZip bugged with large files. 2019-08-14 03:43:15 +02:00
Laurent Destailleur
bc230c2d25 FIX Bad error management in zip compress and web site export 2019-08-14 01:43:06 +02:00
Laurent Destailleur
df53826426 FIX Missing some replacements in website module 2019-08-13 18:22:18 +02:00
ptibogxiv
93d64bb84e
Update functions.lib.php 2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64
FIX for MAIN_MAXTABS_IN_CARD = $i card 2019-08-13 17:47:30 +02:00
Regis Houssin
34579dd4db FIX phpcs 2019-08-13 07:46:03 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
Laurent Destailleur
49e61e237c Better log 2019-08-13 07:08:45 +02:00
Laurent Destailleur
91cdb2a5a8 Add more logs 2019-08-13 07:05:06 +02:00
Laurent Destailleur
7891c8d856 Enhance logs 2019-08-13 06:52:07 +02:00
Laurent Destailleur
99473097a9 FIX Add log and type of content in dolWebsiteOutput and 
dolWebsiteReplacementOfLinks

Conflicts:
	htdocs/website/index.php
 2019-08-13 06:43:28 +02:00
Laurent Destailleur
277a693c16 FIX Add log and type of content in dolWebsiteOutput and 
dolWebsiteReplacementOfLinks
 2019-08-13 06:37:06 +02:00
Laurent Destailleur
ae4bead85c Fix missing function 2019-08-13 04:43:50 +02:00
Laurent Destailleur
7824731f17 NEW Add feature to search a string into containers 2019-08-13 00:34:42 +02:00
ATM john
b193f1b34e Fix travis 2019-08-12 23:33:00 +02:00
Laurent Destailleur
8ad2081555 NEW Can select website templates from available default templates 2019-08-12 22:19:24 +02:00
Laurent Destailleur
c986dbc71f NEW Add search into template 2019-08-12 20:32:18 +02:00
Laurent Destailleur
de1af78ae6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-12 17:38:54 +02:00
Laurent Destailleur
18e4d1b334 Fix to avoid to die page when there is a redirect. 2019-08-12 17:22:46 +02:00
ATM john
1ffb013371 add filter 2019-08-12 15:24:07 +02:00
Laurent Destailleur
446f0590dc FIX VAT number for Monaco (it uses FR) 2019-08-12 13:45:04 +02:00
ATM john
53721ae606 move late warning sign 2019-08-10 23:09:27 +02:00
ATM john
89447acaf3 remove tooltip on progress bar 2019-08-10 23:07:12 +02:00
ATM john
eedd065f48 remove useless function usage 2019-08-10 22:59:09 +02:00
ATM john
09c1289802 Fix task widget and improve its display 2019-08-10 22:48:07 +02:00
ATM john
527e4dcf46 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar 2019-08-10 15:41:49 +02:00
ATM john
3f0f7e2ad5 Add progress bar for task list and visual status badges 2019-08-10 15:41:21 +02:00
John Botella
63191dab7d Add user color blind option 2019-08-07 12:03:19 +02:00
John Botella
4aeaa580ea Add color blind option 2019-08-07 11:11:47 +02:00
Laurent Destailleur
c34739ab3f Fix A file for a hidden feature provides a service without security 
checks.
 2019-08-02 19:25:50 +02:00
Laurent Destailleur
b9ee95314a SEC restrictedArea protects also the 'update' action 2019-08-02 17:12:59 +02:00
Laurent Destailleur
89a5a8188f Fix A file for a hidden feature provides a service without security 
checks.
 2019-08-02 17:12:03 +02:00
Laurent Destailleur
a03771ce61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:40 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
bf14b4b3d5 Add Canada Dollar in currency that need symbol before 2019-08-01 16:20:18 +02:00
Laurent Destailleur
24bfd9d98b
Merge pull request #11605 from grandoc/new_branch_01_08_2019 
add CAN$ within list of currencies before
 2019-08-01 16:18:37 +02:00
Laurent Destailleur
73715f00af
Update functions.lib.php 2019-08-01 16:18:26 +02:00
Laurent Destailleur
008a54ea19
Update functions.lib.php 2019-08-01 16:14:53 +02:00