lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,553 Commits 43 Branches 150 Tags 886 MiB
7872a93605
Commit Graph

5470 Commits

Author SHA1 Message Date
Laurent Destailleur
0c331602e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-04 20:03:51 +02:00
Laurent Destailleur
ab77051317 Fix time delay for purge 2019-06-04 20:03:27 +02:00
Laurent Destailleur
fd50e68f9a Fix look and feel v10 2019-06-04 02:15:52 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
18f1952e2d Fix set of properties 2019-05-22 14:49:18 +02:00
Laurent Destailleur
5707aff7c4 Look and feel v10 2019-05-21 21:52:04 +02:00
Laurent Destailleur
0415edb8cd Fix phpcs 2019-05-21 16:17:32 +02:00
Laurent Destailleur
657bd5c2fe Move module from develop to experimental 2019-05-21 15:50:16 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Laurent Destailleur
42f5ebed2d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/external_rss.php
	htdocs/admin/system/database-tables.php
	htdocs/admin/tools/export_files.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/functions.lib.php
 2019-05-21 15:13:25 +02:00
Laurent Destailleur
61ead06950 Fix Injection 2019-05-21 14:35:05 +02:00
Laurent Destailleur
479f8616e1 Fix sanitize data 2019-05-21 14:03:28 +02:00
Laurent Destailleur
ae3605d82d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/core/class/extrafields.class.php
 2019-05-20 15:47:06 +02:00
Laurent Destailleur
2a2fcf6784 FIX only profid1 to 4 were editable for pdf option to show. Not 5 and 6. 2019-05-20 15:38:33 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Maxime Kohlhaas
6c195d7bdf Add warning delay for holidays 2019-05-18 17:07:29 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
Laurent Destailleur
e95acc9a81 Add warning if missing module 2019-05-17 13:19:22 +02:00
Laurent Destailleur
a664cd6461 Fix check when uploading a non image as user photo 2019-05-10 20:09:41 +02:00
Laurent Destailleur
1206e465d9 Fix function name 2019-05-10 18:19:10 +02:00
Laurent Destailleur
0bd4c61009 Fix default setup of module workflow was not set 2019-05-10 18:15:09 +02:00
Laurent Destailleur
aaeb7dc9d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/holiday.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-10 17:45:33 +02:00
Laurent Destailleur
e87a32e92f Fix Try to fix DAV pb with some buggy clients by disabling browser 2019-05-10 09:53:10 +02:00
Juanjo Menent
e36df726a1 Merge remote-tracking branch 'upstream/9.0' into 9.0 2019-05-09 20:42:04 +02:00
Juanjo Menent
2b182c1cc1 FIX: #11097 2019-05-09 20:39:30 +02:00
Laurent Destailleur
46b0545c4a Debug module reception 2019-05-09 17:26:06 +02:00
Laurent Destailleur
57911150d1 CSS 2019-05-09 16:50:22 +02:00
Laurent Destailleur
52153d6aa2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-09 12:38:27 +02:00
Laurent Destailleur
af8d2e0e1a Fix error message when module disabled 2019-05-09 12:31:51 +02:00
Laurent Destailleur
9115df7439 Debug v10 2019-05-03 11:25:53 +02:00
Laurent Destailleur
4f9ea912ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/website.inc.php
 2019-05-02 14:41:56 +02:00
Laurent Destailleur
79754eb326 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/remx.php
 2019-05-02 14:39:30 +02:00
Laurent Destailleur
ae7ba162f2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-02 14:37:46 +02:00
Laurent Destailleur
e81f10c790 Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION 2019-05-02 13:45:49 +02:00
Laurent Destailleur
5145680279 Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION 2019-05-02 13:31:47 +02:00
Laurent Destailleur
4a81e8fd62 Debug call to apilayer 2019-05-02 13:24:28 +02:00
Laurent Destailleur
9955af5194 Debug ticket module 2019-05-01 17:53:41 +02:00
Laurent Destailleur
50b1a54dca FIX Update/delete currency on same languages 2019-05-01 14:06:30 +02:00
Laurent Destailleur
3bda9be775 Fix error 500 2019-05-01 13:46:45 +02:00
Laurent Destailleur
8091cff009 Can edit param of operation for email collector 2019-04-29 15:44:16 +02:00
Laurent Destailleur
4bd732cc40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
	htdocs/core/class/utils.class.php
	htdocs/langs/en_US/website.lang
 2019-04-25 23:25:21 +02:00
Laurent Destailleur
01075081cb FIX CVE-2019-11200 2019-04-25 22:25:19 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
ATM john
684879d73c apply appli btn to more elements 2019-04-16 21:49:26 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Laurent Destailleur
d728af9ced Add the test for ckeditor with mode "inline" in setup page of ckeditor 2019-04-12 17:44:22 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
Laurent Destailleur
203cbd56c2 Finished debug of emailcollector module 2019-04-10 17:35:33 +02:00
Laurent Destailleur
05c14e4f2f Look and feel v10 2019-04-10 15:54:29 +02:00
Laurent Destailleur
2eeb4b8734 Debug ticket module 2019-04-10 15:45:55 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Laurent Destailleur
ff629b2355 NEW Color for hover and for checked line is on by default 2019-04-09 15:57:26 +02:00
Laurent Destailleur
f9860e1425 Work on email collector 2019-04-09 13:23:30 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
22ca858b36 Enhance setup of email collector 2019-04-07 18:32:01 +02:00
Laurent Destailleur
fad2fa48dd NEW Introduce a config parameter $dolibarr_main_instance_unique_id 2019-04-07 15:44:17 +02:00
Laurent Destailleur
0091b65a83 Fix phpcs 2019-04-01 18:10:14 +02:00
Laurent Destailleur
c959c8b645 Fix api with prestashop 2019-03-31 18:21:00 +02:00
Laurent Destailleur
ecd049b4e6 Debug dolistore 2019-03-31 13:39:51 +02:00
Laurent Destailleur
bb2545c7b4 Clean code 2019-03-31 13:05:35 +02:00
Laurent Destailleur
b10682e5db Fix search in dolistore 2019-03-31 13:03:38 +02:00
Laurent Destailleur
fca404e8d5 Show price without tax to prepare tax per customer country. 2019-03-30 19:30:58 +01:00
Laurent Destailleur
67c207db12 NEW Better explanation for setup of WebDav module 2019-03-30 11:58:49 +01:00
Laurent Destailleur
80f7cef0a8 Better translation 2019-03-28 09:20:05 +01:00
Laurent Destailleur
d8212d84df Debug emailcollector 2019-03-26 19:15:18 +01:00
Laurent Destailleur
f991d4ba99 Fix typo 2019-03-26 18:10:28 +01:00
Laurent Destailleur
9eaef2ce7a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/export.php
	htdocs/langs/en_US/admin.lang
 2019-03-26 12:40:36 +01:00
Laurent Destailleur
1787b31932 FIX setup of module export 2019-03-26 12:18:28 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
82381533dd Better responsive 2019-03-25 09:14:28 +01:00
Laurent Destailleur
a16b6daa92 Look and feel v10 2019-03-24 16:10:03 +01:00
Laurent Destailleur
77843ddeba Allow use of log file or not for debugbar 2019-03-23 14:50:28 +01:00
Laurent Destailleur
df9e121ac6 Enhance the module debugbar. Do not scan the log anymore. 2019-03-23 14:37:54 +01:00
Laurent Destailleur
805493f43d
Merge pull request #10894 from grandoc/new_branch_20_03_2019 
update with html5 compliant code
 2019-03-21 18:23:40 +01:00
Philippe GRAND
e17ab64dbd update with html5 compliant code 2019-03-20 09:56:17 +01:00
Philippe GRAND
569be67317 update with html5 compliant code 2019-03-20 09:55:34 +01:00
Philippe GRAND
dee46173ff update with html5 compliant code 2019-03-20 09:53:29 +01:00
Philippe GRAND
5e6b451195 update with html5 compliant code 2019-03-20 09:52:33 +01:00
Philippe GRAND
963847c89c update with html5 compliant code 2019-03-20 09:49:38 +01:00
Philippe GRAND
644743dce8 update with html5 compliant code 2019-03-20 09:47:06 +01:00
Philippe GRAND
427a3fc02d update with html5 compliant code 2019-03-20 09:35:16 +01:00
Philippe GRAND
819253abee update with html5 compliant code 2019-03-20 09:32:57 +01:00
Philippe GRAND
6aa4e82e20 update with html5 compliant code 2019-03-20 09:31:28 +01:00
Philippe GRAND
e519bfc64b update with html5 compliant code 2019-03-20 09:27:28 +01:00
Philippe GRAND
8563d1e867 update with html5 compliant code 2019-03-19 14:19:40 +01:00
Philippe GRAND
1a21799585 update with html5 compliant code 2019-03-19 14:19:01 +01:00
Philippe GRAND
c9cd4260d6 update with html5 compliant code 2019-03-19 14:17:59 +01:00
Philippe GRAND
11c66a88bc update with html5 compliant code 2019-03-19 14:17:20 +01:00
Philippe GRAND
200e7172ad update with html5 compliant code 2019-03-19 14:16:42 +01:00
Laurent Destailleur
cb9f30ceeb Look and feel v10 2019-03-19 10:36:37 +01:00
Laurent Destailleur
6a41819d0f Enhance the perf page. 2019-03-17 00:55:18 +01:00
Laurent Destailleur
a6add0d8a9 Debug module debugbar 2019-03-17 00:48:12 +01:00
Laurent Destailleur
1abfd1f58e Add page to setup module debugbar 
Fix CSS
 2019-03-17 00:32:39 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
bcf0dd0168
Merge branch 'develop' into patch-5 2019-03-14 16:47:08 +01:00
Frédéric FRANCE
f25ce3b40c
Update facture.php 2019-03-14 16:43:52 +01:00
Laurent Destailleur
cdf6e4b65a Fix some PSR rules 2019-03-14 16:43:27 +01:00
Frédéric FRANCE
1222d90537
phpcs fix 2019-03-14 16:40:44 +01:00