lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,675 Commits 43 Branches 150 Tags 886 MiB
809ef1bd00
Commit Graph

13206 Commits

Author SHA1 Message Date
Laurent Destailleur
15ba0c3b49 Close #7989 Merge manually in existing class 2018-02-20 15:35:42 +01:00
Laurent Destailleur
6ef3b330e4 Fix output dir of grab 2018-02-20 00:04:43 +01:00
Laurent Destailleur
5f51af505f NEW Can delete dir content in media and ECM module recursively 2018-02-19 23:52:45 +01:00
Laurent Destailleur
5ada5c18f9 url in generator 2018-02-19 23:19:54 +01:00
Laurent Destailleur
1cb58a308c Fix redirect 2018-02-19 22:25:12 +01:00
Laurent Destailleur
1f412bd1d4 Fix infinite redirects 2018-02-19 22:10:15 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Laurent Destailleur
f3114765a3 Work on website module 2018-02-19 16:46:29 +01:00
Laurent Destailleur
60a77a6d85 Add option to grab images into same dir or subdir 2018-02-19 14:56:37 +01:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails.php
 2018-02-17 01:19:17 +01:00
Laurent Destailleur
ab6d0d2530 Fix errors 2018-02-17 01:16:52 +01:00
Laurent Destailleur
9bed2ce8e2 Fix ignore file integrity check on filefunc.inc.php for deb/rpm package 2018-02-16 22:03:13 +01:00
Laurent Destailleur
f67f0df609 Fix preview link not visible with long file names 2018-02-16 12:11:39 +01:00
Laurent Destailleur
91c8dbcc48 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-15 19:50:04 +01:00
Laurent Destailleur
362aec3e4b NEW Add param $dolibarr_main_restrict_ip in config file to limit ips 2018-02-15 19:49:50 +01:00
Laurent Destailleur
03e58f86f3
Merge pull request #8199 from dolibarr95/patch-37 
Fix : Bad copy/paste in var name
 2018-02-15 17:28:46 +01:00
Laurent Destailleur
4f0ba4982b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-15 15:34:35 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
7722f004c8 FIX #8153 2018-02-15 14:08:42 +01:00
Laurent Destailleur
5eee292663 FIX #8189 2018-02-15 13:40:17 +01:00
dolibarr95
634f3bc025
Bad copy/paste 2018-02-15 13:38:21 +01:00
Laurent Destailleur
f0855da0fb Fix responsive 2018-02-15 12:57:04 +01:00
dolibarr95
3ffc671052
Add phone format for several countries 2018-02-15 10:47:32 +01:00
Laurent Destailleur
dde5c186e7 Fix duplicate html tag 2018-02-15 00:53:03 +01:00
Laurent Destailleur
b789a50ce6 Fix duplicate html tag 2018-02-15 00:38:11 +01:00
Laurent Destailleur
bab5c41b98 Fix duplicate html tag 2018-02-15 00:24:15 +01:00
Laurent Destailleur
b515448bbd Fix delete when no extrafields used 2018-02-15 00:01:25 +01:00
Laurent Destailleur
5f0f9ff326 Fix delete page 2018-02-14 23:57:57 +01:00
Laurent Destailleur
f1a9f81fb4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-14 22:19:59 +01:00
Laurent Destailleur
7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php
 2018-02-14 22:08:18 +01:00
Laurent Destailleur
78697c1735 USe fk_product is better than ref 2018-02-14 21:14:24 +01:00
Laurent Destailleur
f3ffc7ce8a
Merge pull request #8185 from BitKFu/develop 
NEW Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
 2018-02-14 20:56:00 +01:00
Laurent Destailleur
795cbaa978 Code comment 2018-02-13 20:13:35 +01:00
Laurent Destailleur
b128c95a74 NEW Add showempty parameter in country selection 2018-02-13 19:08:46 +01:00
Laurent Destailleur
434980bb22 Fix svg image preview ko 2018-02-13 18:15:39 +01:00
Laurent Destailleur
92e67ebb8f Fix svg image preview ko 2018-02-13 16:33:45 +01:00
Laurent Destailleur
e510e1b679 Fix search field at wrong column 2018-02-13 15:48:29 +01:00
Laurent Destailleur
35aece060c Search field in correct column 2018-02-13 15:47:17 +01:00
Laurent Destailleur
8a32ae6935 Move ajax_autoselect into functions.lib.php 2018-02-13 15:46:39 +01:00
Laurent Destailleur
7ed128ff2b Fix bad escaping 2018-02-13 14:30:14 +01:00
Laurent Destailleur
7743f88e98 Fix bad escaping 2018-02-13 14:03:11 +01:00
Laurent Destailleur
1a4aa89489 NEW Can share any file from the "Document" tab. 2018-02-13 13:55:36 +01:00
atm-quentin
144c13998a NEW_einstein_pdf_modules 2018-02-13 09:51:33 +01:00
Gerhard Stephan
f93934905f Implemented a correct error handling, if the $line->product_ref has not been set 2018-02-13 08:41:57 +01:00
Laurent Destailleur
36ac380cac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 22:26:48 +01:00
Gerhard Stephan
2aaf3a466d Load product data optional fields to the line -> enables to use "line_options_{extrafield}" 
This fixes the issue #3185
https://github.com/Dolibarr/dolibarr/issues/3185
 2018-02-12 21:38:51 +01:00
Laurent Destailleur
a4f48fcfb6 Fix feature must be hidden (not stable) 2018-02-12 16:09:22 +01:00
Laurent Destailleur
b2835fc803 Fix check of vat only for european countries 2018-02-12 15:54:24 +01:00
Laurent Destailleur
2fc97e5c8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 14:01:34 +01:00
Laurent Destailleur
734bd4d2fb Fix menu visible in dev only 2018-02-12 10:15:58 +01:00