Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
83,408 Commits 36 Branches 189 Tags
9c4ba1c5d2b51b2d25868f45c4ccfd7296b1722c
Commit Graph

1803 Commits

Author SHA1 Message Date
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 2020-02-08 16:00:06 +01:00
Laurent Destailleur
fe0d1a81eb Fix filter on current user is stupi on the view "per user". 2020-02-06 21:16:48 +01:00
Laurent Destailleur
f3597926c4 Fix missing escape returned by ci 2020-02-06 10:05:13 +01:00
oscim
7cc87423e4 ref_ext is not in sql requete for save 
ref_ext is not in sql requete for save
 2020-02-05 22:31:27 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
25f0e893ba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:49:43 +01:00
Laurent Destailleur
1144b937eb Fix phpcs 2020-01-29 23:34:54 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
kadogo
b2610903a4 NEW enable put for agendaevents api 2020-01-29 22:55:44 +01:00
Laurent Destailleur
51d750cb49 Merge pull request #12865 from TobiasSekan/ExportIcalWithHolidays 
New: Export ical with holidays
 2020-01-28 03:19:34 +01:00
Tobias Sekan
ce9d1a320f Update actioncomm.class.php after review 2020-01-27 08:27:13 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
25665daa40 FIX #11957 2020-01-22 14:53:40 +01:00
Laurent Destailleur
f06f15de2e Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda 
New: Show holidays in the agenda view (month, week, day)
 2020-01-22 14:13:55 +01:00
Laurent Destailleur
d3411a79ef Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:11:44 +01:00
Laurent Destailleur
d87419f3db FIX #11957 2020-01-22 13:34:07 +01:00
stickler-ci
b47e2e8127 Fixing style errors. 2020-01-16 12:55:08 +00:00
Tobias Sekan
651bf8c1fc Export ical with holidays 2020-01-16 13:49:05 +01:00
stickler-ci
eca59220d8 Fixing style errors. 2020-01-16 09:44:49 +00:00
Tobias Sekan
72e227a543 Add link to leave request for holidays in agenda 2020-01-16 10:37:16 +01:00
Tobias Sekan
bbd7900fc7 Show holidays in agenda 2020-01-16 10:34:45 +01:00
Laurent Destailleur
3f79c00542 Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
Laurent Destailleur
7ef3ee56bd Fix MRP 2020-01-07 20:28:21 +01:00
Laurent Destailleur
6dcba0f053 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2020-01-01 22:37:13 +01:00
Laurent Destailleur
e4a03e98b7 FIX Do not record resource owner of event when not defined. 
More log to track payment errors.
 2020-01-01 12:47:01 +01:00
Laurent Destailleur
d2efe1d427 Fix SQL injection on type parameter in list of events 2019-12-31 17:52:28 +01:00
Frédéric FRANCE
90235d0528 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
945296bb55 Merge pull request #12690 from atm-greg/Hook_on_ics_generation 
NEW hook on ics generation to add more events in eventarray
 2019-12-30 22:03:07 +01:00
Laurent Destailleur
dcf07646cc Fix specimen 2019-12-21 14:02:06 +01:00
Laurent Destailleur
19c14f354e Fix specimen 2019-12-21 14:01:40 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
d17c177251 Merge pull request #12684 from frederic34/hookagendaperuser 
add hook like for per day/week/month
 2019-12-14 13:52:51 +01:00
Laurent Destailleur
835d22f556 Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Frédéric FRANCE
57055bad03 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
307bad1d2a doxygen todo 2019-12-11 19:11:13 +01:00
atm-greg
caaa95da6a hook on ics generation to add more events in eventarray 2019-12-11 15:33:36 +01:00
Frédéric FRANCE
5c59ddb357 add hook like for per day/week/month 2019-12-10 21:11:52 +01:00
Laurent Destailleur
a4272ab947 Debug v11 2019-12-06 09:20:45 +01:00
Frédéric FRANCE
d9bfa62367 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-05 21:47:42 +01:00
Frédéric FRANCE
4c5c6b6ff1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
7a1a932755 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/main.inc.php
 2019-12-03 15:03:10 +01:00
Laurent Destailleur
d153918a10 Fix trans 2019-12-03 15:00:52 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00