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

5460 Commits

Author SHA1 Message Date
Frédéric FRANCE
0d3a2f800b
fix colspan in show_project 2019-09-12 21:39:57 +02:00
ATM john
859904587f add private support and title buttons 2019-09-12 21:17:48 +02:00
John Botella
7dcb871048 Fix private message type 2019-09-12 18:39:29 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
florian HENRY
d6dcbc714c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-12 09:38:14 +02:00
stickler-ci
b2187c829a Fixing style errors. 2019-09-11 22:44:17 +00:00
ATM john
bf924f113e Add more style ans edit button 2019-09-12 00:37:36 +02:00
Laurent Destailleur
84e197e48a Clean code 2019-09-12 00:09:49 +02:00
Laurent Destailleur
d7d764e5f9 Fix var not defined 2019-09-11 23:56:53 +02:00
ATM john
907669bb51 New ticket messaging page 2019-09-11 23:30:09 +02:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
Laurent Destailleur
5f236fda2e More complete error message with hour/min/sec 2019-09-11 00:28:09 +02:00
Laurent Destailleur
eb2f48332b Show first line of code 2019-09-10 15:58:56 +02:00
Laurent Destailleur
48aedcee20 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-09-10 15:31:29 +02:00
Laurent Destailleur
d4e26fcc55 FIX missing include (dol_convert_file not found) 2019-09-10 15:29:33 +02:00
florian HENRY
42cd15400d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 14:12:34 +02:00
Laurent Destailleur
d3bc05de76
Merge pull request #11848 from atm-john/add_progress_to_global_task_list 
Add progress to global task list
 2019-09-09 13:08:53 +02:00
Laurent Destailleur
235cfa5a5b
Merge pull request #11846 from atm-john/fix_missing_total_progress 
Fix missing total progress column
 2019-09-09 13:07:10 +02:00
florian HENRY
63a83a0fa5 resolve conflict 2019-09-09 11:35:37 +02:00
Laurent Destailleur
73c3fa40bf Update phpunit 2019-09-09 10:53:13 +02:00
Laurent Destailleur
15eaa5cbd8 NEW Public holidays are now in a table (no more hard coded per country) 2019-09-09 10:27:56 +02:00
florian HENRY
bdb297a380 resolve conflict 2019-09-09 10:15:44 +02:00
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
ATM john
fa5cda2e88 Fix missing total progress column 2019-09-08 18:03:14 +02:00
Laurent Destailleur
f08c07f315 Fix bugs reported by scrutinizer 2019-09-06 10:42:51 +02:00
florian HENRY
dff7be59c8 mostlyDone 2019-09-06 09:22:53 +02:00
Laurent Destailleur
37a32af7b0 NEW Add dictionary to store public holidays. 2019-09-05 20:19:13 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
4a19f510fd Fix scrutinizer reports 2019-09-05 13:58:35 +02:00
Laurent Destailleur
f4a7714f82 Fix bad log 2019-09-05 13:42:58 +02:00
Laurent Destailleur
9666200d6b Enhance error management 2019-09-04 19:55:15 +02:00
Laurent Destailleur
b445c0eec7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2019-09-03 22:40:26 +02:00
Laurent Destailleur
0a17e6bfd5 FIX Several pb in export of documents 
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
 2019-09-03 22:39:24 +02:00
florian HENRY
73c5b9617f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-03 17:07:59 +02:00
florian HENRY
6c20fbafdf add trigger files 2019-09-03 17:04:42 +02:00
Laurent Destailleur
ca7ce63648 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2019-09-02 23:04:15 +02:00
Laurent Destailleur
a126b1e538 FIX Add char $ and ; in sanitizing of filenames. 2019-09-02 22:25:44 +02:00
florian HENRY
d811de4da2 let only triggers part 2019-09-02 22:01:48 +02:00
Laurent Destailleur
a96742ee9b Can search into global site files. 
Support of cancel to previous page
 2019-09-02 18:43:22 +02:00
Laurent Destailleur
c068177027 Work on search on global site files 2019-09-02 16:39:56 +02:00
florian HENRY
405c92640c on going 2019-09-02 14:47:32 +02:00
florian HENRY
b535bc0cb9 start dev 2019-09-02 11:27:04 +02:00
Laurent Destailleur
29d2e7edd0 missing reposition 2019-09-02 04:39:36 +02:00
Laurent Destailleur
ee15ccf82e missing reposition 2019-09-02 04:28:55 +02:00
Laurent Destailleur
40890ae345 Fix scrutinizer 2019-09-01 21:31:07 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Laurent Destailleur
7f5728ead9 A better message when database is off. 2019-08-31 19:39:39 +02:00
Laurent Destailleur
2f49fc6a7b Fix scrutinizer 2019-08-31 02:49:54 +02:00
Laurent Destailleur
a3e221468a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-31 01:15:04 +02:00
Laurent Destailleur
7942c5edf7 Fix js injection 2019-08-30 16:22:24 +02:00
Laurent Destailleur
01962cbc67 Clean code 2019-08-29 13:17:14 +02:00
Laurent Destailleur
ff7c122b6d Add class specific to web page ref 2019-08-29 02:36:32 +02:00
Laurent Destailleur
76ae0cebd6 We don't need anymore code to manage dol_use_jmobile = 3 or 4 2019-08-29 01:32:10 +02:00
Laurent Destailleur
c10f755619 Fix compatibility with old multicompany modules 2019-08-29 00:19:46 +02:00
Laurent Destailleur
76e8384f09 NEW Add option multiselect for developers on the selector of language. 2019-08-28 16:06:19 +02:00
Laurent Destailleur
c0262f1e19 Fix type integer 2019-08-28 12:24:56 +02:00
Laurent Destailleur
9109eeaa77 Fix type integer 2019-08-28 12:24:35 +02:00
Laurent Destailleur
7236df37d4 FIX error management when adding a property with type real 2019-08-28 12:16:59 +02:00
Laurent Destailleur
ed42f59201 FIX error management when adding a property with type real 2019-08-28 12:10:28 +02:00
Laurent Destailleur
e3a4ad00d7 Code comment 2019-08-28 10:22:40 +02:00
Laurent Destailleur
04e11bcbd1 Doxygen 2019-08-27 20:35:42 +02:00
Laurent Destailleur
4ceb3c2e85 Add context 'ws' for web services authentication. 2019-08-27 20:35:06 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
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