Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-30 13:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
83,224 Commits 37 Branches 191 Tags
28fa0e4e5d26f1c43ac0dd5aef8bbbb79a2c1942
Commit Graph

629 Commits

Author SHA1 Message Date
Laurent Destailleur
1fe9783760 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/product/index.php
 2020-02-05 14:38:19 +01:00
Laurent Destailleur
a36cf1f86b Fix phpunit 2020-02-05 14:08:13 +01:00
Laurent Destailleur
334c69841a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-05 13:41:30 +01:00
Laurent Destailleur
9100b8a548 FIX SQL request and phpunit 2020-02-05 13:41:10 +01:00
Laurent Destailleur
c101c3dd55 Update holiday.class.php 2020-02-05 13:27:22 +01:00
Laurent Destailleur
d35994e5db Update holiday.class.php 2020-02-05 13:25:51 +01:00
Regis Houssin
e74e63941d FIX use "usergroup" instead "user" 2020-02-03 11:55:55 +01:00
Regis Houssin
bc3a210d12 FIX compatibility with multicompany (avoid duplicate data) 2020-02-03 11:46:18 +01:00
AdrianDominik
5fb15ff0f8 FIX: add traslate from remains holidays 2020-01-16 14:01:41 +01:00
Laurent Destailleur
3bd95c205d Tooltip to understand the new dictionary of holidays 2020-01-15 14:54:17 +01:00
Laurent Destailleur
141ca20269 Trans 2020-01-15 14:44:53 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
b06c281178 Fix error with postgresql 2019-11-26 12:39:31 +01:00
Laurent Destailleur
d34f487c65 Decode subject by emailcollector 2019-11-24 21:30:00 +01:00
Laurent Destailleur
19fb6bfd17 FIX Use PROV as temporary ID for leaves 2019-11-24 18:25:55 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Laurent Destailleur
171b94fc5c Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
b5e47e05f4 Merge pull request #12348 from frederic34/patch-11 
add info for tooltip
 2019-11-07 11:28:41 +01:00
Frédéric FRANCE
361e8eb822 add info for tooltip 2019-11-05 21:44:32 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
1aef1c60dd Merge pull request #11867 from frederic34/socialnetworks 
NEW add socialnetworks dictionary
 2019-11-04 21:10:22 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
537f678268 Merge pull request #12285 from frederic34/patch-13 
Update define_holiday.php
 2019-11-02 11:51:38 +01:00
Laurent Destailleur
68691ddd8a Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Frédéric FRANCE
7bd88f33a0 Update define_holiday.php 2019-11-01 22:22:07 +01:00
Frédéric FRANCE
dbed10a701 Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
b19593bb8e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-11-01 21:30:19 +01:00
Laurent Destailleur
cf2ee892ee FIX security check. A user can see holiday with link without permissions 2019-11-01 21:27:19 +01:00
Laurent Destailleur
2d9135b6ad Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
	htdocs/holiday/list.php
 2019-11-01 21:06:06 +01:00
Laurent Destailleur
4616519dcf FIX Search on leave request ref 2019-11-01 20:52:30 +01:00
Laurent Destailleur
a3a326b25e FIX Search on leave request ref 2019-11-01 20:52:11 +01:00
Laurent Destailleur
83cc9ea643 FIX Search on leave request ref 2019-11-01 20:48:46 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Laurent Destailleur
e684c1c450 Look and feel v11 2019-11-01 12:11:29 +01:00
Frédéric FRANCE
78c1e8dfbe Update define_holiday.php 2019-11-01 08:25:58 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
f7747ed00a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
stickler-ci
345a060bbe Fixing style errors. 2019-10-30 08:36:59 +00:00
Philippe GRAND
1963e5c959 add comment 2019-10-30 09:35:45 +01:00
Frédéric FRANCE
b2b057e9b5 clean indent 2019-10-27 09:51:15 +01:00
Frédéric FRANCE
f4540dddb8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00