lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,059 Commits 43 Branches 150 Tags 886 MiB
7aa09d8b71
Commit Graph

61059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
7aa09d8b71 NEW Can create thirdparty from card proposal, order or invoice 2017-08-28 18:37:16 +02:00
Laurent Destailleur
f1633d72f8 Fix hide type, allow autoselect 2017-08-28 17:55:01 +02:00
Laurent Destailleur
a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/CMailFile.class.php
	htdocs/filefunc.inc.php
 2017-08-28 12:53:02 +02:00
Laurent Destailleur
075a138e14 Fix substitution of __EMAIL__ 2017-08-28 12:49:57 +02:00
Laurent Destailleur
73a799b0ce Merge pull request #7297 from hregis/6.0_bug2 
Fix: use resprint instead resarray
 2017-08-28 12:27:26 +02:00
Laurent Destailleur
3d5edba574 Merge pull request #7302 from aspangaro/6.0-rc_p1 
Fix: Search on supplier payment list doesn't work
 2017-08-28 12:24:22 +02:00
Laurent Destailleur
21a7fcb01a Fix substitution when sending emails 2017-08-28 12:18:18 +02:00
Regis Houssin
0ce51fcb87 Fix: add resprint for passwordforgotten 2017-08-28 09:14:50 +02:00
Regis Houssin
570c683b99 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug2 2017-08-28 09:02:51 +02:00
Laurent Destailleur
1f64f9dfcc Merge pull request #7303 from hregis/6.0_background 
Fix: better for responsive background image
 2017-08-28 08:58:54 +02:00
Regis Houssin
b3642708b3 Fix: better for responsive background image 2017-08-28 08:28:58 +02:00
Alexandre SPANGARO
f6604f6578 Fix: Search on supplier payment list doesn't work 2017-08-28 06:16:31 +02:00
Laurent Destailleur
c382ca22b8 FIX link in to email and option for tls 2017-08-28 00:09:21 +02:00
Laurent Destailleur
b4769d37d6 Increase emailing title length 2017-08-28 00:06:38 +02:00
Laurent Destailleur
b12800d174 FIX link in to email and option for tls 2017-08-28 00:06:19 +02:00
Laurent Destailleur
1b1ce4fdf5 Code comment 2017-08-27 19:40:43 +02:00
Laurent Destailleur
f33289ed6a Better examples 2017-08-27 19:15:06 +02:00
Laurent Destailleur
52a2073152 Add demo file for 6.0 2017-08-27 15:51:44 +02:00
Laurent Destailleur
54afb2f1af Add demo file for 6.0 2017-08-27 15:48:26 +02:00
Laurent Destailleur
e04dd3c807 Fix php unit 2017-08-27 15:05:35 +02:00
Laurent Destailleur
a4ea9d9c03 Add login screenshots 2017-08-27 14:33:53 +02:00
Regis Houssin
80af01c20f Fix: wrong test 2017-08-27 13:57:52 +02:00
Regis Houssin
526ccc870b Fix: add compatibility with old modules 2017-08-27 13:53:08 +02:00
Regis Houssin
1ce1899a46 Fix: add comment 2017-08-27 13:42:46 +02:00
Laurent Destailleur
6c93c6f6cc Fix PHPunit 2017-08-27 13:38:42 +02:00
Laurent Destailleur
64bbf35812 Debug modulebuilder 2017-08-27 13:28:37 +02:00
Regis Houssin
896c8b4a78 Fix: comment old code 2017-08-27 13:24:29 +02:00
Regis Houssin
d800d10766 Fix: use resprint instead resarray 2017-08-27 13:19:57 +02:00
Laurent Destailleur
76b4a2ce06 Can set language file to use for label key of extra field 2017-08-27 12:52:26 +02:00
Laurent Destailleur
502ac19a0a Fix regression on categories 2017-08-27 12:28:59 +02:00
Laurent Destailleur
3f7eea2e0a NEW Can set language on extrafields 2017-08-27 12:12:02 +02:00
Laurent Destailleur
7916a2a648 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/filefunc.inc.php
 2017-08-27 00:38:46 +02:00
Laurent Destailleur
ba3581354a Prepare 5.0.6 2017-08-27 00:35:00 +02:00
Laurent Destailleur
f10e89aa9f Fix utf8 bom forbidden 2017-08-27 00:33:50 +02:00
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/card.php
 2017-08-26 22:33:56 +02:00
Laurent Destailleur
5cc02ac97f Fix deletion of signatures 2017-08-26 22:07:29 +02:00
Laurent Destailleur
08da8ef09d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-26 21:58:52 +02:00
Laurent Destailleur
4052e15565 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/comm/action/card.php
 2017-08-26 21:58:29 +02:00
Laurent Destailleur
c8f323b706 Prepare 5.0.5 2017-08-26 21:55:34 +02:00
Laurent Destailleur
c91f70cbf4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-26 21:53:46 +02:00
Laurent Destailleur
a01bb27d7e FIX install process with DoliWamp 2017-08-26 21:53:29 +02:00
Laurent Destailleur
271d0c86c6 Fix sql install 2017-08-26 21:03:13 +02:00
Laurent Destailleur
c08d0aeda5 Clean duplicate accounting account 2017-08-26 21:01:26 +02:00
Laurent Destailleur
03eb870576 Fix sql syntax error 2017-08-26 20:16:12 +02:00
Laurent Destailleur
49a2f4f0c6 Fix sql 2017-08-26 20:13:01 +02:00
Laurent Destailleur
254d92070f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-26 19:58:01 +02:00
Laurent Destailleur
c64a21f47b Fix regression in cleaning sql 2017-08-26 19:57:22 +02:00
Laurent Destailleur
2346dc6d40 Merge pull request #7295 from defrance/patch-24 
Little cleaning code
 2017-08-26 19:37:50 +02:00
Laurent Destailleur
3f806f83e3 Merge pull request #7293 from fappels/6.0_fix_product_list_supplier_prices 
FIX product list supplier prices not shown when best buy column hidden
 2017-08-26 19:35:01 +02:00
Laurent Destailleur
4445c34af0 Merge pull request #7287 from hregis/5.0_bug2 
Fix: (Agenda) Allowed if link to third party is empty
 2017-08-26 19:32:24 +02:00