Laurent Destailleur
|
c3ad443200
|
Fix var not defined
|
2021-01-21 13:52:23 +01:00 |
|
Frédéric FRANCE
|
3c2bf5d9e9
|
fix trans
Conflicts:
htdocs/core/class/commonobject.class.php
|
2021-01-16 17:18:58 +01:00 |
|
Laurent Destailleur
|
992645c13d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-01-16 16:35:13 +01:00 |
|
Laurent Destailleur
|
871691bf69
|
Fix missing popup
|
2021-01-16 16:34:49 +01:00 |
|
Laurent Destailleur
|
c3046326cb
|
Fix help
|
2021-01-15 12:42:40 +01:00 |
|
Laurent Destailleur
|
c10072ccef
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-01-11 13:07:31 +01:00 |
|
Laurent Destailleur
|
fe7be8362f
|
Fix td balance
|
2021-01-11 12:03:28 +01:00 |
|
Laurent Destailleur
|
3d96c5a454
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/admin/dict.php
htdocs/bom/tpl/objectline_create.tpl.php
htdocs/bom/tpl/objectline_edit.tpl.php
htdocs/bom/tpl/objectline_view.tpl.php
htdocs/core/boxes/box_shipments.php
htdocs/societe/class/societe.class.php
|
2021-01-06 20:20:37 +01:00 |
|
jpb
|
19ee163f31
|
Fix add ticket on elementList
|
2021-01-06 13:54:51 +01:00 |
|
Laurent Destailleur
|
9764f086d3
|
Fix Field code is mandatory but not field note in tax dictionary
|
2021-01-05 14:31:14 +01:00 |
|
Laurent Destailleur
|
f71c581140
|
Merge pull request #15856 from aspangaro/13b5
FIX: Accountancy - Debug experimental function to validate movements & typo
|
2021-01-02 15:53:28 +01:00 |
|
Laurent Destailleur
|
f16be78167
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/admin/limits.php
htdocs/takepos/invoice.php
|
2021-01-02 15:49:30 +01:00 |
|
Laurent Destailleur
|
a8d15fafd2
|
Fix missing span
|
2021-01-02 14:17:54 +01:00 |
|
Laurent Destailleur
|
f328bdc3f9
|
Fix var name
|
2021-01-01 22:05:12 +01:00 |
|
Alexandre SPANGARO
|
46160614b8
|
Typo
|
2020-12-31 03:30:18 +01:00 |
|
Laurent Destailleur
|
e4915d9825
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2020-12-30 22:02:06 +01:00 |
|
Laurent Destailleur
|
40d19e6c36
|
Fix tooltip on timezone
|
2020-12-30 22:01:26 +01:00 |
|
Laurent Destailleur
|
d9a2e2e402
|
Responsive
|
2020-12-29 02:06:42 +01:00 |
|
Laurent Destailleur
|
4b3cd947f2
|
Fix name of function
|
2020-12-28 12:33:00 +01:00 |
|
Laurent Destailleur
|
58cd7c97a5
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/comm/mailing/card.php
htdocs/comm/mailing/cibles.php
htdocs/comm/mailing/class/mailing.class.php
|
2020-12-24 13:05:17 +01:00 |
|
Laurent Destailleur
|
739695c442
|
Fix delay to wait between email for emailing refused float.
|
2020-12-24 12:49:17 +01:00 |
|
Laurent Destailleur
|
4fcf606d04
|
Error management on emailcollector edition
|
2020-12-22 17:22:24 +01:00 |
|
Laurent Destailleur
|
083b6a8c87
|
Fix emailcollector edition
|
2020-12-22 17:03:57 +01:00 |
|
Laurent Destailleur
|
6fad9c2d3b
|
Fix edition of operation into email collector
|
2020-12-22 16:59:59 +01:00 |
|
Laurent Destailleur
|
15c0773de7
|
Merge pull request #15791 from frederic34/patch-8
Remove no more needed file
|
2020-12-21 18:21:51 +01:00 |
|
Laurent Destailleur
|
67de45b8d7
|
Fix responsive
|
2020-12-21 01:40:15 +01:00 |
|
Laurent Destailleur
|
d3bd709ad6
|
Fix phpcs
|
2020-12-20 18:51:17 +01:00 |
|
Frédéric FRANCE
|
92f38f664a
|
Remove no more needed file
|
2020-12-20 10:44:55 +01:00 |
|
Laurent Destailleur
|
0c6ccb64e0
|
Fix links
|
2020-12-19 21:48:29 +01:00 |
|
Laurent Destailleur
|
fcfd657240
|
Fix links
|
2020-12-19 21:41:15 +01:00 |
|
Laurent Destailleur
|
70d1cc79e0
|
Fix link
|
2020-12-19 21:30:56 +01:00 |
|
Laurent Destailleur
|
b41b528f33
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/sms.php
|
2020-12-19 15:28:58 +01:00 |
|
ptibogxiv
|
22b2247442
|
Update sms.php
|
2020-12-19 13:41:49 +01:00 |
|
Laurent Destailleur
|
0eaf924d3b
|
Add warning on non https website to axplain why features is broken
|
2020-12-18 15:08:00 +01:00 |
|
Laurent Destailleur
|
90d8299c92
|
Fix purge tool
|
2020-12-18 13:24:02 +01:00 |
|
Laurent Destailleur
|
3b8947dadd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
|
2020-12-17 21:50:05 +01:00 |
|
Laurent Destailleur
|
f79dec80e6
|
Fix phpcs
|
2020-12-17 16:45:56 +01:00 |
|
Laurent Destailleur
|
b04cc22350
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/admin/prelevement.php
|
2020-12-17 14:10:45 +01:00 |
|
Laurent Destailleur
|
f0d787debb
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-12-17 14:07:24 +01:00 |
|
Laurent Destailleur
|
27542ed8ed
|
Update prelevement.php
|
2020-12-17 13:53:09 +01:00 |
|
Laurent Destailleur
|
36d6b472ce
|
Update prelevement.php
|
2020-12-17 13:52:03 +01:00 |
|
Haldarys
|
10ac74162e
|
Fix PRELEVEMENT_ADDDAYS check
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
|
2020-12-17 10:19:21 +01:00 |
|
Laurent Destailleur
|
9c759e91f0
|
Fix debug management of docs in ticket module
|
2020-12-16 19:01:26 +01:00 |
|
Laurent Destailleur
|
21c2fae00c
|
Fix setup of antivirus
|
2020-12-16 17:41:18 +01:00 |
|
Laurent Destailleur
|
66e4de628c
|
Fix permissions
|
2020-12-14 20:38:22 +01:00 |
|
Laurent Destailleur
|
43bb5554d7
|
Clean deprecated page
|
2020-12-14 12:19:24 +01:00 |
|
Laurent Destailleur
|
acb73966f7
|
Clean code. Removed phpexcel library.
|
2020-12-13 16:27:44 +01:00 |
|
Frédéric FRANCE
|
8aaa1905a0
|
create url from socialid
|
2020-12-12 21:03:27 +01:00 |
|
Frédéric FRANCE
|
758763f489
|
Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks
|
2020-12-12 19:25:15 +01:00 |
|
Frédéric FRANCE
|
6a4990d5bd
|
clean
|
2020-12-12 19:21:40 +01:00 |
|
Laurent Destailleur
|
75570cc984
|
Merge pull request #15743 from frederic34/mycompanysocialnetworks
Mycompany social networks separate tab
|
2020-12-12 19:21:29 +01:00 |
|
Laurent Destailleur
|
a5d2e04dea
|
Debug v13
|
2020-12-12 19:09:07 +01:00 |
|
Laurent Destailleur
|
d19cdae980
|
Merge pull request #15727 from frederic34/patch-8
add option hide topmenu in Config/Display
|
2020-12-12 18:48:11 +01:00 |
|
Frédéric FRANCE
|
818af46b86
|
clean
|
2020-12-12 18:37:09 +01:00 |
|
Frédéric FRANCE
|
b8a01b4d2d
|
my company social networks in a separate tab
|
2020-12-12 18:31:26 +01:00 |
|
Frédéric FRANCE
|
621f246d58
|
my company social networks in a separate tab
|
2020-12-12 18:26:54 +01:00 |
|
Frédéric FRANCE
|
0b3a5dc796
|
fix style
|
2020-12-11 18:09:37 +01:00 |
|
Frédéric FRANCE
|
e9288ce0da
|
fix translation
|
2020-12-11 17:58:43 +01:00 |
|
Frédéric FRANCE
|
8882759e7a
|
hide topmenu option in config/display
|
2020-12-11 17:55:08 +01:00 |
|
Laurent Destailleur
|
1f6f434a9c
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export_files.php
test/phpunit/SecurityTest.php
|
2020-12-11 15:56:19 +01:00 |
|
Laurent Destailleur
|
4fcd3fe493
|
Fix disallow -- string into filename for security purpose. Vulnerability
reported by Yılmaz Değirmenci
|
2020-12-11 15:12:42 +01:00 |
|
Laurent Destailleur
|
2adbd29b49
|
Debug generation of doc from modulebuilder
|
2020-12-11 14:22:36 +01:00 |
|
Laurent Destailleur
|
c2124479c7
|
Fix missing test on IMAP
|
2020-12-10 16:05:43 +01:00 |
|
Laurent Destailleur
|
c850f4c918
|
Fix fatal error
|
2020-12-10 16:01:06 +01:00 |
|
Laurent Destailleur
|
abe8d25a9a
|
Merge pull request #15711 from hregis/fix_regenerate_mycompany_thumbs
FIX regenerate mycompany logos thumbs if not exists
|
2020-12-09 22:06:19 +01:00 |
|
Laurent Destailleur
|
075cacb8cf
|
Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF
|
2020-12-09 17:40:28 +01:00 |
|
Regis Houssin
|
c18e8ac317
|
FIX regenerate mycompany logos thumbs if not exists
|
2020-12-09 09:28:46 +01:00 |
|
Laurent Destailleur
|
6e479af5b6
|
Merge pull request #15661 from frederic34/adminsms
fix trans removing html
|
2020-12-07 22:45:14 +01:00 |
|
Laurent Destailleur
|
ff1e6ec371
|
Merge pull request #15665 from frederic34/admin_boxes
fix style
|
2020-12-07 22:40:51 +01:00 |
|
Laurent Destailleur
|
d9ba821411
|
Merge pull request #15669 from frederic34/template
typo ortho
|
2020-12-07 22:35:45 +01:00 |
|
Laurent Destailleur
|
3fb63e6a4b
|
Look and feel v13
|
2020-12-07 15:51:22 +01:00 |
|
Frédéric FRANCE
|
d1204e5e9b
|
typo ortho
|
2020-12-05 15:35:52 +01:00 |
|
Laurent Destailleur
|
991cfde0a2
|
Fix css
|
2020-12-05 14:46:29 +01:00 |
|
Frédéric FRANCE
|
8996dd9803
|
fix style
|
2020-12-05 10:28:40 +01:00 |
|
Frédéric FRANCE
|
cccc670c05
|
fix trans removing html
|
2020-12-05 08:45:58 +01:00 |
|
Laurent Destailleur
|
bb0c33a49e
|
Merge pull request #15654 from frederic34/commonkanban
keep common if wanted
|
2020-12-04 22:25:51 +01:00 |
|
Frédéric FRANCE
|
4039ca269f
|
fix translation removing html
|
2020-12-04 21:08:51 +01:00 |
|
stickler-ci
|
d89970ddd1
|
Fixing style errors.
|
2020-12-04 19:31:53 +00:00 |
|
Frédéric FRANCE
|
c8407b2f91
|
keep common if wanted
|
2020-12-04 20:28:05 +01:00 |
|
Laurent Destailleur
|
e7306625f0
|
Fix look and feel v13
|
2020-12-04 15:28:12 +01:00 |
|
Laurent Destailleur
|
56d56929ec
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/dolibarr.php
|
2020-12-03 16:39:22 +01:00 |
|
Laurent Destailleur
|
ac29db92cb
|
FIX #15618
|
2020-12-03 16:35:42 +01:00 |
|
Laurent Destailleur
|
1ec3d4cfdf
|
CSS
|
2020-12-03 13:19:35 +01:00 |
|
Laurent Destailleur
|
bfe4eb7309
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/emailcollector_card.php
htdocs/core/modules/modProduct.class.php
|
2020-12-03 11:26:53 +01:00 |
|
Laurent Destailleur
|
b324425db8
|
code comment
|
2020-12-03 11:19:41 +01:00 |
|
Laurent Destailleur
|
0fd865d8af
|
FIX Better error message with IMAP when connection fails
|
2020-12-03 11:16:02 +01:00 |
|
Laurent Destailleur
|
748630eb25
|
FIX Better error message when IMAP connection fails
|
2020-12-03 11:15:06 +01:00 |
|
Laurent Destailleur
|
cf2dd28a21
|
Fix warning when setup not complete.
|
2020-11-30 19:40:53 +01:00 |
|
Laurent Destailleur
|
00ad6df395
|
Fight against $_POST
|
2020-11-30 14:47:07 +01:00 |
|
Laurent Destailleur
|
7634212811
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
|
2020-11-29 21:35:03 +01:00 |
|
Laurent Destailleur
|
150dd71774
|
Look and feel v13
|
2020-11-29 16:02:39 +01:00 |
|
Laurent Destailleur
|
6c65ebef0d
|
Look and feel v13
|
2020-11-29 15:16:53 +01:00 |
|
Laurent Destailleur
|
df17c2f26a
|
Removed dead code generating warning.
CSS
|
2020-11-28 16:48:32 +01:00 |
|
Laurent Destailleur
|
41984f9934
|
Clean code
|
2020-11-28 14:00:35 +01:00 |
|
Laurent Destailleur
|
7e6af6a54f
|
FIX translation not loaded for error message of numbering modules
|
2020-11-28 02:09:27 +01:00 |
|
Frédéric FRANCE
|
12dce9cd75
|
avoid large screen for code
|
2020-11-26 23:53:10 +01:00 |
|
Frédéric FRANCE
|
f03930e55e
|
doxygen
|
2020-11-26 23:49:42 +01:00 |
|
Laurent Destailleur
|
4da4499569
|
FIX Param joinfiles not sanitized
Conflicts:
htdocs/admin/mails_templates.php
|
2020-11-26 23:07:52 +01:00 |
|
Laurent Destailleur
|
4114201da9
|
FIX Param joinfiles not sanitized
|
2020-11-26 23:05:49 +01:00 |
|
Laurent Destailleur
|
61c0c7f0a6
|
Fix GETPOST second param
|
2020-11-26 22:59:05 +01:00 |
|