Laurent Destailleur
|
8bab245c7e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
|
2020-03-18 18:50:55 +01:00 |
|
Laurent Destailleur
|
8192e9dc67
|
FIX Missing token in form
|
2020-03-14 03:02:49 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
f413ce6aac
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-12 11:45:44 +00:00 |
|
Laurent Destailleur
|
e1c7222172
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-09 20:39:05 +01:00 |
|
Laurent Destailleur
|
b1bb7de2fb
|
FIX CSRF error when creating an intervention
|
2020-03-09 20:19:28 +01:00 |
|
Laurent Destailleur
|
054ffb7547
|
Depreciate variables not used by Dolibarr.
|
2020-03-06 14:38:06 +01:00 |
|
Laurent Destailleur
|
ad9d0a3472
|
Fix graph of product distribution when too much record
|
2020-03-06 12:45:02 +01:00 |
|
Laurent Destailleur
|
0bd2740779
|
NEW Can force position of legend of graph on right (instead of top)
|
2020-03-05 17:23:19 +01:00 |
|
Laurent Destailleur
|
fc31680bd0
|
Several fix for chart.js graphs
|
2020-03-05 02:55:06 +01:00 |
|
Freddi
|
96bbba0301
|
Update fichinter.class.php
adding ",'showoncombobox'=>1" for a better View
|
2020-03-04 10:20:28 +01:00 |
|
stickler-ci
|
e2f749b5ee
|
Fixing style errors.
|
2020-03-04 09:10:29 +00:00 |
|
Freddi
|
b4ef25df71
|
Update fichinter.class.php
|
2020-03-04 10:09:48 +01:00 |
|
stickler-ci
|
47d632a394
|
Fixing style errors.
|
2020-03-04 09:05:20 +00:00 |
|
Freddi
|
f17763f400
|
Update fichinter.class.php
|
2020-03-04 10:02:02 +01:00 |
|
Laurent Destailleur
|
7866f89585
|
Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 23:09:02 +01:00 |
|
atm-quentin
|
9446138951
|
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 12:07:18 +01:00 |
|
Laurent Destailleur
|
504f8fa2e4
|
Fix loop on not countable object
|
2020-02-24 23:14:15 +01:00 |
|
Laurent Destailleur
|
457d0668c8
|
Look and feel v12
|
2020-02-24 05:23:34 +01:00 |
|
Laurent Destailleur
|
1dd5ba093d
|
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
|
2020-02-19 12:11:16 +01:00 |
|
Laurent Destailleur
|
c2ef63f35c
|
NEW Close #13011 Add button create thirdparty when creating intervention
|
2020-02-13 11:57:13 +01:00 |
|
Laurent Destailleur
|
c2830f9e79
|
FIX Look and feel v11
|
2020-02-08 18:18:41 +01:00 |
|
Laurent Destailleur
|
3a9e238dc6
|
FIX Missing value of $formconfirm as parameters of hook
|
2020-01-28 12:00:27 +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 |
|
Laurent Destailleur
|
835d22f556
|
Merge branch 'develop' into doxygen_todo
|
2019-12-14 13:46:40 +01:00 |
|
Frédéric FRANCE
|
e4a7ae2ea0
|
The variable xxx seems to be never defined
|
2019-12-12 20:25:36 +01:00 |
|
Frédéric FRANCE
|
12f84d8254
|
doxygen
|
2019-12-11 23:04:27 +01:00 |
|
Laurent Destailleur
|
92070fa491
|
Fix name of variable $trigger_name into $triggersendname
|
2019-12-02 09:38:16 +01:00 |
|
Laurent Destailleur
|
fb70893229
|
Fix missing class reposition
|
2019-11-19 21:29:49 +01:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +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 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Scrutinizer Auto-Fixer
|
c85e54b08c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-12 08:46:08 +00:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
Frédéric FRANCE
|
4f9e995163
|
Update index.php
|
2019-11-05 08:17:57 +01:00 |
|
Laurent Destailleur
|
11500fb8d9
|
FIX confusion between permto... and permisstionto...
|
2019-11-04 15:33:49 +01:00 |
|
Laurent Destailleur
|
b873541c24
|
Load foreign key id into lines
|
2019-11-02 14:32:25 +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
|
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 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
stickler-ci
|
ed9a136211
|
Fixing style errors.
|
2019-10-30 08:58:19 +00:00 |
|
Philippe GRAND
|
af288e1fc6
|
add comment
|
2019-10-30 09:53:12 +01:00 |
|
Frédéric FRANCE
|
8f6d38ee82
|
clean indent
|
2019-10-27 17:01:23 +01:00 |
|
Laurent Destailleur
|
1c1334effe
|
Use dolGetStatus
|
2019-10-24 16:10:00 +02:00 |
|
Laurent Destailleur
|
f438325980
|
Look and feelv
|
2019-10-24 15:57:48 +02:00 |
|
Laurent Destailleur
|
b88968520b
|
Move code of extrafields to the new architecture
|
2019-10-22 17:08:37 +02:00 |
|
Laurent Destailleur
|
5ad7ca5620
|
Code more generic around setting projet on a card
|
2019-10-22 13:43:24 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
e07e01580d
|
Replace deprecated code with new one
|
2019-10-16 03:34:32 +02:00 |
|
Laurent Destailleur
|
43a70e5548
|
Clean code to use the new $extrafields->attributes array
|
2019-10-08 09:28:50 +02:00 |
|
Laurent Destailleur
|
8de5e6898d
|
Merge pull request #12032 from frederic34/ficheinter_rec
duration of fichinter rec
|
2019-10-07 13:04:34 +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
|
ee42cd000e
|
duration of fichinter rec
|
2019-10-03 19:07:26 +02:00 |
|
Frédéric FRANCE
|
723b88f618
|
retrieve duration of lines
|
2019-10-02 22:41:14 +02:00 |
|
Frédéric FRANCE
|
9607bb145c
|
wip
|
2019-10-02 17:53:52 +02:00 |
|
Frédéric FRANCE
|
a1107bdcfa
|
Update fichinterrec.class.php
|
2019-10-02 09:11:46 +02:00 |
|
Frédéric FRANCE
|
802236f583
|
db escape
|
2019-10-02 08:31:46 +02:00 |
|
Frédéric FRANCE
|
13eb76a5b7
|
db escape
|
2019-10-02 08:18:36 +02:00 |
|
Frédéric FRANCE
|
27cc92f6ca
|
replace some text
|
2019-10-02 08:10:21 +02:00 |
|
Frédéric FRANCE
|
f928bacfb9
|
db escape
|
2019-10-02 08:05:20 +02:00 |
|
Frédéric FRANCE
|
79846b8cdf
|
db escape
|
2019-10-02 08:02:03 +02:00 |
|
Frédéric FRANCE
|
16693e08b3
|
can create but some infos missing
|
2019-10-02 00:23:36 +02:00 |
|
Frédéric FRANCE
|
45bc7e2ca4
|
can create but some infos missing
|
2019-10-02 00:20:45 +02:00 |
|
Frédéric FRANCE
|
50a8c6e103
|
wip
|
2019-10-02 00:06:22 +02:00 |
|
Frédéric FRANCE
|
e7bf146f2c
|
wip
|
2019-10-01 23:55:02 +02:00 |
|
stickler-ci
|
ea84d9fc14
|
Fixing style errors.
|
2019-10-01 21:48:27 +00:00 |
|
Frédéric FRANCE
|
edf559697a
|
restore unfinished old commit
|
2019-10-01 23:47:45 +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 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +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
|
529dd05226
|
Replace deprecated code
|
2019-09-06 10:53:05 +02:00 |
|
Jean Traullé
|
c32c7d48ba
|
Fix Wrongly catched examples by Doxygen
|
2019-08-30 17:14:59 +02:00 |
|
Laurent Destailleur
|
bb4618e2cf
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
|
2019-08-14 04:12:37 +02:00 |
|
Laurent Destailleur
|
53b43eb98a
|
Fix error message
|
2019-08-13 19:34:21 +02:00 |
|
Laurent Destailleur
|
b443b1b372
|
FIX permission check on API intervention
|
2019-08-13 14:21:43 +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
|
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 |
|
Laurent Destailleur
|
f745d01bf3
|
Prepare change of properties "titre" into "title"
|
2019-07-19 13:22:54 +02:00 |
|
Laurent Destailleur
|
f5cc29417d
|
Translation lignes -> lines
|
2019-07-05 21:50:35 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
Laurent Destailleur
|
1bce2f085e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-25 14:32:03 +02:00 |
|
Laurent Destailleur
|
2f7e9aa363
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
|
2019-06-25 13:24:45 +02:00 |
|
Laurent Destailleur
|
c9883eecd2
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/fichinter/list.php
|
2019-06-25 13:23:19 +02:00 |
|
Laurent Destailleur
|
144f2a5159
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fichinter/list.php
|
2019-06-25 13:15:57 +02:00 |
|
Ferran Marcet
|
7f127989b2
|
FIX: Not showing Contract and Project columns on ficheinter list
|
2019-06-25 09:55:34 +02:00 |
|
Laurent Destailleur
|
5675e7c50e
|
Clean code of deprecated method
|
2019-06-22 18:19:40 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
Laurent Destailleur
|
d8259d9db1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fichinter/card.php
|
2019-06-07 22:59:59 +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 |
|
Laurent Destailleur
|
0a903da5dc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
|
2019-06-07 22:53:30 +02:00 |
|
atm-josselin
|
c8ab7dee45
|
Display the intervention button only in develop mode
|
2019-06-06 16:34:44 +02:00 |
|
Laurent Destailleur
|
7d2cedfdcf
|
Debug bom module
|
2019-06-03 19:29:49 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
22e897b1a1
|
Clean and prepare code to fix a SQL injection
|
2019-05-21 17:22:38 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +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 |
|
Laurent Destailleur
|
3def11d5c9
|
Standardize translation
|
2019-05-10 19:32:46 +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 |
|
ATM john
|
07e6ce5460
|
Appli function to links
|
2019-04-15 21:33:31 +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
|
fff9b7db9d
|
Fix doxygen
|
2019-04-04 18:33:12 +02:00 |
|
Laurent Destailleur
|
379f9f2d53
|
Fix phpcs
|
2019-04-02 20:36:00 +02:00 |
|
Laurent Destailleur
|
42fda54edf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/card.php
htdocs/fichinter/list.php
htdocs/product/stock/replenish.php
|
2019-04-02 19:41:58 +02:00 |
|
Laurent Destailleur
|
24fef25fd8
|
Update list.php
|
2019-03-31 19:07:25 +02:00 |
|
Laurent Destailleur
|
b3f81d2c1a
|
Update list.php
|
2019-03-31 19:06:44 +02:00 |
|
Laurent Destailleur
|
48ce60dd17
|
Update list.php
|
2019-03-31 19:04:28 +02:00 |
|
Lionel VESSILLER
|
59c41105a2
|
Fix project and contract fields in fichinter list
|
2019-03-29 17:03:23 +01:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Laurent Destailleur
|
ee4150665e
|
Fix phpcs
|
2019-03-21 20:15:19 +01:00 |
|
Laurent Destailleur
|
5693fbfe97
|
Merge pull request #10898 from grandoc/new_branch_21_03_2019
add some comments
|
2019-03-21 18:29:11 +01:00 |
|
Laurent Destailleur
|
90df30e412
|
NEW Add trigget FICHINTER_UNVALIDATE
Standardize code of setDraft.
|
2019-03-21 17:37:56 +01:00 |
|
Philippe GRAND
|
c906820a51
|
add some comments
|
2019-03-21 15:08:09 +01:00 |
|
Laurent Destailleur
|
a2d6723ff3
|
WIP Link files to expense report lines
|
2019-03-15 15:07:52 +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 |
|
Joan Louis
|
f326c75be7
|
Update call to extrafields from cards
|
2019-03-11 21:34:16 +01:00 |
|
Joan Louis
|
ee5753819e
|
Update call to extrafields from cards
|
2019-03-11 14:22:04 +01:00 |
|
Laurent Destailleur
|
3716834b0a
|
Fix bad var name
|
2019-03-09 01:13:15 +01:00 |
|
Frédéric FRANCE
|
f9e671d8a9
|
replace html by html5 in fichinter
|
2019-03-07 21:29:15 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Frédéric FRANCE
|
bd2e541fd6
|
add visibility
|
2019-03-01 18:28:51 +01:00 |
|
Laurent Destailleur
|
b3fb0eaf5b
|
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-27 15:48:31 +01:00 |
|
Laurent Destailleur
|
2448d1deaa
|
fk_projet -> fk_project
|
2019-02-27 15:32:18 +01:00 |
|
Frédéric FRANCE
|
81f2f99db5
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-26 21:16:01 +01:00 |
|
Laurent Destailleur
|
3ec2338c2d
|
Look and feel v10
|
2019-02-26 19:37:32 +01:00 |
|
Frédéric FRANCE
|
346d1f410c
|
wip
|
2019-02-25 23:15:48 +01:00 |
|
Frédéric FRANCE
|
1c07006015
|
wip
|
2019-02-25 21:36:27 +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 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
96de1b175c
|
clean missing spaces in the last merge
|
2019-02-02 08:51:30 +01:00 |
|
Frédéric FRANCE
|
bd8d81a96e
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-02 07:49:41 +01:00 |
|
Laurent Destailleur
|
2e5382f40d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:39:27 +01:00 |
|
Laurent Destailleur
|
c313ad6195
|
Fix phpcs
|
2019-02-01 18:19:39 +01:00 |
|
Laurent Destailleur
|
9d03f4b228
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:17:02 +01:00 |
|
Laurent Destailleur
|
a2ab6348ed
|
Fix bad menu leading on a development page
|
2019-02-01 17:06:34 +01:00 |
|
Laurent Destailleur
|
b83ff06db8
|
FIX #10416 No need of another option
|
2019-02-01 17:00:04 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +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
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +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
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +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
|
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
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
Philippe GRAND
|
3d695362ec
|
update with html5 compliant code
|
2019-01-19 12:44:26 +01:00 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +01:00 |
|
Philippe GRAND
|
31a83701ba
|
Fix translation
|
2019-01-16 13:44:49 +01:00 |
|
Philippe GRAND
|
2aa04e7f9c
|
Clean code and fix translation file
|
2019-01-16 13:28:13 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Laurent Destailleur
|
83efdee7d3
|
Merge branch 'develop' into new_mass_generate
|
2018-12-14 15:44:46 +01:00 |
|
Abbes Bahfir
|
1a8882198e
|
fix: Accss to global $conf needed
|
2018-11-27 18:22:12 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent Destailleur
|
9d15f83f4c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-11-08 20:19:45 +01:00 |
|
Laurent Destailleur
|
3e844db74f
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fichinter/stats/index.php
|
2018-11-08 20:19:28 +01:00 |
|
Laurent Destailleur
|
8a89da25c6
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/margin/tabs/thirdpartyMargins.php
|
2018-11-08 20:18:13 +01:00 |
|
Laurent Destailleur
|
9012f6ecc5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-08 20:14:40 +01:00 |
|
Frédéric FRANCE
|
8bb1545ed0
|
Update index.php
|
2018-11-08 12:16:05 +01:00 |
|
Frédéric FRANCE
|
670eed1e68
|
Update index.php
|
2018-11-08 12:13:07 +01:00 |
|
Philippe GRAND
|
f6394e4210
|
fix : error 500
|
2018-11-07 15:07:57 +01:00 |
|
Philippe GRAND
|
671b4dc227
|
fix : missing translation
|
2018-11-07 14:01:49 +01:00 |
|
Laurent Destailleur
|
66ffcf287a
|
Fix filter on extrafields
|
2018-11-07 12:49:17 +01:00 |
|
Laurent Destailleur
|
4a25317f10
|
Fix security on GETPOST('action'). Param must be sanitized.
|
2018-11-05 20:29:07 +01:00 |
|
Laurent Destailleur
|
c0f4ec5a3e
|
FIX sanitize param $action
|
2018-11-05 17:53:31 +01:00 |
|
Frédéric FRANCE
|
d6b909a280
|
Update index.php
|
2018-11-03 18:26:11 +01:00 |
|
Frédéric FRANCE
|
8ab53012b7
|
mode is only customer in stats fichinter
|
2018-11-03 18:20:36 +01:00 |
|
Laurent Destailleur
|
3d16b05fdb
|
Fix fetch
|
2018-10-30 21:30:44 +01:00 |
|
Regis Houssin
|
9589f69574
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
|
2018-10-30 18:29:28 +01:00 |
|
Frédéric FRANCE
|
5ad03fcd35
|
use strict compare
|
2018-10-27 21:19:19 +02:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
852b069785
|
Fix reponsive in stats pages
|
2018-10-26 15:46:17 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Maxime Kohlhaas
|
d4d921b1cc
|
Add massaction generate on main lists
|
2018-10-14 16:27:59 +02:00 |
|
Philippe GRAND
|
d98ebbd9ee
|
Standardize and update code
|
2018-10-13 10:39:27 +02:00 |
|
Philippe GRAND
|
9b6367c1ee
|
Standardize and update code
|
2018-10-10 12:16:20 +02:00 |
|
Laurent Destailleur
|
b93ab79679
|
FIX Error messages
|
2018-09-25 00:39:28 +02:00 |
|
Philippe GRAND
|
8efe98b993
|
Standardize and update code
|
2018-09-16 11:31:54 +02:00 |
|
Philippe GRAND
|
90644222d8
|
Standardize and update code
|
2018-09-16 11:30:06 +02:00 |
|
Frédéric FRANCE
|
987fdbe73c
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 21:29:41 +02:00 |
|
Frédéric FRANCE
|
f02b2f0239
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-09 13:35:58 +02:00 |
|
Frédéric FRANCE
|
a3fa13994b
|
replace select_date
|
2018-09-09 09:36:12 +02:00 |
|
Frédéric FRANCE
|
4a7ea33008
|
replace select_date
|
2018-09-09 08:02:26 +02:00 |
|
Frédéric FRANCE
|
80880d8fb9
|
replace select_date by selectDate
|
2018-09-08 13:00:39 +02:00 |
|
Frédéric FRANCE
|
2b62c4ca8f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-08 10:50:27 +02:00 |
|
Philippe GRAND
|
11d75573be
|
Standardize and update code
|
2018-09-05 12:21:13 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Frédéric FRANCE
|
489074af5c
|
move phpcs:ignore
|
2018-09-02 23:25:10 +02:00 |
|
Philippe GRAND
|
3de16a145e
|
Standardize and update code
|
2018-09-02 11:08:41 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Philippe GRAND
|
45cbc36a15
|
Standardize and update code
|
2018-09-01 15:27:55 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
Philippe GRAND
|
1944ef0dc3
|
conflict resolution
|
2018-09-01 12:38:22 +02:00 |
|
Philippe GRAND
|
3a8bde227b
|
Standardize and update code
|
2018-08-31 19:26:08 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Laurent Destailleur
|
9a14611d55
|
Merge pull request #8996 from grandoc/new_branch_20_06_2018
clean and update code
|
2018-08-28 02:35:59 +02:00 |
|
Laurent Destailleur
|
7219bac0b2
|
Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
|
2018-08-28 02:30:02 +02:00 |
|
Philippe GRAND
|
87067b2bc9
|
Standardize and update code
|
2018-08-23 18:35:45 +02:00 |
|
Philippe Grand
|
f98d2078e2
|
Merge branch 'develop' into new_branch_20_06_2018
|
2018-08-23 10:41:34 +02:00 |
|
Philippe GRAND
|
06da7f54a2
|
Update and standardize code
|
2018-08-22 18:48:53 +02:00 |
|
Philippe GRAND
|
a36061079b
|
Update and standardize code
|
2018-08-22 11:11:59 +02:00 |
|
Philippe GRAND
|
a669830427
|
Update and standardize code
|
2018-08-22 10:37:16 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Frédéric FRANCE
|
aba69b94b2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 14:03:02 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
85eed6cf80
|
Merge branch 'develop' into trimtrailing
|
2018-08-21 13:40:04 +02:00 |
|
Laurent Destailleur
|
0f1e5a78c6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-21 13:17:11 +02:00 |
|
Frédéric FRANCE
|
fb3754af59
|
Update fichinter.class.php
|
2018-08-21 12:54:25 +02:00 |
|
Frédéric FRANCE
|
69a7af88e7
|
function declaration
|
2018-08-15 18:14:02 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Frédéric FRANCE
|
82e8efe792
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-12 20:14:14 +02:00 |
|
Laurent Destailleur
|
9fc5d39d07
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:36 +02:00 |
|
Laurent Destailleur
|
dc8c4402ee
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:22 +02:00 |
|
Frédéric FRANCE
|
6f74ecceaf
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-12 18:21:59 +02:00 |
|
Laurent Destailleur
|
12e21b4886
|
FIX update extrafields
|
2018-08-12 16:29:26 +02:00 |
|
Frédéric FRANCE
|
9025c452ef
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-07 16:40:03 +02:00 |
|
Philippe GRAND
|
948647f3f9
|
comment translation
|
2018-08-04 14:17:51 +02:00 |
|
Frédéric FRANCE
|
8312d95174
|
trim trailing
|
2018-07-26 18:22:16 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
Frédéric FRANCE
|
53469ee424
|
Update card-rec.php
|
2018-07-25 11:45:52 +02:00 |
|
Frédéric FRANCE
|
c7ad6c9a7c
|
Update card-rec.php
|
2018-07-25 10:04:44 +02:00 |
|
Regis Houssin
|
598f90486f
|
Fix: syntax error (Travis)
|
2018-06-30 17:05:34 +02:00 |
|
Laurent Destailleur
|
982a1ffbaf
|
NEW Automatic position of scroll when creating an extrafield
|
2018-06-30 14:22:05 +02:00 |
|
Laurent Destailleur
|
3112244529
|
Merge pull request #8884 from defrance/patch-117
New : fichinter models (like factureRec)
|
2018-06-30 01:19:03 +02:00 |
|
Philippe GRAND
|
1bb91c7860
|
update and clean code
|
2018-06-24 16:20:27 +02:00 |
|
Laurent Destailleur
|
27a27e02a1
|
Fix css
|
2018-06-22 22:53:53 +02:00 |
|
Philippe GRAND
|
4f554ab52a
|
clean and update code
|
2018-06-20 12:09:47 +02:00 |
|
Laurent Destailleur
|
ad2df304b4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/fourn/commande/card.php
htdocs/societe/class/societe.class.php
|
2018-06-18 13:31:29 +02:00 |
|
Inovea Conseil
|
d5a3e63e05
|
Fix missing paramater for generateDocument
|
2018-06-15 09:47:28 +02:00 |
|
Laurent Destailleur
|
910652eb6d
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
|
2018-06-13 23:07:30 +02:00 |
|
Laurent Destailleur
|
4a5fd35e11
|
Look and feel v8
|
2018-06-13 22:57:41 +02:00 |
|
Marc de Lima Lucio
|
d69fae72c7
|
FIX: intervention: extrafield regression in commit b5f37301a5
|
2018-06-07 15:17:22 +02:00 |
|
Laurent Destailleur
|
61946446b2
|
Update fichinter.class.php
|
2018-06-04 13:36:38 +02:00 |
|
BENKE Charlene
|
0ce3b2b431
|
Add Hook on getNomUrl
|
2018-05-30 14:19:30 +02:00 |
|
BENKE Charlene
|
7f8132e971
|
Create card-rec.php
|
2018-05-28 16:46:34 +02:00 |
|
BENKE Charlene
|
991c6d97c0
|
Update card.php
|
2018-05-28 16:44:49 +02:00 |
|
Frédéric FRANCE
|
58e5715ac3
|
loadlangs
|
2018-05-26 17:57:30 +02:00 |
|
BENKE Charlene
|
24d353c9a7
|
inversion of dateo and datee
|
2018-05-18 12:24:44 +02:00 |
|
BENKE Charlene
|
ce40a51bdb
|
inversion of dateo and datee
|
2018-05-10 16:08:45 +02:00 |
|
Laurent Destailleur
|
3374c50e2d
|
CSS
|
2018-05-01 10:42:09 +02:00 |
|
Laurent Destailleur
|
461ae46cc4
|
FIX When on a high page and searching for a small result, list was not
visible.
|
2018-04-24 11:37:57 +02:00 |
|
Laurent Destailleur
|
ac89951acd
|
Merge pull request #8647 from fmarcet/develop
New: Add same parameters on 'printFieldListTitle' hooks
|
2018-04-22 19:35:09 +02:00 |
|
Laurent Destailleur
|
912d5c53f2
|
Standardize code
|
2018-04-21 15:54:05 +02:00 |
|
Laurent Destailleur
|
ccd9aa8059
|
Fight against dolibarr warnings
|
2018-04-21 12:16:12 +02:00 |
|
Ferran Marcet
|
6ced1a3264
|
New: Add same parameters on 'printFieldListTitle' hooks
|
2018-04-20 10:38:16 +02:00 |
|
Laurent Destailleur
|
bbfc4a3e17
|
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
|
2018-04-18 03:26:15 +02:00 |
|
Laurent Destailleur
|
0d0da234b1
|
Lowercase NULL, TRUE, FALSE according to PSR2
|
2018-04-16 13:51:16 +02:00 |
|
Laurent Destailleur
|
8fbde88872
|
Look and feel v8
|
2018-04-15 17:37:49 +02:00 |
|
Laurent Destailleur
|
d4cd5a0d95
|
Fix syntax error
|
2018-04-13 13:37:43 +02:00 |
|
Laurent Destailleur
|
1521b0595b
|
Clean code
|
2018-04-13 11:03:03 +02:00 |
|
All-3kcis
|
880fa55dd5
|
display user-friendly filesize
|
2018-04-12 15:29:22 +02:00 |
|
Laurent Destailleur
|
7108f68db9
|
Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
|
2018-04-10 12:03:01 +02:00 |
|
Laurent Destailleur
|
9d9f3ddf85
|
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
NEW: generalize use of button to create new element from list
|
2018-04-05 16:40:15 +02:00 |
|
Laurent Destailleur
|
43f8834b28
|
Uniformize code with the new module builder framework
|
2018-03-31 18:48:27 +02:00 |
|
Marc de Lima Lucio
|
0366e645d5
|
NEW: generalize button to create object from list, for most of the lists
|
2018-03-30 16:54:38 +02:00 |
|
Laurent Destailleur
|
852191010a
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2018-03-25 15:29:11 +02:00 |
|
Regis Houssin
|
b5f37301a5
|
Fix: uniformize getEntity('intervention')
|
2018-03-22 16:28:00 +01:00 |
|
Laurent Destailleur
|
d4ae0395ed
|
NEW Look and feel v8: Use a different picto for delete and unlink
|
2018-03-18 19:13:42 +01:00 |
|
Laurent Destailleur
|
93f4d6fdcd
|
Translation
|
2018-03-11 21:34:38 +01:00 |
|
Laurent Destailleur
|
04934cc4aa
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
|
2018-02-27 19:18:43 +01:00 |
|
Laurent Destailleur
|
0cc84ab92f
|
FIX Missing restore_lastsearch_values
|
2018-02-26 21:21:28 +01:00 |
|
Laurent Destailleur
|
3c552cec15
|
FIX Missing restore_lastsearch_values
|
2018-02-26 21:16:40 +01:00 |
|
Laurent Destailleur
|
41638e6dff
|
Fix back link of look and feel v7
|
2018-02-26 09:20:05 +01:00 |
|
Laurent Destailleur
|
0a79550f43
|
Fix oldcopy must be saved before update_extras
|
2018-02-23 16:11:00 +01:00 |
|
Laurent Destailleur
|
b4446764f8
|
Clean code of deprecated usage
|
2018-02-21 14:48:25 +01:00 |
|
Laurent Destailleur
|
72c1357c9b
|
NEW Section of files generated by mass action not visible if empty
|
2018-02-21 11:02:45 +01:00 |
|
Laurent Destailleur
|
c4130730cb
|
Clean code around fetch_optionals()
|
2018-02-20 19:38:18 +01:00 |
|
Laurent Destailleur
|
809ef1bd00
|
FIX Trigger *_MODIFY must be called when editing a property event extra.
Clean duplicate trigggers "*_CLONE"
|
2018-02-20 18:09:38 +01:00 |
|
Laurent Destailleur
|
26ee7ec5be
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/errors.lang
|
2018-02-08 17:27:36 +01:00 |
|
Laurent Destailleur
|
d10d9f0fb2
|
Fix scrutinizer
|
2018-02-08 17:22:07 +01:00 |
|
Laurent Destailleur
|
eccdc9a075
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
|
2018-02-08 15:20:24 +01:00 |
|
Laurent Destailleur
|
ab21769aa2
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/compta/facture/card.php
|
2018-02-08 12:58:47 +01:00 |
|
Laurent Destailleur
|
a26bb2d884
|
FIX #8151
|
2018-02-08 12:41:31 +01:00 |
|
Laurent Destailleur
|
bd00b514bf
|
Delete intervention API
|
2018-02-05 20:19:00 +01:00 |
|
Laurent Destailleur
|
c6fba7273d
|
Api interventions
|
2018-02-03 20:58:26 +01:00 |
|
Laurent Destailleur
|
936a2ca966
|
Merge branch '7.0' into add-api-for-fichinter
|
2018-02-03 19:57:04 +01:00 |
|
Laurent Destailleur
|
f57ea2682a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/notify.class.php
htdocs/societe/class/societe.class.php
|
2018-02-03 19:33:24 +01:00 |
|
Laurent Destailleur
|
d6317a26d2
|
Fix for multicompany
|
2018-01-30 15:48:09 +01:00 |
|
kadogo
|
ba58578d60
|
FIX: Global on $user parameter reset the variable
When we use the fichinter API with global, the $user object is reset
If global is not applied on $user we can retrieve the informations from it
|
2018-01-27 19:31:48 +01:00 |
|
kadogo
|
b48bcc9ab8
|
NEW: Add an API for fichinter
We missed an API for fichinter
It add list, create and create line functions
|
2018-01-27 19:25:18 +01:00 |
|
Jan Giebels
|
9642206bd1
|
Fix label generation for fichinter card generation from order. Labels get concatenated.
|
2018-01-19 12:21:42 +01:00 |
|
Laurent Destailleur
|
90ddfc3f7f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/translation.php
|
2018-01-11 01:14:20 +01:00 |
|
Ferran Marcet
|
d99535d9da
|
Fix: Still using property ->client instead of ->thirdparty.
|
2018-01-10 16:40:43 +01:00 |
|
Laurent Destailleur
|
6676178435
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
|
2017-12-28 09:56:40 +01:00 |
|
Laurent Destailleur
|
3ac413084f
|
Merge branch '6.0' into 6.0
|
2017-12-28 08:46:22 +01:00 |
|
Ferran Marcet
|
1c7b99d3dc
|
Fix: Missing include for Project class
|
2017-12-26 12:13:35 +01:00 |
|
Laurent Destailleur
|
eab44f62b1
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
|
2017-12-21 14:35:33 +01:00 |
|
Laurent Destailleur
|
6a62e13960
|
FIX security vulnerability reported by ADLab of Venustech
|
2017-12-21 13:32:16 +01:00 |
|
Laurent Destailleur
|
af1028576d
|
Fix on search all (trim search + search from smartphone).
|
2017-12-12 11:31:30 +01:00 |
|
Laurent Destailleur
|
95cb5025a2
|
Fix length of month too large
More complete template
|
2017-12-08 16:15:41 +01:00 |
|
Laurent Destailleur
|
9ed679d19a
|
FIX #7882
|
2017-12-01 17:22:32 +01:00 |
|
florian HENRY
|
94285ae494
|
factorization of extrafeild into list
|
2017-11-27 15:24:29 +01:00 |
|
Laurent Destailleur
|
9c22b5f335
|
Replace deprecated dol_print_graph with DolGraph
|
2017-11-23 20:24:05 +01:00 |
|
Laurent Destailleur
|
f68b2bdeca
|
Use the confirmation when deleting from mass action everywhere.
|
2017-11-15 11:39:11 +01:00 |
|
Laurent Destailleur
|
836f6bf3c9
|
Fix search filter when using extrafields 'links'
|
2017-11-12 12:39:23 +01:00 |
|
Laurent Destailleur
|
d1860b87f8
|
NEW Add a confirmation for all mass action 'delete'
|
2017-11-11 16:34:11 +01:00 |
|
Laurent Destailleur
|
bc093ef969
|
FIX #7775 Order of deletion in delete method (trigger first)
|
2017-11-06 19:27:10 +01:00 |
|
Laurent Destailleur
|
1b28c45e2c
|
PERF Links in getNomUrl use only one tag a instead of 2.
|
2017-11-02 15:19:14 +01:00 |
|
Laurent Destailleur
|
d569218162
|
Fix 'separate' extrafields must be visible by default.
Sandardize name of list pages (must end with _list.php)
|
2017-10-29 11:23:20 +01:00 |
|
Laurent Destailleur
|
9f0f5eb5e8
|
Fix translation of extrafields type
|
2017-10-24 18:05:43 +02:00 |
|
Laurent Destailleur
|
7f85d73001
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
|
2017-10-18 19:51:29 +02:00 |
|
Laurent Destailleur
|
8626d6279a
|
Fix perm to delete files
|
2017-10-18 17:21:30 +02:00 |
|
Laurent Destailleur
|
eb1fdca157
|
NEW Can create intervention from a proposal
|
2017-10-17 10:44:18 +02:00 |
|
Scrutinizer Auto-Fixer
|
165741517e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-13 11:28:26 +00:00 |
|
Laurent Destailleur
|
8c5cf9ea45
|
Fix date output
|
2017-10-12 18:04:47 +02:00 |
|
Laurent Destailleur
|
e40bffb0d5
|
Fix bug reported by scrutinizer
|
2017-10-07 20:21:47 +02:00 |
|
Scrutinizer Auto-Fixer
|
328d39bc71
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-07 11:09:31 +00:00 |
|
Laurent Destailleur
|
801a5180d6
|
Fix scrutinizer bug reports
|
2017-10-06 01:16:19 +02:00 |
|
Laurent Destailleur
|
8e0da9bfeb
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/document.php
|
2017-10-04 13:32:53 +02:00 |
|
Laurent Destailleur
|
9d6498f2a4
|
NEW Search filters in lists are restored when using "back to list"
|
2017-10-03 14:50:52 +02:00 |
|
Laurent Destailleur
|
7c30b3ca5d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-10-02 01:28:20 +02:00 |
|
Laurent Destailleur
|
f007f9e7e5
|
NEW Add new property visible dy default on lists on extrafields
|
2017-09-29 13:26:44 +02:00 |
|
Juanjo Menent
|
93cf135d5e
|
FIX: #7510 Bug: extrafield content disappear when generate pdf within intervention
|
2017-09-28 12:05:41 +02:00 |
|
Laurent Destailleur
|
f1a563625b
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-09-26 22:11:00 +02:00 |
|
Laurent Destailleur
|
04f4a81736
|
FIX #7505
|
2017-09-26 22:06:59 +02:00 |
|
Laurent Destailleur
|
e3da4188e2
|
GETPOST must not clean data for text input.
|
2017-09-25 00:16:52 +02:00 |
|
Laurent Destailleur
|
ab5724e7ff
|
Mutualize code for forms to send emails. Remove thousand line of code.
|
2017-09-17 17:12:14 +02:00 |
|
Laurent Destailleur
|
0873260b8a
|
USe second parameter in GETPOST
|
2017-09-15 10:50:50 +02:00 |
|
Laurent Destailleur
|
149ab80b3a
|
The event array of an object is visible even if no event yet recorded.
|
2017-09-13 14:18:36 +02:00 |
|
Laurent Destailleur
|
a4665e17d4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
|
2017-09-12 13:26:25 +02:00 |
|
Laurent Destailleur
|
e9bc5b719d
|
Complete #7361
|
2017-09-11 14:50:00 +02:00 |
|
reeperbahnause
|
2fdad0f11d
|
fix #7361 missing generateDocument function
fix #7361
Function generateDocument was missing for Class Fichinter
|
2017-09-11 14:46:58 +02:00 |
|
Laurent Destailleur
|
80c00a0ba4
|
Merge pull request #7362 from reeperbahnause/patch-2
fix #7361 missing generateDocument function
|
2017-09-11 14:46:03 +02:00 |
|