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 |
|
Laurent Destailleur
|
93c395fe10
|
FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL
|
2019-05-27 19:22:51 +02:00 |
|
Regis Houssin
|
4f2f23f522
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-05-22 08:45:31 +02:00 |
|
Laurent Destailleur
|
45e6c14594
|
Merge pull request #11226 from ATM-Nicolas/fix_icon_with_padding
FIX : Padding on create project icon
|
2019-05-21 22:41:52 +02:00 |
|
Laurent Destailleur
|
a93cbd4320
|
FIX Look and feel v10
|
2019-05-21 21:47:25 +02:00 |
|
Laurent Destailleur
|
c3b9c08219
|
CSS
|
2019-05-21 21:36:48 +02:00 |
|
Laurent Destailleur
|
fdeb12a909
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/mailing/card.php
|
2019-05-21 21:18:40 +02:00 |
|
Laurent Destailleur
|
a7f5f3fb94
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-05-21 21:16:54 +02:00 |
|
Laurent Destailleur
|
dcf77520ea
|
FIX Error management when MAILING_NO_USING_PHPMAIL is set
|
2019-05-21 21:16:06 +02:00 |
|
Laurent Destailleur
|
22e897b1a1
|
Clean and prepare code to fix a SQL injection
|
2019-05-21 17:22:38 +02:00 |
|
Laurent Destailleur
|
eafc35b00f
|
Look and feel v10
|
2019-05-21 13:27:45 +02:00 |
|
Regis Houssin
|
2cf630c213
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-05-20 16:10:47 +02:00 |
|
ATM-Nicolas
|
5def839813
|
FIX : Padding on create project icon
|
2019-05-20 11:56:26 +02:00 |
|
ATM-Nicolas
|
d58603bd1e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column
|
2019-05-20 09:13:37 +02:00 |
|
ATM-Nicolas
|
6be48e6952
|
NEW : Amount HT invoiced column in propal list
|
2019-05-20 08:59:44 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
Laurent Destailleur
|
c6ccb92a51
|
Fix table shown when there is no perm
Fix edit admin status of another admin
|
2019-05-19 01:41:42 +02:00 |
|
florian HENRY
|
ebe37df9db
|
scrunitizer
|
2019-05-18 16:19:44 +02:00 |
|
florian HENRY
|
47ae988b57
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2019-05-18 16:18:22 +02:00 |
|
florian HENRY
|
12a8008107
|
scrunitizer
|
2019-05-18 16:18:14 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
Regis Houssin
|
b73df2698d
|
FIX better compatibility with Multicompany
|
2019-05-12 14:25:41 +02:00 |
|
Laurent Destailleur
|
3def11d5c9
|
Standardize translation
|
2019-05-10 19:32:46 +02:00 |
|
Laurent Destailleur
|
aaeb7dc9d6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/holiday.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/filefunc.inc.php
htdocs/product/list.php
|
2019-05-10 17:45:33 +02:00 |
|
Laurent Destailleur
|
9de0e69456
|
FIX column project into list
|
2019-05-10 15:11:06 +02:00 |
|
Laurent Destailleur
|
22c548e80b
|
Fix sql
|
2019-05-10 14:46:43 +02:00 |
|
Laurent Destailleur
|
5625c94c44
|
Fix missing label on project tooltip
|
2019-05-10 14:40:15 +02:00 |
|
Laurent Destailleur
|
0e8184332e
|
Fix missing label on project tooltip
|
2019-05-10 14:39:05 +02:00 |
|
Laurent Destailleur
|
d8c1c24028
|
Fix syntax error
|
2019-05-09 19:46:10 +02:00 |
|
Laurent Destailleur
|
a5b1de4f6a
|
Fix tab that should not be visible
|
2019-05-09 17:52:55 +02:00 |
|
ATM-Nicolas
|
77d3f22163
|
NEW : Amount invoiced column in propal list
|
2019-05-07 14:39:16 +02:00 |
|
ATM-Nicolas
|
ab3ad77704
|
FIX : Sale representative column didn't increase nbfield variable on proposal list
|
2019-05-03 10:55:51 +02:00 |
|
Laurent Destailleur
|
4f9ea912ab
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/website.inc.php
|
2019-05-02 14:41:56 +02:00 |
|
Laurent Destailleur
|
79754eb326
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/comm/remx.php
|
2019-05-02 14:39:30 +02:00 |
|
Laurent Destailleur
|
90a1181dc5
|
Debug module Ticket
|
2019-05-01 20:41:03 +02:00 |
|
Frédéric FRANCE
|
d9a1c2b235
|
Fix do not delete all discount when splitting
|
2019-04-30 13:54:50 +02:00 |
|
Laurent Destailleur
|
ee5d50b905
|
css
|
2019-04-27 13:25:21 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Abbes Bahfir
|
dccc8b0be3
|
Fix:Same action in both cases
|
2019-04-24 08:48:36 +01:00 |
|
Laurent Destailleur
|
3b04d2fe9b
|
Fix warnings
|
2019-04-23 13:21:17 +02:00 |
|
Laurent Destailleur
|
7f4b09c482
|
Fix warnings
|
2019-04-23 13:20:44 +02:00 |
|
Laurent Destailleur
|
4d92d7731c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
|
2019-04-23 12:32:08 +02:00 |
|
Laurent Destailleur
|
84ec39f043
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-04-23 12:25:53 +02:00 |
|
Laurent Destailleur
|
bf7fcce1b2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-23 12:24:25 +02:00 |
|
florian HENRY
|
f412ce6a9c
|
fix #11023
|
2019-04-17 10:49:39 +02:00 |
|
Laurent Destailleur
|
e6ffaeefe5
|
CSS
|
2019-04-17 10:39:30 +02:00 |
|
Laurent Destailleur
|
212b058f46
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-04-17 01:18:46 +02:00 |
|
Laurent Destailleur
|
b5bf6830e9
|
Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
media added from filemanager in notes are visible by PDFs builder.
|
2019-04-17 01:13:59 +02:00 |
|
Laurent Destailleur
|
5c53044863
|
Merge pull request #11024 from ATM-Marc/FIX_7.0_sort_events
FIX: actioncomm: sort events by date after external calendars and hook
|
2019-04-16 23:28:30 +02:00 |
|
Laurent Destailleur
|
c0defe3965
|
Update index.php
|
2019-04-16 23:27:45 +02:00 |
|
Marc de Lima Lucio
|
1669d497b4
|
FIX: actioncomm: sort events by date after external calendars and hook
|
2019-04-16 17:36:27 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|
ATM john
|
29b31bd7ab
|
New title button first step
|
2019-04-11 00:38:44 +02:00 |
|
Laurent Destailleur
|
d7f980fda0
|
NEW Add picto of deletion on mass action combo lists
|
2019-04-09 01:22:59 +02:00 |
|
Laurent Destailleur
|
7b01e76d2b
|
Fix doxygen
|
2019-04-08 16:04:15 +02:00 |
|
Frédéric FRANCE
|
4d43cd4927
|
Update card.php
|
2019-04-05 14:46:31 +02:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Laurent Destailleur
|
661a984b8e
|
Merge pull request #10880 from altatof/condpay
allow empty value for payment conditions like in orders
|
2019-03-26 20:53:20 +01:00 |
|
Laurent Destailleur
|
a34f4c2806
|
Merge pull request #10909 from IonAgorria/fix-line-dates
FIX: Disallow line start date after end date
|
2019-03-26 19:43:11 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Ion
|
7bfa49b29c
|
FIX: Disallow line start date > end date
|
2019-03-24 14:30:00 +01:00 |
|
Laurent Destailleur
|
28fede950f
|
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
|
2019-03-22 13:00:48 +01:00 |
|
Laurent Destailleur
|
a7181750c6
|
Merge pull request #10879 from altatof/noconcatdesc
NEW : add constant NO_CONCAT_DESCRIPTION
|
2019-03-22 12:56:46 +01:00 |
|
Philippe GRAND
|
62d63e399e
|
translation
|
2019-03-22 09:41:22 +01:00 |
|
Laurent Destailleur
|
48a0c447b4
|
Fix test on draft status regression
|
2019-03-21 21:00:06 +01:00 |
|
Laurent Destailleur
|
930720decd
|
WIP Start to replace use of property ->brouillon
|
2019-03-21 18:13:51 +01:00 |
|
Laurent Destailleur
|
90df30e412
|
NEW Add trigget FICHINTER_UNVALIDATE
Standardize code of setDraft.
|
2019-03-21 17:37:56 +01:00 |
|
Frédéric FRANCE
|
013e536f32
|
Update actioncomm.class.php
|
2019-03-19 12:49:54 +01:00 |
|
Laurent Destailleur
|
b10690ce88
|
Merge pull request #10874 from grandoc/translation
translation
|
2019-03-19 11:14:40 +01:00 |
|
Christophe Battarel
|
bd542b6b22
|
allow empty value for payment conditions like in orders
|
2019-03-18 16:39:59 +01:00 |
|
Christophe Battarel
|
8b3fd2eacf
|
NEW : add constant NO_CONCAT_DESCRIPTION
|
2019-03-18 16:10:17 +01:00 |
|
Philippe GRAND
|
0f03b16313
|
translation
|
2019-03-18 12:46:32 +01:00 |
|
Philippe Grand
|
7942903548
|
Update actioncomm.class.php
|
2019-03-18 12:24:16 +01:00 |
|
Philippe GRAND
|
76a4792cd2
|
Merge remote-tracking branch 'upstream/develop' into new_branch_18_03_2019
|
2019-03-18 12:11:57 +01:00 |
|
Laurent Destailleur
|
de554750e4
|
Merge pull request #10802 from altatof/propindex
Harmonize propal index pages
|
2019-03-18 10:56:10 +01:00 |
|
Laurent Destailleur
|
22d61cd44d
|
Update index.php
|
2019-03-18 10:55:44 +01:00 |
|
Laurent Destailleur
|
7adba419fc
|
Update index.php
|
2019-03-18 10:54:45 +01:00 |
|
Laurent Destailleur
|
d8c1a50291
|
Update index.php
|
2019-03-18 10:53:58 +01:00 |
|
Philippe GRAND
|
198cf4af2f
|
add comments
|
2019-03-18 10:06:22 +01:00 |
|
Laurent Destailleur
|
7cdfff7263
|
Fix syntax error
|
2019-03-15 20:42:49 +01:00 |
|
Laurent Destailleur
|
c0b6699b25
|
All methods set_draft() were renamed into setDraft()
|
2019-03-15 19:01:40 +01:00 |
|
Laurent Destailleur
|
0afbd70c2c
|
Merge pull request #10833 from grandoc/new_branch_14_03_2019
update with html5 compliant code
|
2019-03-14 18:04:06 +01:00 |
|
Laurent Destailleur
|
d4f2a16abf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
|
2019-03-14 17:10:58 +01:00 |
|
Laurent Destailleur
|
cdf6e4b65a
|
Fix some PSR rules
|
2019-03-14 16:43:27 +01:00 |
|
John BOTELLA
|
31e588dbab
|
fix hookmanager global
|
2019-03-14 16:13:32 +01:00 |
|
John BOTELLA
|
8bc795c055
|
Fix missing hook for export agenda
|
2019-03-14 15:19:38 +01:00 |
|
Philippe GRAND
|
43b827aae7
|
update with html5 compliant code
|
2019-03-14 14:07:26 +01:00 |
|
Laurent Destailleur
|
e7cd8d690c
|
Remove warnings
|
2019-03-13 19:06:45 +01:00 |
|
Laurent Destailleur
|
eeafc3c630
|
Standardize translation of amount
|
2019-03-13 14:10:36 +01:00 |
|
Laurent Destailleur
|
98ca9bf17a
|
Reduce quantity of string to translates
|
2019-03-12 19:44:59 +01:00 |
|
Joan Louis
|
17647de4cc
|
Fix extrafields calls from cards for Dolibarr 8 See #10803
|
2019-03-12 11:24:54 +01:00 |
|
Christophe Battarel
|
2726cc335d
|
replace align by css align
|
2019-03-12 10:24:11 +01:00 |
|
Joan Louis
|
f326c75be7
|
Update call to extrafields from cards
|
2019-03-11 21:34:16 +01:00 |
|
Laurent Destailleur
|
e913f1919f
|
Merge pull request #10803 from joanlouis/fix-extrafields-calls-from-cards
Update call to extrafields from cards
|
2019-03-11 21:14:53 +01:00 |
|
Laurent Destailleur
|
abdc2aa21a
|
Fix phpcs
|
2019-03-11 21:03:23 +01:00 |
|
Laurent Destailleur
|
3559d600e2
|
Merge pull request #10770 from atm-john/theme_badge_status
Add badge status css part1
|
2019-03-11 20:49:31 +01:00 |
|
Laurent Destailleur
|
052d29d946
|
Fix phpcs
|
2019-03-11 20:45:28 +01:00 |
|
Laurent Destailleur
|
6daa262779
|
Files for variables of themes were renamed from graph-color.php into
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
|
2019-03-11 20:32:25 +01:00 |
|
John BOTELLA
|
57c6c60118
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-11 14:44:35 +01:00 |
|
Joan Louis
|
ee5753819e
|
Update call to extrafields from cards
|
2019-03-11 14:22:04 +01:00 |
|
Christophe Battarel
|
be612a1f6e
|
harmonize propal index pages
|
2019-03-11 12:58:03 +01:00 |
|
John BOTELLA
|
97544e0aea
|
add new dolGetStatus to LibStatut in common invoice class
|
2019-03-07 15:24:11 +01:00 |
|
Laurent Destailleur
|
a40a08bada
|
Merge pull request #10753 from OPEN-DSI/fix-comm-action-contactid
Fix default contact id for update and clone actions in event card
|
2019-03-07 13:12:22 +01:00 |
|
John BOTELLA
|
5ea5d51247
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-07 09:41:03 +01:00 |
|
Lionel VESSILLER
|
b56cd11f02
|
Fix default contact id for update and clone actions in event card
|
2019-03-06 12:00:55 +01:00 |
|
Frédéric FRANCE
|
2745f98644
|
PSR2.Classes.PropertyDeclaration.VarUsed
|
2019-03-05 22:10:46 +01:00 |
|
Frédéric FRANCE
|
0c2a77cb53
|
Merge remote-tracking branch 'upstream/develop' into patch-2
|
2019-03-05 18:14:15 +01:00 |
|
John BOTELLA
|
72d96d2ac3
|
prepare badges
|
2019-03-05 17:13:20 +01:00 |
|
Laurent Destailleur
|
b851911708
|
Dolibarize module ticket
|
2019-03-05 12:18:46 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Laurent Destailleur
|
66d8b8e7a1
|
Fix phpcs
|
2019-03-02 21:04:44 +01:00 |
|
Laurent Destailleur
|
8fce6e5e31
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
|
2019-03-02 19:13:37 +01:00 |
|
Laurent Destailleur
|
40e923ec85
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/modules/modAgenda.class.php
|
2019-03-02 19:07:14 +01:00 |
|
Laurent Destailleur
|
4f9981063f
|
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
|
2019-03-02 18:26:50 +01:00 |
|
Laurent Destailleur
|
56d921ea52
|
CSS
|
2019-03-02 12:57:07 +01:00 |
|
Frédéric FRANCE
|
014f69850e
|
add visibility
|
2019-03-01 23:08:57 +01:00 |
|
Laurent Destailleur
|
855aaaffd8
|
Better fix for type of discount
|
2019-02-28 11:44:10 +01:00 |
|
florian HENRY
|
4ebf4780c2
|
fix relative discount for prospect and supplier
|
2019-02-28 09:09:06 +01:00 |
|
Frédéric FRANCE
|
9b165f6b3f
|
add visibility
|
2019-02-27 20:45:07 +01:00 |
|
Laurent Destailleur
|
2448d1deaa
|
fk_projet -> fk_project
|
2019-02-27 15:32:18 +01:00 |
|
Laurent Destailleur
|
3ec2338c2d
|
Look and feel v10
|
2019-02-26 19:37:32 +01:00 |
|
Frédéric FRANCE
|
894123fb06
|
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
|
2019-02-24 20:06:55 +01:00 |
|
Regis Houssin
|
36a7303049
|
FIX No space found after comma in function call
|
2019-02-19 10:28:17 +01:00 |
|
Laurent Destailleur
|
e4698fb6a5
|
Merge
|
2019-02-18 19:14:25 +01:00 |
|
Laurent Destailleur
|
75b875ae55
|
Fix origin currency not visible in absolute discount view
|
2019-02-18 17:38:15 +01:00 |
|
Laurent Destailleur
|
7a79637b88
|
Merge pull request #10616 from frederic34/patch-27
Update pertype.php
|
2019-02-15 15:31:03 +01:00 |
|
Frédéric FRANCE
|
c7cec4be34
|
Update peruser.php
|
2019-02-14 21:45:40 +01:00 |
|
Frédéric FRANCE
|
b65532c5d8
|
Update pertype.php
|
2019-02-14 21:43:46 +01:00 |
|
Frédéric FRANCE
|
7886b5900c
|
Update card.php
|
2019-02-14 20:40:03 +01:00 |
|
Laurent Destailleur
|
a7af1b1765
|
Remove deprecated code
|
2019-02-14 16:29:13 +01:00 |
|
ptibogxiv
|
1771ea8eaa
|
Update api_proposals.class.php
|
2019-02-14 00:27:53 +01:00 |
|
ptibogxiv
|
56a0a20bb3
|
Fix delete contact
|
2019-02-14 00:27:29 +01:00 |
|
Laurent Destailleur
|
b9467c10bf
|
Merge pull request #10561 from eoxia-jimmy/develop
NEW: API Proposal, Orders, Invoices: Add contact details
|
2019-02-13 16:39:57 +01:00 |
|
Laurent Destailleur
|
c2ab85aaf8
|
Update api_proposals.class.php
|
2019-02-13 16:39:17 +01:00 |
|
Frédéric FRANCE
|
95212e9cc1
|
Update ical.class.php
|
2019-02-13 00:44:34 +01:00 |
|
Frédéric FRANCE
|
3de192364b
|
Update ical.class.php
|
2019-02-13 00:12:20 +01:00 |
|
Jimmy L
|
a172ea00a4
|
Rest API: Proposal, Orders, Invoices: Add contact details
|
2019-02-12 17:54:59 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
klemens
|
beb2791dde
|
spelling fixes
|
2019-02-10 12:59:09 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Laurent Destailleur
|
0e42e8824b
|
Merge branch 'develop' into new_branch_04_02_2019
|
2019-02-08 09:42:18 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Laurent Destailleur
|
88fb491441
|
Fix note output
|
2019-02-06 00:40:07 +01:00 |
|
Laurent Destailleur
|
58e6cfd635
|
Fix popup content
|
2019-02-06 00:36:11 +01:00 |
|
Philippe GRAND
|
577aef54e1
|
update with html5 compliant code
|
2019-02-04 10:37:51 +01:00 |
|
Philippe GRAND
|
1154f9a048
|
update with html5 compliant code
|
2019-02-04 10:35:53 +01:00 |
|
Philippe GRAND
|
eb25d12a1b
|
update with html5 compliant code
|
2019-02-04 10:32:33 +01:00 |
|
Philippe GRAND
|
7c8d84aa03
|
update with html5 compliant code
|
2019-02-04 10:27:26 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
57f81217ee
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
|
2019-02-03 21:14:44 +01:00 |
|
Laurent Destailleur
|
efe5cd3dd8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-03 21:13:06 +01:00 |
|
Laurent Destailleur
|
72f78ecf3b
|
FIX #10460 compatibility with MariaDB 10.4
|
2019-02-03 20:02:05 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
e309261140
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-03 18:19:58 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Laurent Destailleur
|
ebe30f7a0e
|
FIX error report not returned
|
2019-02-01 19:19:23 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Philippe GRAND
|
1501ce2c9f
|
update with html5 compliant code
|
2019-01-31 13:34:32 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Laurent Destailleur
|
869159c09f
|
Fix regression in look and feel (if empty, we do not sho value)
|
2019-01-30 15:31:39 +01:00 |
|
Laurent Destailleur
|
1a292839ca
|
Fix regression in look and feel (if empty, we do not sho value)
|
2019-01-30 15:31:18 +01:00 |
|
Laurent Destailleur
|
17c3337c9b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-30 15:25:43 +01:00 |
|
Regis Houssin
|
39b696af02
|
FIX multicompany compatibility
|
2019-01-29 12:01:40 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
ff39491f15
|
wip
|
2019-01-27 23:31:37 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
f96d730943
|
Merge pull request #10391 from grandoc/new_branch_22_01_2019
update with html5 compliant code
|
2019-01-26 14:09:15 +01:00 |
|
Laurent Destailleur
|
adb7ec7015
|
Merge pull request #10399 from grandoc/new_branch_23_01_2019
update with html5 compliant code
|
2019-01-26 14:02:26 +01:00 |
|
Laurent Destailleur
|
e42fe4022a
|
Uniformize lenght of small list
|
2019-01-25 15:22:36 +01:00 |
|
Philippe GRAND
|
6625dac8d7
|
update with html5 compliant code
|
2019-01-23 17:28:02 +01:00 |
|
Philippe GRAND
|
34b6f5705e
|
update with html5 compliant code
|
2019-01-22 14:09:14 +01:00 |
|
Philippe GRAND
|
4668052f95
|
update with html5 compliant code
|
2019-01-22 14:04:33 +01:00 |
|
Laurent Destailleur
|
844643c37d
|
Merge pull request #10375 from grandoc/new_branch_19_01_2019
update with html5 compliant code
|
2019-01-20 19:48:32 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
55c90b0578
|
Fix #10359 cloning of proposal
|
2019-01-19 13:17:07 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
Philippe GRAND
|
66e4bc4502
|
update with html5 compliant code
|
2019-01-19 12:27:26 +01:00 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +01:00 |
|
Philippe GRAND
|
bd929c2d1e
|
update with html5 compliant code
|
2019-01-17 14:24:41 +01:00 |
|
atm-quentin
|
013c078c8b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
|
2019-01-16 10:52:46 +01:00 |
|
Marc de Lima Lucio
|
1cfd52e7e2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_actionlist_desc
|
2019-01-09 12:08:55 +01:00 |
|
Marc de Lima Lucio
|
de7dfd3423
|
NEW: actioncomm list: add description column (hidden by default)
|
2019-01-09 11:54:03 +01:00 |
|
Laurent Destailleur
|
d929d93376
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-08 14:19:35 +01:00 |
|
Laurent Destailleur
|
acc665a9f1
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/class/html.form.class.php
|
2019-01-08 14:16:23 +01:00 |
|
Laurent Destailleur
|
1ee0d42408
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-08 14:08:22 +01:00 |
|
Marc de Lima Lucio
|
68802c659e
|
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
|
2019-01-08 11:41:58 +01:00 |
|
ldestailleur
|
bc00fb177a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-02 19:42:15 +01:00 |
|
ldestailleur
|
3af418349a
|
FIX Can't empty the payment mode
|
2018-12-29 07:54:30 +01:00 |
|
ldestailleur
|
c0eef25b31
|
FIX Can set payment mode to empty on thirdparty page
|
2018-12-28 23:14:36 +01:00 |
|
ldestailleur
|
8ad06463e0
|
FIX Can set payment mode to empty on thirdparty page
|
2018-12-28 23:06:04 +01:00 |
|
Laurent Destailleur
|
a445e7597d
|
FIX Popup when having notes of events
|
2018-12-27 06:37:17 +01:00 |
|
Laurent Destailleur
|
fadc9983dc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-27 06:18:03 +01:00 |
|
Laurent Destailleur
|
cd53e22d64
|
FIX Edit description of event
|
2018-12-27 06:16:54 +01:00 |
|
Laurent Destailleur
|
f55db6dd84
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
|
2018-12-15 14:09:16 +01:00 |
|
Laurent Destailleur
|
e069da69ba
|
Revert "Fix screen size fall"
This reverts commit abb6b41f91.
|
2018-12-15 12:35:37 +01:00 |
|