Laurent Destailleur
|
df478dc170
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-27 01:53:49 +01:00 |
|
Laurent Destailleur
|
ae087d665c
|
Merge pull request #12916 from RubenRuCh/11.0
Fix: strict mode mysql compatibility
|
2020-01-26 22:24:25 +01:00 |
|
Laurent Destailleur
|
0f2141269a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-01-25 14:43:57 +01:00 |
|
Laurent Destailleur
|
09f809f347
|
FIX #12913
|
2020-01-25 14:03:24 +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 |
|
AdrianDominik
|
d302f190a7
|
Fix: strict mode mysql compatibility
|
2020-01-23 13:29:28 +01:00 |
|
Laurent Destailleur
|
25665daa40
|
FIX #11957
|
2020-01-22 14:53:40 +01:00 |
|
Laurent Destailleur
|
59dfbc49a7
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-22 14:42:18 +01:00 |
|
Laurent Destailleur
|
bfc8369418
|
Fix phpcs
|
2020-01-22 14:15:08 +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 |
|
Laurent Destailleur
|
2d07a08e55
|
Fix init of specimen
|
2020-01-21 00:22:57 +01:00 |
|
Laurent Destailleur
|
80483fc085
|
Fix init of specimen
|
2020-01-21 00:20:03 +01:00 |
|
Laurent Destailleur
|
6fd717539d
|
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2020-01-18 20:21:29 +01:00 |
|
Laurent Destailleur
|
24d439845b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-18 20:20:25 +01:00 |
|
Scrutinizer Auto-Fixer
|
8744f6ab7b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-18 15:17:07 +00:00 |
|
Laurent Destailleur
|
81f8a486c9
|
Look and feel v11
|
2020-01-17 14:56:06 +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 |
|
VESSILLER
|
48297759fb
|
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-tooltip-note
|
2020-01-16 10:53:57 +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
|
2b7e45cb09
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-15 20:13:54 +01:00 |
|
Laurent Destailleur
|
2c40e4be94
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-15 20:13:45 +01:00 |
|
Laurent Destailleur
|
98eda68afb
|
Fix linkg to public notes
|
2020-01-15 19:49:45 +01:00 |
|
Laurent Destailleur
|
132bb67d14
|
Merge pull request #12364 from aspangaro/11.0_a1
NEW Propal list - Add date start & date end
|
2020-01-15 17:52:55 +01:00 |
|
Laurent Destailleur
|
3f79c00542
|
Merge branch 'develop' into actioncomm_category
|
2020-01-15 14:21:06 +01:00 |
|
Laurent Destailleur
|
b47db086cb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
|
2020-01-10 14:30:42 +01:00 |
|
Laurent Destailleur
|
d97a59ac4a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
|
2020-01-10 14:25:26 +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
|
622dc7e8d7
|
Debug v11
|
2020-01-07 22:01:55 +01:00 |
|
Laurent Destailleur
|
7ef3ee56bd
|
Fix MRP
|
2020-01-07 20:28:21 +01:00 |
|
ptibogxiv
|
e820af4aa0
|
FIX: multicompany for discount
|
2020-01-07 13:07:36 +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 |
|
VESSILLER
|
046aba8abd
|
FIX indented errors
|
2019-12-26 10:14:05 +01:00 |
|
lvessiller-opendsi
|
dec64b45e8
|
Merge branch 'develop' into new-propal-tooltip-note
|
2019-12-26 10:06:38 +01:00 |
|
VESSILLER
|
bf1bf10a53
|
FIX resolve conflicts
|
2019-12-26 09:56:35 +01:00 |
|
VESSILLER
|
23b4e3ad6d
|
FIX resolve conflicts
|
2019-12-26 09:50:15 +01:00 |
|
Alexandre SPANGARO
|
af4b0f54c5
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a1
|
2019-12-23 20:44:32 +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
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01: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 |
|
Laurent Destailleur
|
6a03015fa4
|
Fix warning
|
2019-12-13 16:29:58 +01:00 |
|
Laurent Destailleur
|
d38c73c90a
|
FIX output of emails from and error on emailing pages.
|
2019-12-13 15:52:08 +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
|
f98713efdd
|
Update propal.class.php
|
2019-12-10 19:20:23 +01:00 |
|
Laurent Destailleur
|
452976850f
|
Update propal.class.php
|
2019-12-10 19:18:45 +01:00 |
|
David
|
4c463cdbb5
|
FIX: propal update
Update fields 'date' and 'fin_validite'
|
2019-12-10 16:16:33 +01:00 |
|
Scrutinizer Auto-Fixer
|
54ca37dc65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-09 09:35:58 +00:00 |
|
Laurent Destailleur
|
4d489f64b0
|
Fix getpost
|
2019-12-06 17:42:09 +01:00 |
|
Laurent Destailleur
|
796f34628d
|
Debug v11
|
2019-12-06 17:40:22 +01:00 |
|
Laurent Destailleur
|
a4272ab947
|
Debug v11
|
2019-12-06 09:20:45 +01:00 |
|
Laurent Destailleur
|
93d66d8213
|
Debug v11
|
2019-12-06 08:50:26 +01:00 |
|
Frédéric FRANCE
|
d9bfa62367
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-05 21:47:42 +01:00 |
|
Florian Mortgat
|
3f6715a377
|
FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
|
2019-12-05 15:34:41 +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 |
|
Laurent Destailleur
|
41a176ce72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/remx.php
htdocs/core/modules/modStripe.class.php
htdocs/product/stock/replenish.php
htdocs/stripe/payout.php
|
2019-12-03 13:58:15 +01:00 |
|
Laurent Destailleur
|
eb5a2bd1a5
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/expensereport/card.php
htdocs/user/card.php
|
2019-12-03 13:52:42 +01:00 |
|
Laurent Destailleur
|
072db96b11
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-12-03 13:48:38 +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 |
|
Laurent Destailleur
|
6f7343b14f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-02 11:01:26 +01:00 |
|
Laurent Destailleur
|
6d81bc77cb
|
Fix look and feel v11
|
2019-12-02 11:00:09 +01:00 |
|
Laurent Destailleur
|
92070fa491
|
Fix name of variable $trigger_name into $triggersendname
|
2019-12-02 09:38:16 +01:00 |
|
Frédéric FRANCE
|
25ed2b930f
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-01 16:10:37 +01:00 |
|
Maxime Kohlhaas
|
a220d43bd6
|
Fix #11849 : missing price2num in discount split
|
2019-12-01 01:41:13 +01:00 |
|
Laurent Destailleur
|
a2a96f8796
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-01 00:41:11 +01:00 |
|
Frédéric FRANCE
|
35394639a4
|
The property ownerid does not exist on ActionComm
|
2019-11-28 22:26:25 +01:00 |
|
Scrutinizer Auto-Fixer
|
5f99e25c45
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-28 11:36:20 +00:00 |
|
Frédéric FRANCE
|
b2912e688b
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-27 22:54:05 +01:00 |
|
Frédéric FRANCE
|
4c4ae5b6e1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-26 08:10:40 +01:00 |
|
Frédéric FRANCE
|
3edac06fae
|
Form selectAvailabilityDelay returns void
|
2019-11-26 00:06:57 +01:00 |
|
Laurent Destailleur
|
e4d9f99484
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/remx.php
htdocs/expedition/card.php
htdocs/fourn/facture/card.php
|
2019-11-22 15:04:40 +01:00 |
|
Laurent Destailleur
|
9eb98ca94c
|
Merge pull request #12478 from ptibogxiv/patch-281
FIX display job of contact list
|
2019-11-22 14:26:12 +01:00 |
|
Laurent Destailleur
|
d487f6b84d
|
Clean code
|
2019-11-22 14:10:12 +01:00 |
|
Laurent Destailleur
|
3daeb24da1
|
Fix confusion with field name in sql
|
2019-11-21 13:05:13 +01:00 |
|
ptibogxiv
|
f73bd0e0a6
|
FIX display job of contact list
can see différent contact with same name but different job
|
2019-11-20 13:07:26 +01:00 |
|
Laurent Destailleur
|
d7e8c71091
|
Look and feel v11
|
2019-11-20 12:45:15 +01:00 |
|
Frédéric FRANCE
|
d182eee4bf
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-19 23:26:00 +01:00 |
|
Laurent Destailleur
|
fb70893229
|
Fix missing class reposition
|
2019-11-19 21:29:49 +01:00 |
|
Frédéric FRANCE
|
2e5f539b2a
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-18 17:45:52 +01:00 |
|
Alexandre SPANGARO
|
b3e09e050c
|
fix missing param
|
2019-11-18 11:36:12 +01:00 |
|