Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 21:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

14407 Commits

Author SHA1 Message Date
Laurent Destailleur
8899b511fd FIX Make a redirect after the remove_file action to avoid deletion done 
at next action too.
 2018-03-19 11:28:55 +01:00
Laurent Destailleur
af44af0235 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-18 20:01:27 +01:00
Laurent Destailleur
51b6723b08 Dolibarrize module ticket 2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
09beb9186e Merge pull request #8403 from atm-maxime/develop 
New filter on product supplier price import update
 2018-03-18 14:18:20 +01:00
Laurent Destailleur
22210446da Merge pull request #8407 from joseplluis/develop 
FIX: add contact permission on contact box
 2018-03-18 12:19:09 +01:00
Laurent Destailleur
e3c0fcc3a0 Merge pull request #8405 from grandoc/develop 
New [*use loadLangs for translation files*]
 2018-03-18 12:17:13 +01:00
Josep Lluís
b2a4e3d023 Error in fix 2018-03-18 08:20:43 +01:00
Alexandre SPANGARO
17b98b84ad Merge remote-tracking branch 'uptream/develop' into 8.0-a10 2018-03-18 06:11:05 +01:00
Alexandre SPANGARO
93b087dbe0 NEW Add a tab to specify accountant/auditor of the company 2018-03-18 06:09:50 +01:00
Josep Lluís
bd81487f71 FIX: add contact permission on contact box 
In contact box is only checked the "societe" permission.
Contact permission should be checked too.
 2018-03-17 19:35:34 +01:00
Laurent Destailleur
cb1069cf0b Use font-awesome for the picto to move/transfer a line 2018-03-17 13:21:27 +01:00
Laurent Destailleur
dc0fc73931 Code comment 2018-03-17 12:15:32 +01:00
Laurent Destailleur
57e2240354 NEW Edit of extrafields position page on the edit form 2018-03-17 11:21:50 +01:00
Laurent Destailleur
e323084cf8 Better template 2018-03-16 19:03:16 +01:00
Laurent Destailleur
2bbf738cb8 FIX Sql escape 2018-03-16 18:20:28 +01:00
Philippe GRAND
68b1e5f8fd New [*use loadLangs for translation files*] 2018-03-16 17:40:19 +01:00
Laurent Destailleur
1a70e7a7c4 Triggers for Strips payment modes 2018-03-16 16:42:26 +01:00
Laurent Destailleur
f258d31a98 Triggers for Strips payment modes 2018-03-16 16:10:04 +01:00
Maxime Kohlhaas
3ccdb4d829 New filter on product supplier price import update 2018-03-16 14:22:46 +01:00
Laurent Destailleur
9997a6c787 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-16 12:20:42 +01:00
Laurent Destailleur
46e8692620 Escape db 2018-03-16 12:17:20 +01:00
Laurent Destailleur
96ff5b1b23 Update sql image file for 7.0 stable 2018-03-16 11:19:58 +01:00
arnaud
32ce42610a FIX show status on societe banner 2018-03-16 11:18:00 +01:00
Laurent Destailleur
ba47b6d051 NEW Add tab contact on supplier proposals 2018-03-16 10:21:53 +01:00
Laurent Destailleur
8bfac66f04 Escape db 2018-03-16 09:52:45 +01:00
Laurent Destailleur
5a397fff72 Fix scrutinizer bugs 2018-03-16 00:16:32 +01:00
Laurent Destailleur
6f95a7c2b1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 23:48:14 +01:00
Laurent Destailleur
ce7da41bef Fix save setup 2018-03-15 23:47:16 +01:00
Laurent Destailleur
71c51eb789 NEW Add hook printEmail 2018-03-15 22:22:42 +01:00
Laurent Destailleur
46fb2945d4 NEW Show keyboard shortcut of nav arrow into tooltip 2018-03-15 22:02:03 +01:00
Laurent Destailleur
7f8f0c5dc1 Fix parameter silent was inverted 2018-03-15 21:48:51 +01:00
Laurent Destailleur
83962ca70b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 18:43:58 +01:00
Laurent Destailleur
e1a0df263d Fix code with the new return structure of getEmailTemplate 2018-03-15 18:43:47 +01:00
Philippe GRAND
e8df916770 New [*use loadLangs for translation files*] 2018-03-15 17:14:11 +01:00
Laurent Destailleur
ea3fbf63cd Merge pull request #8390 from grandoc/new_branch_14_03_2018 
New [*use loadLangs for translation files*]
 2018-03-15 15:07:55 +01:00
Laurent Destailleur
9256faf6fb Update pdf_merou.modules.php 2018-03-15 15:07:08 +01:00
Laurent Destailleur
c9566e9501 Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
7c62f22408 Remove doubtful code 2018-03-15 14:02:32 +01:00
Laurent Destailleur
d804764134 Standardize look and feel 2018-03-15 10:41:43 +01:00
Philippe Grand
c8e672d01a use $outputlangs instead of $langs 2018-03-15 09:18:40 +01:00
Philippe Grand
3f0764f282 use $outputlangs instead of $langs 2018-03-15 09:17:53 +01:00
Philippe Grand
e6d2effba1 use $outputlangs instead of $langs 2018-03-15 09:15:22 +01:00
Philippe Grand
09d0dc7ba7 use $outputlangs instead of $langs 2018-03-15 09:14:09 +01:00
Philippe Grand
f6fd03a4f3 Change $langs by $outputlangs 2018-03-15 09:06:01 +01:00
Alexandre SPANGARO
9ce6ab915c Merge remote-tracking branch 'uptream/develop' into 8.0-a9 2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Laurent Destailleur
5392218806 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/translate.class.php
 2018-03-15 02:13:29 +01:00
Laurent Destailleur
c4eea1f0e0 Fix SQLi 2018-03-15 02:12:01 +01:00
Laurent Destailleur
f0f6f71161 Fix Sqli 2018-03-15 01:55:47 +01:00