root
|
2419f122c4
|
referer XSS patches
|
2020-02-03 23:10:04 +00:00 |
|
Laurent Destailleur
|
4765198af2
|
Clean code from using deprecated field amount
|
2020-02-02 19:03:37 +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
|
80707d6a5e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-28 17:24:26 +01:00 |
|
Laurent Destailleur
|
3a9e238dc6
|
FIX Missing value of $formconfirm as parameters of hook
|
2020-01-28 12:00:27 +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
|
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 |
|
Alexandre SPANGARO
|
b11579c1bd
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a1
|
2019-11-18 09:26:40 +01:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Frédéric FRANCE
|
6784ea9fae
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-16 09:21:57 +01:00 |
|
Laurent Destailleur
|
4fc7b8c3b1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/extrafields_list_search_title.tpl.php
|
2019-11-14 12:49:42 +01:00 |
|
Laurent Destailleur
|
a29adc94f3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/card.php
htdocs/langs/en_US/admin.lang
|
2019-11-14 12:48:33 +01:00 |
|
Laurent Destailleur
|
9d963a7ca6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-11-14 12:44:32 +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
|
f5da126cff
|
Fix property not defined
|
2019-11-14 12:01:01 +01:00 |
|
Frédéric FRANCE
|
a3e092b227
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-14 09:21:26 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Frédéric FRANCE
|
446c66da62
|
use class CONST
|
2019-11-14 08:15:39 +01:00 |
|
Frédéric FRANCE
|
3bac051521
|
use class CONST
|
2019-11-14 08:07:16 +01:00 |
|
Frédéric FRANCE
|
9040f6d9c7
|
can tag actioncomm
|
2019-11-13 21:18:34 +01:00 |
|
Frédéric FRANCE
|
3ec7568559
|
FIX #12385
|
2019-11-13 20:44:21 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00: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 |
|
Laurent Destailleur
|
3430a88c72
|
Fix $conf not defined
|
2019-11-12 10:13:22 +01:00 |
|
Laurent Destailleur
|
c02cd80b75
|
Clean code
|
2019-11-12 10:11:30 +01: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 |
|
Frédéric FRANCE
|
2148d6ed05
|
css
|
2019-11-11 20:33:34 +01:00 |
|
stickler-ci
|
bb74d2f8bd
|
Fixing style errors.
|
2019-11-10 10:00:07 +00:00 |
|
Philippe GRAND
|
6e0c028d51
|
add some comment
|
2019-11-10 10:59:44 +01:00 |
|
Scrutinizer Auto-Fixer
|
812d0af1d9
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 14:51:54 +00:00 |
|
Laurent Destailleur
|
cb1e5954f6
|
Fix regression
|
2019-11-08 13:10:41 +01:00 |
|
Laurent Destailleur
|
cb3fd5728b
|
Fix color for not busy events
|
2019-11-08 13:04:49 +01:00 |
|
Laurent Destailleur
|
dc84d7e844
|
Code comment
|
2019-11-08 11:29:56 +01:00 |
|
Laurent Destailleur
|
34564ea084
|
Merge pull request #12381 from TobiasSekan/FixIcalExportAlwaysSameUser
Fix ICAL export add a user to all events
|
2019-11-08 11:26:57 +01:00 |
|
Tobias Sekan
|
3677855ebc
|
Fix ICAL export add a user to all events
|
2019-11-07 15:45:34 +01:00 |
|
Laurent Destailleur
|
26e95c9161
|
Merge pull request #12359 from TobiasSekan/FixMixedEventsWithSameTime
Fix mixed order of events with same time
|
2019-11-07 11:43:39 +01:00 |
|
Alexandre SPANGARO
|
938d997e51
|
NEW Propal list - Add date start & date end
|
2019-11-07 06:33:33 +01:00 |
|
VESSILLER
|
bcafef42b0
|
NEW tooltip notes with first public note and then private note
|
2019-11-06 16:45:52 +01:00 |
|
Tobias Sekan
|
6fdbe8923f
|
Fix mixed order of events with same time
|
2019-11-06 10:33:26 +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 |
|
VESSILLER
|
fefb4a7f95
|
FIX replace <br /> by <br>
|
2019-11-05 15:13:44 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
Laurent Destailleur
|
4ca85eacc1
|
Debug module BOM
|
2019-11-04 15:45:50 +01:00 |
|
Laurent Destailleur
|
11500fb8d9
|
FIX confusion between permto... and permisstionto...
|
2019-11-04 15:33:49 +01:00 |
|
VESSILLER
|
668bb0cb86
|
NEW add public and private notes in propal list
|
2019-11-04 11:03:39 +01:00 |
|
Laurent Destailleur
|
4909a21f8a
|
Fix css
|
2019-11-03 22:09:20 +01:00 |
|
Laurent Destailleur
|
630a150b09
|
Fix multicurrency rate must be visible if currency differs only
|
2019-11-03 17:48:16 +01:00 |
|
Laurent Destailleur
|
9c5e17d676
|
Merge pull request #12214 from homer8173/patch-8
Implement new now feature
|
2019-11-02 15:09:06 +01:00 |
|
Laurent Destailleur
|
93f3b1d2db
|
Clean APIs
|
2019-11-02 15:05:14 +01:00 |
|
Laurent Destailleur
|
df750b6a9d
|
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
NEW Add attendee to ical export + cleanup
|
2019-11-02 13:40:27 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
137cfe9d4c
|
Merge pull request #12276 from frederic34/patch-11
css
|
2019-11-02 13:31:34 +01:00 |
|
Laurent Destailleur
|
07e9e2e872
|
Merge pull request #12274 from frederic34/patch-7
css
|
2019-11-02 13:31:10 +01:00 |
|
Laurent Destailleur
|
d232b7a387
|
Merge pull request #12286 from grandoc/new_branch_01_11_2019
add some comment
|
2019-11-02 13:00:23 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
c12e66e2a2
|
Merge branch 'develop' into new_branch_01_11_2019
|
2019-11-02 12:00:04 +01:00 |
|
Laurent Destailleur
|
1797b49778
|
Merge pull request #12288 from frederic34/patch-14
form_select_status_action returns void
|
2019-11-02 11:48:07 +01:00 |
|
Laurent Destailleur
|
3943cb18c2
|
Merge pull request #12295 from frederic34/actioncomm_doxygen
doxygen for actioncomm class
|
2019-11-02 11:37:30 +01:00 |
|
Laurent Destailleur
|
4fd20157c2
|
Merge pull request #12298 from frederic34/patch-22
Update propal.class.php
|
2019-11-02 10:08:33 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
941043dd67
|
Fix navigation on resources
|
2019-11-02 00:17:08 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Frédéric FRANCE
|
693506cebd
|
Update propal.class.php
socid is int
|
2019-11-01 20:26:55 +01:00 |
|
Frédéric FRANCE
|
bb9b435875
|
doxygen for actioncomm class
|
2019-11-01 17:12:07 +01:00 |
|
Frédéric FRANCE
|
400defd93d
|
form_select_status_action returns void
|
2019-11-01 15:04:37 +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 |
|
Sekan, Tobias
|
0bfff92032
|
Add attendee to ical export + cleanup
|
2019-11-01 11:59:54 +01:00 |
|
Philippe Grand
|
4b5ca5c25e
|
Update mailing.class.php
|
2019-11-01 11:15:53 +01:00 |
|
stickler-ci
|
0c6938aa2a
|
Fixing style errors.
|
2019-11-01 09:44:29 +00:00 |
|
Philippe GRAND
|
c851a9faff
|
add some comment
|
2019-11-01 10:38:58 +01:00 |
|
Laurent Destailleur
|
c215d534fc
|
Fix phpcs
|
2019-10-31 21:16:41 +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
|
a59c3ab0be
|
Update index.php
|
2019-10-30 18:55:04 +01:00 |
|
Frédéric FRANCE
|
ade50b5362
|
css
|
2019-10-30 18:50:55 +01:00 |
|
Laurent Destailleur
|
66a288a343
|
Merge pull request #12235 from frederic34/scopeindent
clean indent
|
2019-10-30 02:57:59 +01:00 |
|
Laurent Destailleur
|
6073692654
|
Merge pull request #12243 from TobiasSekan/FixEventSortNonNumeric
Fix non-numeric error in sort event function
|
2019-10-30 02:57:00 +01:00 |
|
Laurent Destailleur
|
c952c7e3c2
|
Merge pull request #12237 from grandoc/new_branch_26_10_2019
Internationalization
|
2019-10-30 02:53:34 +01:00 |
|
iouston
|
2072768ec2
|
NEW : add name_alias in fields to search all
|
2019-10-29 11:20:10 +01:00 |
|
Tobias Sekan
|
bfe7ad211f
|
Fix non-numeric error in sort event function
Fix non-numeric error in sort event function and fix mixed space and tab indent, use spaces
|
2019-10-28 09:53:27 +01:00 |
|
Philippe GRAND
|
c07dc1cd5f
|
Internationalization
|
2019-10-26 22:40:10 +02:00 |
|
Frédéric FRANCE
|
c44425d0a0
|
start clean indent in compta directory
|
2019-10-26 14:51:57 +02:00 |
|
Frédéric FRANCE
|
1a10b30a76
|
clean indent in comm directory
|
2019-10-26 14:28:40 +02:00 |
|
Norbert Penel
|
a67b3d8cf5
|
Implement new now feature
8d75e83e55
|
2019-10-24 18:55:43 +02:00 |
|
Laurent Destailleur
|
2201b11fd3
|
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
|
2019-10-24 13:41:04 +02:00 |
|
Laurent Destailleur
|
da00591bba
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
|
2019-10-23 04:04:32 +02:00 |
|
Laurent Destailleur
|
161f2a018f
|
Fix responsive and bad closing td
|
2019-10-23 03:50:48 +02:00 |
|
Laurent Destailleur
|
b88968520b
|
Move code of extrafields to the new architecture
|
2019-10-22 17:08:37 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Laurent Destailleur
|
b813dfe3c9
|
Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor
Fix missing organizer and contact on ical export
|
2019-10-20 13:49:47 +02:00 |
|
Laurent Destailleur
|
89b0730483
|
Update actioncomm.class.php
|
2019-10-20 13:49:36 +02:00 |
|
Tobias Sekan
|
28dea51c4a
|
Fix missing organizer in ical export
|
2019-10-18 13:18:09 +02:00 |
|
Laurent Destailleur
|
f85899742b
|
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-17 17:48:42 +02:00 |
|
Laurent Destailleur
|
1a021e85f6
|
Merge pull request #12141 from TobiasSekan/FixNoneNumericValue
Fix non-numeric value encountered on ical export
|
2019-10-17 17:39:25 +02:00 |
|
Tobias Sekan
|
daa7f54295
|
fix - not removed old code line
|
2019-10-17 08:10:21 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
8152c60878
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/actions_sendmails.inc.php
|
2019-10-16 17:13:14 +02:00 |
|
Laurent Destailleur
|
f88733f46a
|
Html code simplest
|
2019-10-16 14:14:32 +02:00 |
|
Tobias Sekan
|
741627897e
|
fix interchanged allocation
|
2019-10-16 13:56:11 +02:00 |
|
Laurent Destailleur
|
a57b456aa6
|
Merge pull request #12143 from frederic34/patch-19
NEW Add location into event tooltip. Use full day for fullday events
|
2019-10-16 13:21:55 +02:00 |
|
Laurent Destailleur
|
e07e01580d
|
Replace deprecated code with new one
|
2019-10-16 03:34:32 +02:00 |
|
Frédéric FRANCE
|
ccd9da99f4
|
Update list.php
|
2019-10-15 20:11:15 +02:00 |
|
Frédéric FRANCE
|
6a8e8907ef
|
Update list.php
|
2019-10-15 17:55:07 +02:00 |
|
Tobias Sekan
|
199fb3be0f
|
Fix non-numeric value encountered on ical export
|
2019-10-15 14:29:27 +02:00 |
|
Laurent Destailleur
|
fb3d20107c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/exports/export.php
htdocs/filefunc.inc.php
|
2019-10-15 03:51:57 +02:00 |
|
Laurent Destailleur
|
65b6bc26ba
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/facture/list.php
|
2019-10-14 23:54:24 +02:00 |
|
Laurent Destailleur
|
0fe3159a8a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/fourn/facture/list.php
|
2019-10-14 23:52:46 +02:00 |
|
Laurent Destailleur
|
0d4866c38c
|
Merge pull request #12118 from iouston/patch-3
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
|
2019-10-14 21:23:59 +02:00 |
|
Laurent Destailleur
|
176436ec34
|
Update document.php
|
2019-10-14 21:23:52 +02:00 |
|
Laurent Destailleur
|
5d02763288
|
Merge pull request #12129 from cyrilus/develop
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
|
2019-10-14 20:39:08 +02:00 |
|
stickler-ci
|
4b7987374b
|
Fixing style errors.
|
2019-10-14 14:46:04 +00:00 |
|
iouston
|
0a9cc96564
|
Update document.php
Add 2 hidden options for set by default a sort (sort and order) on document page
|
2019-10-14 15:01:57 +02:00 |
|
Laurent Destailleur
|
9efc5a1b9d
|
Fix extension
|
2019-10-13 15:00:07 +02:00 |
|
Laurent Destailleur
|
33f6206031
|
NEW Add link to export target of emailings into a CSV file.
|
2019-10-12 20:12:24 +02:00 |
|
Laurent Destailleur
|
9c94ffeea9
|
Fix css
|
2019-10-12 18:40:41 +02:00 |
|
Laurent Destailleur
|
9ba992b8b6
|
Work on inventory module
|
2019-10-12 12:31:35 +02:00 |
|
Frédéric FRANCE
|
849eda2023
|
Update index.php
|
2019-10-12 00:05:26 +02:00 |
|
Frédéric FRANCE
|
c3e8aec07c
|
fix translation for showemailing
in lang files, it's ShowEMailing not ShowEmailing
|
2019-10-11 23:54:05 +02:00 |
|
Laurent Destailleur
|
f345b5fdb0
|
Fix look and feel v10
|
2019-10-11 19:32:45 +02:00 |
|
Laurent Destailleur
|
a8676e63c8
|
CSS
|
2019-10-10 16:46:50 +02:00 |
|
ro@t.com
|
2149b155d1
|
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
|
2019-10-10 15:57:26 +02:00 |
|
Laurent Destailleur
|
b6c600c171
|
css
|
2019-10-10 11:44:03 +02:00 |
|
Laurent Destailleur
|
51ef2cd20a
|
FIX #12058
|
2019-10-07 20:20:06 +02:00 |
|
Laurent Destailleur
|
07d1a3fe8b
|
css
|
2019-10-07 18:17:22 +02:00 |
|
Laurent Destailleur
|
c83f40fc7e
|
Debug contact by default
|
2019-10-07 15:42:37 +02:00 |
|
Laurent Destailleur
|
f56da782ab
|
Merge pull request #12038 from Ahuahuachi/develop
NEW Add hidden options to send by email even for draft status
|
2019-10-07 14:18:53 +02:00 |
|
Laurent Destailleur
|
d4f4f33122
|
Merge pull request #12048 from frederic34/patch-17
Update card.php
|
2019-10-07 10:23:51 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Frédéric FRANCE
|
bfd8bc839e
|
Update card.php
|
2019-10-06 10:28:09 +02:00 |
|
Alfredo Altamirano
|
140784d741
|
Merge remote-tracking branch 'Dolibarr/develop' into develop
|
2019-10-03 20:32:26 -05:00 |
|
Alfredo Altamirano
|
b6882af1b6
|
Add hidden options to send by email for all status
|
2019-10-03 20:21:13 -05:00 |
|
Laurent Destailleur
|
b60ee4c18c
|
css
|
2019-10-03 09:58:49 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Laurent Destailleur
|
320e9bbeec
|
Text on tooltip can also be clickable
|
2019-10-02 15:54:42 +02:00 |
|
Laurent Destailleur
|
c6d38227b6
|
NEW Use a dedicated css for the pencil to edit a field
|
2019-10-02 14:44:38 +02:00 |
|
Laurent Destailleur
|
8ad81a092a
|
Clean code
|
2019-10-01 16:19:54 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
fec67aade4
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 18:44:34 +02:00 |
|
Laurent Destailleur
|
d3eafa86d7
|
Merge pull request #11988 from frederic34/patch-12
Add hook beforeAgenda in comm/action/index.php
|
2019-09-30 18:03:25 +02:00 |
|
Laurent Destailleur
|
ce7e8c83a3
|
Use a dedicated css imgforviewmode for button used to switch view
|
2019-09-30 17:08:57 +02:00 |
|
Frédéric FRANCE
|
4a305ec95c
|
Add hook beforeAgenda in comm/action/index.php
|
2019-09-30 15:59:05 +02:00 |
|
Laurent Destailleur
|
d8de78dca9
|
Merge pull request #11984 from fuhraih/develop
Fix 11554 and 7533
|
2019-09-30 15:31:41 +02:00 |
|
Laurent Destailleur
|
b28cd1bb57
|
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 15:26:28 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
Laurent Destailleur
|
a2140412e0
|
Fix title
|
2019-09-30 00:41:38 +02:00 |
|
Laurent Destailleur
|
2b57d486dc
|
NEW Upgrade ACE editor to v1.4.6
|
2019-09-28 13:50:32 +02:00 |
|
Laurent Destailleur
|
86e5465197
|
Standardize extrafields code
|
2019-09-28 10:55:09 +02:00 |
|
Alexandre SPANGARO
|
288aea190b
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-28 06:09:40 +02:00 |
|
Alexandre SPANGARO
|
7f93f046e9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-28 06:02:25 +02:00 |
|
fuhraih
|
5757159c30
|
FIX #7533 Infinite loop in Agenda per user view if workinghours not set
correctly
Remove the spaces in the Working_hours and Working_days stored
|
2019-09-27 22:29:12 +02:00 |
|
Laurent Destailleur
|
c5e7413ed2
|
Merge branch 'develop' into fix-resource-event-move-check-busy
|
2019-09-27 15:35:14 +02:00 |
|
Laurent Destailleur
|
34813a931f
|
Merge branch 'develop' into patch-10
|
2019-09-27 14:45:09 +02:00 |
|
Laurent Destailleur
|
f90bfb54d4
|
Merge pull request #11913 from frederic34/actioncommcarddoaction
add doaction to actioncommcard
|
2019-09-27 14:34:49 +02:00 |
|
Laurent Destailleur
|
138b494b98
|
Merge pull request #11936 from aspangaro/11.0_translation
Translate and some fix
|
2019-09-27 12:15:50 +02:00 |
|
Frédéric FRANCE
|
41cb628d05
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-25 08:06:44 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +02:00 |
|
Laurent Destailleur
|
5838fa1229
|
Fix az09 -> aZ09
|
2019-09-24 14:20:45 +02:00 |
|
Laurent Destailleur
|
db334a3b94
|
FIX Var not enough sanitized
|
2019-09-24 14:16:24 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
1c13a38ce9
|
Typo abscissa
|
2019-09-23 21:45:23 +02:00 |
|
Laurent Destailleur
|
40f75b16d8
|
FIX Substitution of __PROJECT_XXX__ not done
|
2019-09-23 13:04:22 +02:00 |
|
VESSILLER
|
ea5ff59076
|
FIX check if a resource is in use after a drag and drop from events
|
2019-09-17 16:43:36 +02:00 |
|
Frédéric FRANCE
|
850b9fd52a
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-17 08:24:31 +02:00 |
|
Frédéric FRANCE
|
155e8fb500
|
fix syntax
|
2019-09-17 08:18:01 +02:00 |
|
Frédéric FRANCE
|
0d63c43ccd
|
add doaction to actioncommcard
|
2019-09-17 08:15:01 +02:00 |
|
Frédéric FRANCE
|
ecac1f9f40
|
wip
|
2019-09-17 08:02:55 +02:00 |
|
Frédéric FRANCE
|
a2d3cde291
|
some update after night
|
2019-09-17 07:59:46 +02:00 |
|
Frédéric FRANCE
|
fb7ef3cefc
|
Update card.php
|
2019-09-16 23:12:11 +02:00 |
|
Frédéric FRANCE
|
f369c1a80a
|
Update card.php
|
2019-09-16 20:59:13 +02:00 |
|
Frédéric FRANCE
|
67b73cf0e6
|
Update actioncomm.class.php
|
2019-09-16 20:57:20 +02:00 |
|
Laurent Destailleur
|
434ab2965a
|
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy
NEW check if a resource is in use in an event
|
2019-09-15 15:47:07 +02:00 |
|
Laurent Destailleur
|
4d0ef33471
|
FIX #11857
|
2019-09-15 15:43:03 +02:00 |
|
Frédéric FRANCE
|
c9c7d60fc0
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-14 16:37:10 +02:00 |
|
Laurent Destailleur
|
56a99f6e6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-12 11:22:13 +02:00 |
|
Laurent Destailleur
|
db900cb5ea
|
FIX EDB-ID:47370
|
2019-09-11 17:51:50 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Laurent Destailleur
|
66a9fabd06
|
If you develop your own emailing target selector and used
parent::add_to_target(...), you must now use parent::addToTargets(...)
|
2019-09-09 14:18:25 +02:00 |
|
Laurent Destailleur
|
28ba5abb89
|
Clean code
|
2019-09-09 13:31:14 +02:00 |
|
VESSILLER
|
66611f4097
|
FIX rename "resource" (reserved) by "dolresource"
|
2019-09-09 09:29:43 +02:00 |
|
Frédéric FRANCE
|
bd4c9a64a8
|
wip
|
2019-09-07 14:48:25 +02:00 |
|
Laurent Destailleur
|
a5f7211730
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/install/repair.php
|
2019-09-06 16:10:55 +02:00 |
|
Laurent Destailleur
|
529dd05226
|
Replace deprecated code
|
2019-09-06 10:53:05 +02:00 |
|
Laurent Destailleur
|
bb81f66a1a
|
Add phpunit test for Lessc
|
2019-09-06 10:36:49 +02:00 |
|
VESSILLER
|
815d0bbc20
|
FIX rename "dolresource" into "resource" for compatibility with PR 11822
|
2019-09-05 11:57:12 +02:00 |
|
VESSILLER
|
9ed09db93c
|
FIX replace "<br />" by "<br>"
|
2019-09-05 09:41:15 +02:00 |
|
VESSILLER
|
4ef7e755ad
|
FIX only check on busy resources before updating an event
|
2019-09-05 09:29:40 +02:00 |
|
VESSILLER
|
b70587c150
|
NEW check if a resource is in use in an event
|
2019-09-04 15:14:16 +02:00 |
|
Laurent Destailleur
|
750182f9cd
|
Removed deprecated method actioncomm->add(), use create() instead
|
2019-09-04 13:54:36 +02:00 |
|
Laurent Destailleur
|
da3d230182
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.stickler.yml
htdocs/takepos/invoice.php
|
2019-09-03 17:34:49 +02:00 |
|
Laurent Destailleur
|
c32100c714
|
Merge pull request #11768 from atm-florian/10_fixeventlist
fix event list with description
|
2019-09-03 15:02:22 +02:00 |
|
Laurent Destailleur
|
52a543953c
|
Fix position of tests
|
2019-09-03 14:58:54 +02:00 |
|
Laurent Destailleur
|
17ccb8fa10
|
Fix missing tooltip
|
2019-09-03 14:56:13 +02:00 |
|
Laurent Destailleur
|
a95e02e3f6
|
FIX #11789 FIX #11790
|
2019-09-03 14:52:03 +02:00 |
|
Laurent Destailleur
|
98459363df
|
Merge pull request #11795 from jtraulle/fix-doxygen-examples
Fix Wrongly catched examples by Doxygen
|
2019-09-03 12:45:23 +02:00 |
|
Laurent Destailleur
|
6c96478040
|
Removed deprecated code
|
2019-09-02 22:57:55 +02:00 |
|
Laurent Destailleur
|
f54d4e3fc2
|
Replace deprecated code with new one
|
2019-08-31 02:34:54 +02:00 |
|
Laurent Destailleur
|
4a76dfa6ff
|
Fix link to setup
|
2019-08-30 18:23:43 +02:00 |
|
Jean Traullé
|
c32c7d48ba
|
Fix Wrongly catched examples by Doxygen
|
2019-08-30 17:14:59 +02:00 |
|
Laurent Destailleur
|
05c9e97fe4
|
The deprecated method get_OutstandingBill has been removed. You can use
getOutstandingBills() instead.
|
2019-08-29 00:45:02 +02:00 |
|
Laurent Destailleur
|
cb8bee7899
|
Responsive
|
2019-08-28 19:48:20 +02:00 |
|
Laurent Destailleur
|
9fd4f839ec
|
Use css "pictomodule" for picto of modules
|
2019-08-28 19:28:50 +02:00 |
|
Laurent Destailleur
|
931586269a
|
Fix td
|
2019-08-28 18:23:41 +02:00 |
|
Laurent Destailleur
|
042e9df720
|
Sort
|
2019-08-28 18:20:19 +02:00 |
|
Laurent Destailleur
|
d668b79738
|
NEW Add column tms into the table of targets for emailing
|
2019-08-28 18:14:46 +02:00 |
|
florian HENRY
|
243fca9a1a
|
fix event list with description
|
2019-08-27 16:12:07 +02:00 |
|
Laurent Destailleur
|
d304749eca
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-19 10:19:14 +02:00 |
|
Laurent Destailleur
|
18886c701d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/lib/company.lib.php
|
2019-08-19 00:02:26 +02:00 |
|
Laurent Destailleur
|
3f105a97bf
|
Debug the new workboard
|
2019-08-18 04:56:48 +02:00 |
|
Laurent Destailleur
|
5351d78a96
|
Merge branch 'develop' into develop_new_dashboard
|
2019-08-18 01:26:56 +02:00 |
|
Laurent Destailleur
|
b1be6bf4f2
|
FIX #11422 Can't edit his own events with standard rights
|
2019-08-18 01:24:54 +02:00 |
|
Laurent Destailleur
|
8874a0f3c1
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-15 23:39:11 +02:00 |
|
Laurent Destailleur
|
386f929fe3
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/website.lib.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
|
2019-08-15 23:39:02 +02:00 |
|
Laurent Destailleur
|
6430c74793
|
Merge pull request #11168 from hregis/develop_menu
NEW add new function "setEntity()" and better compatibility with Multicompany
|
2019-08-15 21:00:05 +02:00 |
|
Laurent Destailleur
|
f26a13ff13
|
NEW Removed deprecated code that create linked object from ->origin
|
2019-08-15 19:50:18 +02:00 |
|
Laurent Destailleur
|
ac8bf7b066
|
Update propal.class.php
|
2019-08-15 19:48:29 +02:00 |
|
Regis Houssin
|
7c8b3c9a38
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-08-13 07:34:02 +02:00 |
|
Juanjo Menent
|
7dab396d08
|
Fix: error creating a budget from an intervention
|
2019-08-12 17:29:25 +02:00 |
|
Laurent Destailleur
|
63efe82ff3
|
Merge pull request #11639 from ptibogxiv/patch-213
NEW list by date_cloture on propal list
|
2019-08-10 01:07:07 +02:00 |
|
Laurent Destailleur
|
14fabeb377
|
Variable rangtouse -> ranktouse
|
2019-08-10 00:46:20 +02:00 |
|
ptibogxiv
|
4de68397ae
|
NEW list by date_cloture on propal list
|
2019-08-05 21:03:48 +02:00 |
|
John Botella
|
b4c4e5a662
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
|
2019-08-02 14:52:01 +02:00 |
|
Laurent Destailleur
|
d0de3ef08d
|
Merge pull request #11603 from bafbes/abb100067
Fix:syntax error in sql query
|
2019-08-01 16:06:01 +02:00 |
|
Laurent Destailleur
|
d7a41c6b72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-08-01 12:54:27 +02:00 |
|
John Botella
|
9b84987cc1
|
prepare new dashboard
|
2019-08-01 12:33:19 +02:00 |
|
Laurent Destailleur
|
5eb8f05061
|
FIX #11584
|
2019-08-01 12:23:02 +02:00 |
|
Abbes Bahfir
|
bf2d052d62
|
Fix:syntax error in sql query
|
2019-07-31 17:48:17 +01:00 |
|
Regis Houssin
|
d9ea61e47c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
|
2019-07-31 12:49:56 +02:00 |
|
Laurent Destailleur
|
11e3aa5860
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 11:07:11 +02:00 |
|
Laurent Destailleur
|
7931f0b422
|
Fix sql error
|
2019-07-29 11:06:39 +02:00 |
|
Laurent Destailleur
|
a5e3adc6f1
|
Fix travis
|
2019-07-29 10:51:17 +02:00 |
|
Laurent Destailleur
|
db461792a0
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 01:36:35 +02:00 |
|
Laurent Destailleur
|
9a7113f4f5
|
FIX Update the file index table when we validate/rename a ref.
|
2019-07-28 22:26:55 +02:00 |
|
Laurent Destailleur
|
9f7d118f6f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-27 02:40:56 +02:00 |
|
Laurent Destailleur
|
2867e31a63
|
Fix CSS
|
2019-07-27 01:13:39 +02:00 |
|
Laurent Destailleur
|
bef3423764
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-07-22 19:12:27 +02:00 |
|
Laurent Destailleur
|
9f95b10d0e
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/list.php
htdocs/comm/action/peruser.php
htdocs/compta/prelevement/card.php
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
|
2019-07-22 19:11:27 +02:00 |
|
Laurent Destailleur
|
f39f710fd9
|
Merge pull request #11538 from atm-maxime/fix_agenda_list_filter
Fix lost filter in action list
|
2019-07-22 18:44:22 +02:00 |
|
Maxime Kohlhaas
|
7ec8b48b18
|
Fix lost filter in action list
|
2019-07-21 22:21:11 +02:00 |
|
florian HENRY
|
b046bcc197
|
fix warning php
|
2019-07-20 15:19:25 +02:00 |
|
florian HENRY
|
d03d79222e
|
fix warning php
|
2019-07-20 15:15:48 +02:00 |
|
florian HENRY
|
d88fec52bf
|
fix warining message
|
2019-07-20 15:07:59 +02:00 |
|
Laurent Destailleur
|
865ebb9de2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2019-07-20 13:29:10 +02:00 |
|
Laurent Destailleur
|
e5c3945ec3
|
FIX delete of links between objects
|
2019-07-19 18:10:45 +02:00 |
|
Regis Houssin
|
cbda42d146
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-07-19 09:37:34 +02:00 |
|
Laurent Destailleur
|
fc31a1182b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-18 18:54:50 +02:00 |
|
Laurent Destailleur
|
58428cefc0
|
Fix phpcs
|
2019-07-18 18:53:51 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
3cffd70ed3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
|
2019-07-18 18:09:37 +02:00 |
|
Laurent Destailleur
|
a20a121558
|
Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned
FIX: socpeople assigned list in action com list
|
2019-07-18 17:20:41 +02:00 |
|
John Botella
|
b5d348356d
|
Fix socpeople assigned list in action com list
|
2019-07-17 16:49:41 +02:00 |
|
Marc de Lima Lucio
|
464bda996c
|
FIX: propal createFrom hook: undefined parameter attached
|
2019-07-16 13:59:00 +02:00 |
|
Laurent Destailleur
|
0a7d70829f
|
Translation of some comments
|
2019-07-05 21:37:25 +02:00 |
|
Laurent Destailleur
|
2fee41f712
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-04 12:27:00 +02:00 |
|
Laurent Destailleur
|
8e3620fce1
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
|
2019-07-04 12:26:17 +02:00 |
|
Laurent Destailleur
|
ee0a65e7fa
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/comm/action/card.php
|
2019-07-04 12:22:40 +02:00 |
|
Ferran Marcet
|
433835860c
|
FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized
|
2019-07-03 13:12:41 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
ptibogxiv
|
7f11077f1e
|
Update propal.class.php
|
2019-06-25 18:16:11 +02:00 |
|
ptibogxiv
|
df0d540ffb
|
Update propal.class.php
|
2019-06-25 15:47:16 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
Laurent Destailleur
|
5675e7c50e
|
Clean code of deprecated method
|
2019-06-22 18:19:40 +02:00 |
|
Laurent Destailleur
|
403d41ec30
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 11:55:33 +02:00 |
|
Laurent Destailleur
|
18348fea93
|
Fix sort on date on agenda list
|
2019-06-22 11:34:16 +02:00 |
|
Laurent Destailleur
|
a264a4766a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 03:45:04 +02:00 |
|
Laurent Destailleur
|
e99cf13ccf
|
Merge pull request #11225 from ATM-Nicolas/new_propal_list_column
NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
|
2019-06-20 03:27:45 +02:00 |
|
Nicolas ZABOURI
|
2e4db8c83c
|
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
|
2019-06-19 08:39:05 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
Frédéric FRANCE
|
f1d64ad164
|
Update peruser.php
|
2019-06-17 23:02:54 +02:00 |
|
Laurent Destailleur
|
a74eaaff4d
|
Fix sort of linked elements
|
2019-06-17 15:54:54 +02:00 |
|
Regis Houssin
|
6597c9f60d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-17 06:45:08 +02:00 |
|
Laurent Destailleur
|
e8b139d1c6
|
Fix repeated logs and fetch
|
2019-06-13 22:48:31 +02:00 |
|
Laurent Destailleur
|
900e860f6d
|
Fix list of events for BOM module
|
2019-06-12 19:32:29 +02:00 |
|
Laurent Destailleur
|
2be5e9615d
|
Fix look and field v10
|
2019-06-12 19:03:22 +02:00 |
|
Laurent Destailleur
|
330842d67e
|
Update list.php
|
2019-06-12 13:14:44 +02:00 |
|
Laurent Destailleur
|
f6d8b46b40
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
|
2019-06-07 22:58:58 +02:00 |
|
Frédéric FRANCE
|
ad95b66842
|
Warning: A non-numeric value encountered
|
2019-06-06 10:12:01 +02:00 |
|
Laurent Destailleur
|
21a1e0d7b3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
|
2019-06-04 19:03:27 +02:00 |
|
Laurent Destailleur
|
ba68e3d7ff
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/website/class/website.class.php
|
2019-06-04 18:47:22 +02:00 |
|
Laurent Destailleur
|
36df2f1026
|
Fix css
|
2019-06-04 18:45:01 +02:00 |
|
Laurent Destailleur
|
7b3242693b
|
FIX default value for duration of validity can be set from generic
feature.
|
2019-06-04 18:17:07 +02:00 |
|
Regis Houssin
|
fc83585574
|
FIX use setEntity() to move code in multicompany module
|
2019-06-03 11:37:04 +02:00 |
|
Regis Houssin
|
7b8b1a9052
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-03 11:04:28 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Maxime Kohlhaas
|
6dd01e86e9
|
Fix : avoid warning and uniformize var use
|
2019-05-31 15:53:23 +02:00 |
|
Frédéric FRANCE
|
48d15032af
|
Update linkedobjectblock.tpl.php
|
2019-05-29 11:28:07 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
15de8a9497
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/mailing/card.php
|
2019-05-27 19:25:53 +02:00 |
|
Laurent Destailleur
|
1c6ddd25c4
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-05-27 19:23:54 +02:00 |
|