Laurent Destailleur
a8d15fafd2
Fix missing span
2021-01-02 14:17:54 +01:00
Regis Houssin
e36ae4ac90
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-02 13:14:30 +01:00
Laurent Destailleur
5cf43a0aab
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-01 22:05:56 +01:00
Laurent Destailleur
f328bdc3f9
Fix var name
2021-01-01 22:05:12 +01:00
Laurent Destailleur
a8cd62c44e
Add AUDIT_ENABLE_PREFIX_SESSION
2021-01-01 22:00:00 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1
2021-01-01 20:52:43 +01:00
stickler-ci
327ec211c4
Fixing style errors.
2020-12-31 09:49:27 +00:00
Alexandre SPANGARO
46160614b8
Typo
2020-12-31 03:30:18 +01:00
Laurent Destailleur
4768bfe2a5
Merge pull request #15844 from frederic34/adminexpensereport
...
remove deprecated
2020-12-30 23:58:05 +01:00
Laurent Destailleur
020caf8809
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-30 23:52:36 +01:00
Frédéric FRANCE
f5641f8068
remove deprecated
2020-12-30 22:15:34 +01:00
Frédéric FRANCE
786e251961
remove deprecated
2020-12-30 22:13:43 +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
Frédéric FRANCE
02d92d3538
remove deprecated
2020-12-30 21:53:17 +01:00
Regis Houssin
c647c78ee0
FIX restore GETPOSTISSET
2020-12-30 14:02:53 +01:00
Regis Houssin
07dc29166e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2020-12-30 13:56:50 +01:00
Laurent Destailleur
8149478c77
Merge pull request #15308 from aspangaro/14a2
...
NEW: Dictionary for availability - Add column position
2020-12-30 13:12:27 +01:00
Regis Houssin
7c5248d105
FIX and the world turn again
2020-12-30 11:27:03 +01:00
Regis Houssin
aec01a95fc
FIX again and again
2020-12-29 17:48:52 +01:00
Regis Houssin
acabb045fb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2020-12-29 17:12:18 +01:00
Regis Houssin
325c2b03f8
FIX step by step
2020-12-29 17:02:35 +01:00
Laurent Destailleur
cefd66c18f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-29 16:56:39 +01:00
Regis Houssin
20cd9cbbc7
FIX avoid warning php 8.0
2020-12-29 16:25:29 +01:00
Alexandre SPANGARO
9f0434eb69
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-12-29 04:50:32 +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
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes
...
NEW Can toggle FCKeditor on public/private notes
2020-12-27 15:06:35 +01:00
Laurent Destailleur
f98f9504f0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-24 13:07:39 +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
740105ae08
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/emailcollector_card.php
2020-12-23 11:59:14 +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
193d231d4c
Fix edition of operation into email collector
2020-12-22 16:29:21 +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
Gauthier PC portable 024
5116337e0b
FIX : stickler feedbacks
2020-12-21 13:29:44 +01:00
Gauthier PC portable 024
7b739920a2
NEW : Workstations management
2020-12-21 12:28:45 +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
Christian Foellmann
f801dd7d66
PR toggle FCKeditor on public/private notes
2020-11-30 16:39:14 +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
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99
CSS
2020-11-23 12:29:38 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev
...
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
Laurent Destailleur
f39ad2359a
Debug
2020-11-21 17:01:17 +01:00
Laurent Destailleur
bf94ce6aad
Fix warnings
2020-11-21 16:49:54 +01:00
Laurent Destailleur
95b79094df
Fix warning.
...
Module cron is more clear.
2020-11-21 16:27:50 +01:00
Laurent Destailleur
3534555909
Fix setup of scheduled jobs
2020-11-21 14:14:53 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Frédéric FRANCE
f92b5e87dc
doxygen
2020-11-13 14:35:04 +01:00
Laurent Destailleur
a98d025f5a
Clean option for replenishment on real stock.
2020-11-13 11:06:51 +01:00
Laurent Destailleur
56bc788d16
Merge pull request #15375 from frederic34/patch-6
...
doxygen
2020-11-13 09:33:36 +01:00
Laurent Destailleur
350d694181
Fix security page
2020-11-12 19:15:44 +01:00
Frédéric FRANCE
64c48a246a
The method PrestaShopWebservice::... is not static, but was called statically
2020-11-12 18:53:26 +01:00
Frédéric FRANCE
caa82a1e2f
Update PSWebServiceLibrary.class.php
2020-11-12 18:43:52 +01:00
Frédéric FRANCE
9c7d698cc7
Create index.html
2020-11-12 18:40:34 +01:00
Frédéric FRANCE
9e59a9aa8c
Create index.html
2020-11-12 18:39:50 +01:00
Laurent Destailleur
754a9778ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/modUser.class.php
2020-11-12 14:17:10 +01:00
Laurent Destailleur
0764cb2abd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-11-12 14:13:19 +01:00
Laurent Destailleur
a168c3fbb1
Remove warnings
2020-11-12 12:33:29 +01:00
Frédéric FRANCE
ad05451427
Fix missing getpost for scandir odt path
2020-11-12 11:23:03 +01:00
Laurent Destailleur
a804ad4914
css
2020-11-11 16:15:06 +01:00
Laurent Destailleur
741806f47e
Clean code
2020-11-11 16:08:00 +01:00
Laurent Destailleur
ad04646c05
Fix must use json_encode/decode instead of dol_json_encode/decode
2020-11-11 15:56:19 +01:00
Laurent Destailleur
e221e19212
Update doc
2020-11-11 13:20:17 +01:00
Alexandre SPANGARO
82d1f99010
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-11-10 04:09:00 +01:00
jcp
50d530733e
NEW: ICS fields moved into bank account table
2020-11-09 14:08:34 +01:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Alexandre SPANGARO
61bca50fa6
NEW: Dictionary for availability - Add column position
2020-11-05 16:56:28 +01:00
Laurent Destailleur
779566ef30
Clean page with security summary
2020-11-05 10:03:53 +01:00
Laurent Destailleur
60f55c81bf
Fix error if module xml not loaded
2020-11-04 17:45:10 +01:00
Laurent Destailleur
38d88ced0b
Debug the security page
2020-11-04 16:07:59 +01:00
Laurent Destailleur
0dce2c45d9
Trans
2020-11-02 10:15:33 +01:00
Frédéric FRANCE
fcddf03164
fix
2020-11-01 14:13:39 +01:00
Frédéric FRANCE
f0d6029d60
Merge remote-tracking branch 'upstream/develop' into emailsubscription
2020-11-01 14:02:18 +01:00
Frédéric FRANCE
cdc0b8a7d7
add models
2020-11-01 13:59:43 +01:00
Frédéric FRANCE
c2202e10eb
add missing pictos
2020-11-01 13:48:32 +01:00
Frédéric FRANCE
d9bf49c5dc
phpcs
2020-10-31 21:04:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
stickler-ci
284c9bc6a8
Fixing style errors.
2020-10-31 13:34:01 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
8d6fa350b9
Clean code
2020-10-31 12:41:26 +01:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +01:00
Scrutinizer Auto-Fixer
208740c9c4
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
...
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Laurent Destailleur
80d13e711c
More secured getURLContent method. Add PHPUnit on getURLContent
2020-10-27 18:02:05 +01:00
Laurent Destailleur
d750dc48a1
More secured getURLContent method. Add PHPUnit on getURLContent
2020-10-27 15:06:16 +01:00
Laurent Destailleur
4adaf67d47
Hide setup we don't need if email are disabled globally
...
CSS
2020-10-27 11:40:30 +01:00
Laurent Destailleur
8578a7cd7c
Fix regressions
2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56
Merge branch 'translateModLivraison2ModDelivery' of
...
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve
...
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
335d1db3a6
Update dict.php
2020-10-25 14:43:33 +01:00
bahfir abbes
3f03b678e9
fix:rowid is string in currencies table
2020-10-24 03:47:10 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Laurent Destailleur
e22760e8d5
Merge pull request #15113 from frederic34/patch-8
...
code field for product nature must be numeric
2020-10-23 04:08:39 +02:00
Frédéric FRANCE
78ec68e2cf
code field for product nature must be numeric
2020-10-23 00:04:55 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Laurent Destailleur
0616b9bc9b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Laurent Destailleur
b45c99faec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-22 15:03:34 +02:00
Laurent Destailleur
92c6152ad5
FIX #14995
2020-10-22 15:03:12 +02:00
Laurent Destailleur
7605cb1871
Update facture_situation.php
2020-10-21 19:54:28 +02:00
John Botella
d9074e70e1
FIX admin conf selected
2020-10-21 13:27:37 +02:00
Laurent Destailleur
4ec4801c77
FIX Only template of enabled modules visible
2020-10-20 15:54:08 +02:00
Laurent Destailleur
8432a2a0dd
Fix phpcs
2020-10-17 19:05:08 +02:00
Laurent Destailleur
27698ab5c7
Protect page for module management with token even for GET action
2020-10-17 14:01:09 +02:00
Laurent Destailleur
20b6d3828e
NEW Show image of user in the combo select of users
2020-10-17 13:27:39 +02:00
Laurent Destailleur
5df1218d9f
Enhance page to setup email templates
2020-10-17 12:59:22 +02:00
Laurent Destailleur
e3552e7e02
Clean code
2020-10-16 20:17:54 +02:00
Laurent Destailleur
67785887fd
Merge pull request #15035 from andreubisquerra/master
...
Change the tag char for security reasons in 'Receipt Printer' module
2020-10-16 17:20:04 +02:00
Laurent Destailleur
7504f92a41
Standardize code and look and feel
2020-10-16 13:30:20 +02:00
jove@bisquerra.com
f90b236e0f
Change the tag char for security reasons in 'Receipt Printer' module
2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
...
NEW : Nature of product is now a dictionay
2020-10-15 21:07:42 +02:00
Laurent Destailleur
844c4dec4d
css
2020-10-15 13:16:17 +02:00
Florian HENRY
bcb98d1d67
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
2020-10-14 18:16:34 +02:00
Laurent Destailleur
bb367a4489
Update dict.php
2020-10-14 17:40:27 +02:00
Laurent Destailleur
bfe760ffcb
Merge pull request #15012 from bafbes/abb120349
...
fix:two fields with same ids
2020-10-14 17:15:24 +02:00
Florian HENRY
fd1fa1c777
Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType
2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa
add correct import and dict edition
2020-10-14 16:39:42 +02:00
Laurent Destailleur
fe19eea540
Merge pull request #15007 from hregis/develop_bug2
...
FIX avoid spaces in file name
2020-10-14 14:45:40 +02:00
Laurent Destailleur
02fcee5d94
Fix make the default sender email mandatory into setup (if not defined,
...
no emails can be sent).
2020-10-14 12:21:31 +02:00
bahfir abbes
8b0a6d7f40
fix:two fields with same ids is incorrect html
2020-10-14 00:21:12 +01:00
Laurent Destailleur
85825a0104
Init page for security info
2020-10-14 00:57:39 +02:00
Regis Houssin
00ee1a7433
FIX compatibility with LF (Line Feed)
2020-10-13 15:08:43 +02:00
Regis Houssin
1348c03ca0
FIX avoid spaces in file name
2020-10-13 14:46:17 +02:00
Laurent Destailleur
75997bb8f5
Minor fixes
2020-10-12 14:01:15 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport
...
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
Laurent Destailleur
920b31140b
Fix exclude of backup files when path are for Windows
2020-10-11 13:32:50 +02:00
Laurent Destailleur
86c46bbb97
Fix backup - Exclude existing backup when path is uppercase.
2020-10-11 13:18:16 +02:00
Laurent Destailleur
ced91d049d
Show admin star on audit page list
2020-10-10 16:43:15 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Laurent Destailleur
66744658a2
Merge pull request #14966 from hregis/12_bug
...
FIX Multicompany compatibility (missing entity value)
2020-10-08 19:26:49 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Regis Houssin
09e7420936
FIX missing entity in href
2020-10-08 15:51:46 +02:00
Regis Houssin
aa84b76b6a
FIX Multicompany compatibility (missing entity value)
2020-10-08 11:43:12 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
f16a58a62c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modSocialNetworks.class.php
2020-10-06 23:36:15 +02:00
Laurent Destailleur
b0d20f92dc
FIX autofocus on first setup
2020-10-06 17:32:55 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697
2020-10-06 13:32:02 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697
2020-10-06 12:05:24 +02:00
Aurélien
5571a166c6
change variable #14697
2020-10-06 11:37:55 +02:00
stickler-ci
0e7d429991
Fixing style errors.
2020-10-05 13:24:17 +00:00
Christian Foellmann
fb7ed3afc1
optimize mail templates edit screen
2020-10-05 15:20:27 +02:00
Laurent Destailleur
5c3b83b82e
Show small image in setup page
2020-10-05 14:06:14 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697
2020-10-05 13:59:59 +02:00
Laurent Destailleur
cfc3c01815
Factorize code to know if a parameter is used to store a secret
2020-10-05 12:13:06 +02:00
Laurent Destailleur
62177edab1
NEW Can force the antivirus from conf file or autoprepend ini setup.
2020-10-05 05:00:59 +02:00
Laurent Destailleur
07e1646b3a
Minor fixes
2020-10-04 19:09:25 +02:00
Laurent Destailleur
aeb895b1c6
CSS
2020-10-04 18:43:56 +02:00
Laurent Destailleur
c2fed95dc4
FIX #14877
2020-10-02 19:54:06 +02:00
Laurent Destailleur
03ede71989
Clean code
2020-10-02 16:15:24 +02:00
Frédéric FRANCE
16ff15b48c
fix
2020-10-02 00:29:36 +02:00
Frédéric FRANCE
b78e506e39
add files
2020-10-02 00:25:44 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields
2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm
2020-10-02 00:21:13 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
Laurent Destailleur
82da38df65
Removed dead code
2020-09-29 19:57:10 +02:00
Laurent Destailleur
8b2ba8cbba
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
2020-09-29 13:28:22 +02:00
Laurent Destailleur
1f8f2c0cc3
NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr
2020-09-29 13:13:47 +02:00
Laurent Destailleur
4cf6e483ca
Fix export of various payments.
2020-09-28 18:49:20 +02:00
Laurent Destailleur
4a7df01339
Fix the MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD should be
...
MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD
2020-09-27 19:31:54 +02:00
Laurent Destailleur
e495d0459e
Look and feel v13
2020-09-27 17:53:17 +02:00
Laurent Destailleur
1b83b55995
Fix to exclude possible sql injection
2020-09-25 17:11:54 +02:00
Laurent Destailleur
3c6dda9dd5
Clean code
2020-09-25 10:27:30 +02:00
Laurent Destailleur
d6ce6bb47f
Standardize code
2020-09-25 10:05:59 +02:00
Laurent Destailleur
ed2dd3f55f
Clean code
2020-09-24 22:02:10 +02:00
Laurent Destailleur
64c8053b67
Fix restrict extension of files
2020-09-24 21:09:58 +02:00
Laurent Destailleur
ca7b9efec2
Add missing token
2020-09-24 17:08:31 +02:00
Laurent Destailleur
f066da1811
Minor security fixes
2020-09-24 16:19:24 +02:00
Laurent Destailleur
09c6761dae
NEW Include the tag editor of page as a popup into website editor
2020-09-23 16:36:19 +02:00
Laurent Destailleur
e4bd75dbdc
Enhancement for #14589
2020-09-22 16:26:53 +02:00
Laurent Destailleur
288fd5566f
FIX #14776
2020-09-22 16:02:00 +02:00
Laurent Destailleur
cda101238d
Fix #yogosha4543
2020-09-20 21:17:27 +02:00
Laurent Destailleur
ab94224d0c
Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed
...
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
2020-09-20 17:56:23 +02:00
Laurent Destailleur
b3dd51b790
Fix warnings
2020-09-20 16:46:29 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
2c660504bb
Fix escape
2020-09-19 23:11:38 +02:00
Laurent Destailleur
54c0f742b1
Fix escape
2020-09-19 21:19:04 +02:00
Laurent Destailleur
b1985950a6
Use POST to make the ajax set/del constant
2020-09-19 12:50:47 +02:00
Laurent Destailleur
b7a97b2c81
Prepare for fix
2020-09-19 01:45:40 +02:00
Laurent Destailleur
2d38644ae1
Sanitize sortfield
2020-09-18 17:13:01 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
937d656f46
Fix #yogosha4515
2020-09-17 23:02:09 +02:00
Laurent Destailleur
5744b1e0a3
Fix #yogosha4512
2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8
Fix dol_string_nohtmltag: the decode of entity must be done before split
2020-09-17 21:09:16 +02:00
Laurent Destailleur
9a758b7edd
FIX #yogosha4483
2020-09-17 14:31:25 +02:00
Laurent Destailleur
2f100fdf79
Fix alpha into alphanohtml
2020-09-17 12:53:58 +02:00
Laurent Destailleur
bfbb217607
Fix GETPOST on 'action'
2020-09-16 19:39:50 +02:00
Laurent Destailleur
52c9e7230f
Merge pull request #14734 from inoveaconseil/NEW_Scope_Oauth_Google
...
New scope oauth google
2020-09-16 00:55:10 +02:00
Laurent Destailleur
c152f8d76f
Merge branch 'develop' into patch-4
2020-09-16 00:52:16 +02:00
Frédéric FRANCE
070f9a0c89
uniformise scan_dir to scandir in admin supplier payments
2020-09-15 16:32:32 +02:00
Laurent Destailleur
51963f4c2a
css
2020-09-15 13:48:48 +02:00
Laurent Destailleur
5ca8141cd8
Typo
2020-09-15 12:09:48 +02:00
Laurent Destailleur
9a9b7ecb95
CSS
2020-09-15 12:07:15 +02:00
Laurent Destailleur
3dfa9acbef
CSS
2020-09-15 11:18:57 +02:00
stickler-ci
b39b9e4227
Fixing style errors.
2020-09-14 13:19:26 +00:00
Nicolas
ee4e209e7c
NEW Oauth SCOPE for Admin SDK
2020-09-14 15:12:57 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed
2020-09-14 10:25:15 +02:00
stickler-ci
3de5e0f957
Fixing style errors.
2020-09-14 02:30:37 +00:00
Scrutinizer Auto-Fixer
73915d51c8
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00:00
Laurent Destailleur
59bc8ee07c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/stats/byproperties.php
htdocs/adherents/stats/geo.php
htdocs/admin/system/dolibarr.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/admin.lang
htdocs/product/class/product.class.php
2020-09-14 02:49:19 +02:00
Laurent Destailleur
a4fb16b4f3
Add a warning to warn about security leak
2020-09-14 00:03:49 +02:00
Laurent Destailleur
7d25de5713
Enhance setup page for email setup
2020-09-12 15:39:14 +02:00
stickler-ci
97e74642ce
Fixing style errors.
2020-09-11 12:26:14 +00:00
Sekan, Tobias
0a0eed289e
cleanup workflow page + bugfixes
2020-09-11 14:15:10 +02:00
Laurent Destailleur
b8fe2188a6
Standardize code around model_pdf
2020-09-10 01:49:09 +02:00
Laurent Destailleur
803efa7acc
Add hidden constant until feature is reliable
2020-09-09 15:39:47 +02:00
Laurent Destailleur
3aa921fd0a
Merge pull request #14665 from TobiasSekan/NewCommonFilterForModuleOverview
...
NEW Add common list function for available app/module page
2020-09-09 15:36:46 +02:00
Sekan, Tobias
37141b577a
fix sticker CI, better names, add missing comapres
2020-09-09 08:34:13 +02:00
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
kamel
ccff18e2a5
NEW : Email configuration - Allow auto signed certificat when ssl activated
2020-09-08 14:48:50 +02:00
Laurent Destailleur
86ed4dfa2b
Debug hidden option MAIN_USE_EXPENSE_IK
2020-09-08 11:51:36 +02:00
stickler-ci
2569c792e7
Fixing style errors.
2020-09-08 08:13:56 +00:00
Sekan, Tobias
650bb54051
add common list function for module overview
2020-09-08 10:07:34 +02:00
Laurent Destailleur
198b8d8d2b
debugbar ok with php5.6
2020-09-08 02:59:49 +02:00
Laurent Destailleur
1a67b4efeb
Debug
2020-09-08 02:11:09 +02:00
Laurent Destailleur
c95e54843c
Update lib debugbar
...
Update php-parallel-lint
2020-09-07 21:00:40 +02:00
Laurent Destailleur
b1e45aef46
Debug opensurvey. Look and feel v13. Removed deprecated properties.
2020-09-07 12:04:50 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
lvessiller
27c754e6c8
NEW add send context for ticket
2020-09-02 15:33:18 +02:00
Laurent Destailleur
4110f1df05
Responsive
2020-08-31 19:21:33 +02:00
Laurent Destailleur
0d4f7cb485
Fix responsive and title of reports
2020-08-30 17:42:49 +02:00
Laurent Destailleur
6293f76692
Debug
2020-08-29 06:17:26 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind
...
Agenda Remind (Part 1)
2020-08-29 05:19:21 +02:00
Laurent Destailleur
983a3c59c8
css
2020-08-29 01:11:08 +02:00
Laurent Destailleur
ad87e753b4
Clean trim on GETPOST (already included inside GETPOST when not 'none'
2020-08-28 21:27:50 +02:00
Laurent Destailleur
04ad25d90f
NEW Add the workflow interaction close intervention on closing ticket
2020-08-28 19:07:17 +02:00
Laurent Destailleur
50b791cfca
Fix css
2020-08-28 17:41:15 +02:00
Laurent Destailleur
741489fdc0
FIX #14564
2020-08-27 19:52:05 +02:00
Laurent Destailleur
2abdfe08d7
FIX Email collector decode subject
...
FIX Cloning email collector clone also rules and operations
2020-08-27 18:27:05 +02:00
atm-lena
5856033892
Replace "agenda_send" and "event_push" to "actioncomm_send"
2020-08-27 11:15:08 +02:00
atm-lena
1267e914dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
2020-08-26 15:16:53 +02:00
Laurent Destailleur
23bb67873f
NEW Can edit the list of sending email profiles.
2020-08-25 19:40:17 +02:00
atm-lena
6a94c0f52f
Add model type mail
2020-08-25 16:43:57 +02:00
Laurent Destailleur
21633e3d39
css
2020-08-24 17:10:27 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
a265bec7ca
NEW Events in agenda for contact
...
FIX Saving contacts of an events
2020-08-23 02:38:56 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
Laurent Destailleur
461c37c4a8
Clean code
2020-08-21 01:28:40 +02:00
Laurent Destailleur
3ebcd191bd
NEW Add filter rules "is answer" and "is not answer" in email collector
2020-08-20 20:16:38 +02:00
Laurent Destailleur
3281d5ec17
Merge pull request #14451 from josemariagomezroncero/patch-7
...
Bug, this option disable topic input.
2020-08-19 14:38:51 +02:00
Laurent Destailleur
4edf190264
Update mails_templates.php
2020-08-19 14:38:02 +02:00
Laurent Destailleur
afe8f76a4a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/stock.php
2020-08-18 15:41:57 +02:00
Laurent Destailleur
d4a502629e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/stock.php
htdocs/core/lib/ajax.lib.php
2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d
FIX Setup of stock increase/decrease
2020-08-18 15:27:17 +02:00
Laurent Destailleur
2f18ab0ea9
Debug generation of document for warehouse
2020-08-18 14:55:56 +02:00
Laurent Destailleur
6ce9d573e2
Trans
2020-08-18 14:13:36 +02:00
Laurent Destailleur
0172b76ea3
Add class reposition on some buttons
2020-08-18 14:05:35 +02:00
Laurent Destailleur
58e25768a7
NEW Add PDF document templates for warehouses (list of stock)
2020-08-18 14:02:36 +02:00
Laurent Destailleur
e3beec3e1f
Fix css
2020-08-17 20:57:44 +02:00
Laurent Destailleur
bd65e5612f
Fix duplicate id
2020-08-17 20:06:01 +02:00
Laurent Destailleur
75d368b706
Better translation of option
2020-08-17 14:08:52 +02:00
Laurent Destailleur
657e6a2037
No warning
2020-08-16 23:14:53 +02:00
Laurent Destailleur
4c0785e996
FIX #14469
2020-08-16 23:13:27 +02:00
Alexandre SPANGARO
3c35b20b54
Dict - Insert number 41
2020-08-16 22:17:28 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
josemariagomezroncero
134bd11f47
Update mails_templates.php
2020-08-14 21:19:51 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
josemariagomezroncero
308dea92b3
Bug, this option disable topic input.
...
Bug, MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES disable topic input. We need the subject for email for save.
2020-08-10 20:40:11 +02:00
Laurent Destailleur
537b58b446
Introduce workaround to allow integrator to suggest list of modules in
...
old style by default instead of kanban style #14075
2020-08-08 02:34:22 +02:00
Laurent Destailleur
71a6cf1207
Fix permission on type of email templates must depends on user perms.
...
Conflicts:
htdocs/admin/mails_templates.php
2020-08-07 14:39:30 +02:00
Laurent Destailleur
5e90286a2e
Fix permission on type of email templates must depends on user perms.
2020-08-07 14:38:03 +02:00
Laurent Destailleur
6fd433167f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-08-07 11:59:55 +02:00
Laurent Destailleur
edd19419ad
Add protection to allow only jpg and png as image file
2020-08-06 17:39:36 +02:00
Laurent Destailleur
61e194bb6d
Add protection to allow only jpg and png as image file
2020-08-06 17:37:00 +02:00
Laurent Destailleur
c2b03e49e1
Fix logo not visible in setup page
2020-08-06 17:28:57 +02:00
Laurent Destailleur
aa696d8343
Show warning in kanban view
2020-08-03 15:17:37 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
b6a3938921
FIX Size of image on the help popup of modules
2020-08-03 14:32:42 +02:00
Laurent Destailleur
55f3a8b4f8
Fix col size too large by migrating to dynamic format on tables
2020-08-03 11:37:55 +02:00
Laurent Destailleur
4afdfdda53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
2020-08-02 22:42:17 +02:00
Laurent Destailleur
c35a103694
Fix phpcs
2020-08-02 22:40:17 +02:00
Laurent Destailleur
d9818405c6
Fix regression for v13
2020-08-02 22:30:23 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
Laurent Destailleur
be34a2c607
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
2020-08-02 16:06:51 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
f80b54e573
Debug setup of receipt printer module
2020-07-31 13:44:55 +02:00
Laurent Destailleur
d4e21538db
FIX Debug setup of receipt printer module
2020-07-31 13:40:36 +02:00
Laurent Destailleur
81cb5501bc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
2020-07-28 10:32:27 +02:00
Laurent Destailleur
45eca85bae
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2020-07-28 10:29:14 +02:00
Laurent Destailleur
d46d34915e
FIX Checkbox "drop table" was not checked when using php method for dump
2020-07-28 10:23:09 +02:00
Laurent Destailleur
4e4f0a4575
Use same case for all sql files
2020-07-28 09:44:48 +02:00
Laurent Destailleur
fef180cf86
Fix scrutinizer errors
2020-07-28 02:54:37 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
9798bb1b30
Fix responsive
2020-07-27 02:29:16 +02:00
Laurent Destailleur
0011e09248
FIX Setup of clicktodial hang on smartphone
2020-07-27 02:29:11 +02:00
Laurent Destailleur
8cd4636de7
Fix responsive
2020-07-27 02:27:27 +02:00
Laurent Destailleur
2e19da3e6a
FIX Setup of clicktodial hang on smartphone
2020-07-27 02:25:09 +02:00
Laurent Destailleur
353e99c26a
Fix look and feel
2020-07-26 19:43:55 +02:00
Laurent Destailleur
378c45fe5c
Fix look and feel
2020-07-26 19:21:47 +02:00
Laurent Destailleur
f17942675d
Look and feel
2020-07-26 18:34:50 +02:00
Laurent Destailleur
195ad9e5fb
Fix exclude .back files
2020-07-24 10:21:20 +02:00
Laurent Destailleur
3109d9c16a
Look and feel v13
2020-07-24 09:58:39 +02:00
Laurent Destailleur
afbeb026ab
Trans
2020-07-24 09:56:14 +02:00
Laurent Destailleur
aefb1483e3
NEW Can change size of logo on PDF documents
2020-07-24 03:36:44 +02:00
Laurent Destailleur
895fe63d3b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-24 01:53:51 +02:00
Laurent Destailleur
34a9eee7a6
Minor fix in translation
2020-07-24 01:50:57 +02:00
Laurent Destailleur
a46f4df147
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/clicktodial.php
2020-07-24 00:15:56 +02:00
Laurent Destailleur
0890b15077
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70
FIX ClickToDial tab of users has disappeared
2020-07-24 00:06:18 +02:00
Laurent Destailleur
e5a16c530d
FIX Can go on page even when module disabled
2020-07-23 23:57:12 +02:00
Laurent Destailleur
9a506ff9b3
css
2020-07-20 03:29:22 +02:00
Laurent Destailleur
8d26329653
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
htdocs/projet/activity/perday.php
2020-07-19 02:24:26 +02:00
Laurent Destailleur
f26a64fb88
FIX If using a rounding step, localtax1+2 not included in total
2020-07-19 01:47:17 +02:00
Laurent Destailleur
16d486e211
FIX Setup of currency limit and accuracy
2020-07-19 01:03:37 +02:00
Laurent Destailleur
32410b59c4
Code comment
2020-07-19 00:02:02 +02:00
Laurent Destailleur
96729769f7
Standardize Agenda view
2020-07-08 18:06:14 +02:00
Laurent Dinclaux
f2adc3de4f
Fix Dolibarr/dolibarr#14181 . Limits and accuracy form not saving modified values
2020-07-07 18:03:11 +11:00
Laurent Destailleur
4fd970af28
Fix phpcs
2020-07-07 01:29:31 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/actions_fetchobject.inc.php
htdocs/langs/fr_FR/contracts.lang
htdocs/langs/fr_FR/loan.lang
htdocs/langs/fr_FR/stocks.lang
2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2
FIX missing setup of extrafields for MO
...
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
2020-07-04 16:14:53 +02:00
Laurent Destailleur
26c6e2d92e
Clean code
2020-07-02 03:34:28 +02:00
Laurent Destailleur
ab88890f3a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-28 21:48:28 +02:00
Laurent Destailleur
d22a0f702e
WIP Stock at date
2020-06-28 17:34:30 +02:00
Laurent Destailleur
194b92e70f
Fix load of menu when 'perm' or 'enabled' is '0'.
2020-06-27 15:27:09 +02:00
Laurent Destailleur
b6c1cdad7c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/element.php
2020-06-24 09:59:08 +02:00
Laurent Destailleur
d05c60baf0
Fix css
2020-06-23 14:33:34 +02:00
Laurent Destailleur
501fd2f7a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/admin/receipt.php
2020-06-21 20:48:41 +02:00
Laurent Destailleur
ccc55dcb1e
Debug Receipt printer module and reduce duplicate translation key
2020-06-20 15:19:19 +02:00
atm-quentin
e3d94d44ab
NEW hide closed contract lines
2020-06-16 10:45:49 +02:00
Laurent Destailleur
6f12488e30
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
42d44e996f
Fix link to setup page
2020-06-07 13:50:58 +02:00
Laurent Destailleur
f2e54b9ad5
Fix link to setup page
2020-06-07 13:49:49 +02:00
Laurent Destailleur
4169aa716c
FIX can install module even if (x) was appended during download.
2020-06-07 00:23:20 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/supplier/index.php
htdocs/admin/mails_templates.php
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Laurent Destailleur
da672c8776
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/admin/translation.php
htdocs/core/class/html.formfile.class.php
htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
b75700cc0b
Fix virtualstock activation when MRP module is on
2020-06-05 10:27:34 +02:00
Laurent Destailleur
630525b59c
css
2020-06-05 02:22:16 +02:00
Laurent Destailleur
71cb17b58b
css
2020-06-02 20:58:56 +02:00
Laurent Destailleur
3755c7d25b
css
2020-06-02 20:58:18 +02:00
gauthier
68bb552dcc
FIX : Tickets mail models doesn't work
2020-06-02 17:06:49 +02:00
Laurent Destailleur
8dbc0ff040
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/prelevement.php
htdocs/admin/system/phpinfo.php
htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
8146e4fdbd
Fix tooltip
2020-05-30 02:17:10 +02:00
Laurent Destailleur
156f09729e
Debug module Payment by credit transfer
2020-05-30 02:10:41 +02:00
Laurent Destailleur
0a8b90c4e8
Debug module Payment by credit transfer
2020-05-30 02:10:02 +02:00
Laurent Destailleur
b9051bbe22
Fix admin report
2020-05-29 09:50:38 +02:00
Laurent Destailleur
9224061aed
Fix test to upload a file
2020-05-29 03:20:44 +02:00
Laurent Destailleur
5a9d968a75
Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting
2020-05-29 00:02:03 +02:00
Laurent Destailleur
f8b92e507c
Clean code
2020-05-28 19:10:06 +02:00
Laurent Destailleur
cf924e11e9
Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse-
...
NEW Add option to define a default warehouse at user level
2020-05-28 18:41:54 +02:00
Laurent Destailleur
2f0a5b2634
Merge pull request #13976 from OPEN-DSI/new_ticket_public_notify_new_message
...
NEW Ticket message notifications when edited from public interface
2020-05-28 17:31:26 +02:00
Laurent Destailleur
32aecb553b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec
FIX Bad use/detetion of text/html when forging template email.
2020-05-28 11:41:48 +02:00
Laurent Destailleur
a2a15ceb5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984
Debug credit transfer
2020-05-27 22:35:55 +02:00
Laurent Destailleur
264c1d6491
List website into combo sorted by position, ref fields
2020-05-27 14:50:10 +02:00
Anthony Berton
9efcc631d7
Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse-
2020-05-27 14:47:20 +02:00
kamel
fe8eddac5e
[NEW] Ticket message notifications from public interface
...
Can send an email when a new message is added from public interface
close issue #12181
2020-05-27 11:39:06 +02:00
Laurent Destailleur
2d30d33303
NEW Can filter on container type, language and tags in the list of pages
...
of website module.
2020-05-26 12:25:41 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-25 22:40:59 +02:00
Laurent Destailleur
056206098b
CSS
2020-05-25 12:51:17 +02:00
Laurent Destailleur
9e77dc0a26
CSS
2020-05-25 12:50:29 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97
Merge
2020-05-24 01:06:45 +02:00
Laurent Destailleur
ef17ed2f87
Look and feel v12
2020-05-24 00:01:52 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-23 18:54:33 +02:00
Laurent Destailleur
c2b2e17b58
Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl
...
NEW conf to allow show full arbo in warehouse getnomurl
2020-05-23 15:05:08 +02:00
Frédéric FRANCE
85625a46bb
add new rule
2020-05-21 09:35:30 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule
2020-05-21 01:41:27 +02:00
Laurent Destailleur
346082b153
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-19 19:59:24 +02:00
atm-quentin
d61cef28d7
NEW conf to allow show full arbo in getnomurl
2020-05-19 11:16:04 +02:00
Laurent Destailleur
b3a17c8da4
Look and feel v12
2020-05-19 04:21:38 +02:00
Laurent Destailleur
88c40633d5
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-18 15:57:29 +02:00
Laurent Destailleur
ff8d22a80d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
2020-05-18 15:57:01 +02:00
Laurent Destailleur
756c1fd73d
Fix tooltip message
2020-05-18 15:26:04 +02:00
Laurent Destailleur
bd564486ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-17 20:03:09 +02:00
Laurent Destailleur
75ac377352
Fix tar command
2020-05-16 04:26:43 +02:00
Laurent Destailleur
24f4a0be1f
exclude other log files
2020-05-16 04:24:23 +02:00
Laurent Destailleur
762ca96203
FIX #13841
2020-05-15 18:28:15 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod
...
NEW possibilty to group payments by mode and show their subtotal
2020-05-14 16:55:37 +02:00
Laurent Destailleur
61f1a57e2f
Merge pull request #13850 from andreubisquerra/master
...
TakePOS Auto Order improvements
2020-05-14 16:18:28 +02:00
Laurent Destailleur
2c1e1f43dc
Merge pull request #13879 from frederic34/patch-4
...
Update dolistore.class.php
2020-05-14 16:00:36 +02:00
Laurent Destailleur
7c01b54d73
Fix version on module list
2020-05-14 15:42:37 +02:00
Laurent Destailleur
ae0e6e4dc8
FIX dol_concatdesc to escape <
...
Better help
2020-05-14 14:30:36 +02:00
Laurent Destailleur
bcaa83eeec
FIX dol_concatdesc to escape <
...
Better help
2020-05-14 14:10:04 +02:00
Frédéric FRANCE
366ae2f116
Update dolistore.class.php
2020-05-12 18:44:26 +02:00
Laurent Destailleur
734a8ba312
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-12 15:27:00 +02:00
Laurent Destailleur
0544434482
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-12 15:26:11 +02:00
Laurent Destailleur
b6afd86354
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-12 15:25:59 +02:00
Laurent Destailleur
4cf99585f8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-12 15:24:15 +02:00
Laurent Destailleur
45caa02929
Merge pull request #13854 from bb2a/user-hide-inactive-in-config-module-users
...
NEW Add option to hide all inactive users into combo list of users.
2020-05-12 03:18:21 +02:00
Laurent Destailleur
7be47097e9
Merge pull request #13867 from frederic34/patch-4
...
Only add empty select if no multiselect
2020-05-12 03:00:10 +02:00
Frédéric FRANCE
4d50ba5e37
Fix dolistore search with csrf active
2020-05-11 20:42:47 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Frédéric FRANCE
3a46d5a3dd
Update agenda_other.php
2020-05-11 18:46:54 +02:00
Laurent Destailleur
a83af075aa
Fix responsive
2020-05-11 00:35:05 +02:00
Laurent Destailleur
fe241ea321
Fix removed not reliabled info in PHP info
2020-05-09 21:49:12 +02:00
Anthony Berton
3644a718d8
1
2020-05-09 01:02:51 +02:00
Laurent Destailleur
42ee755ea5
Look and feel v12
2020-05-08 02:52:55 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
DEMAREST Maxime (Indelog)
889e5db4fb
Fix use Form::selectyesno() for added options in admin/compta.php
2020-05-06 13:55:38 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78
Add include various payments and loans in accounting report
...
For simplified accouning, behaviour not enable by default and must be
enabed in simplified accounting module admin page (or by global
settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
ACCOUNTING_REPORTS_INCLUDE_LOAN).
2020-05-06 12:58:41 +02:00
Laurent Destailleur
a8222c2651
Look and feel v12
2020-05-06 05:10:42 +02:00
Laurent Destailleur
247acdd274
Fix position of custom groups of modules
2020-05-06 03:47:28 +02:00
Anthony Berton
2ccbc59bdb
Update stock.php
2020-05-06 00:57:11 +02:00
Anthony Berton
c6d2a1faf3
Add options
...
Add options in module stock
2020-05-06 00:48:00 +02:00
Laurent Destailleur
07178fb6c0
Fix look and feel
2020-05-05 20:52:50 +02:00
Laurent Destailleur
ded0526ca1
Merge pull request #13738 from bb2a/patch-6
...
links color for table title line is equal to Text color for table title line
2020-05-05 18:12:07 +02:00
Laurent Destailleur
5e4ef9266e
Fix update template to use for notifications
2020-05-04 20:30:02 +02:00
stickler-ci
ef3f121c88
Fixing style errors.
2020-05-03 08:51:50 +00:00
Anthony Berton
44bafb7225
Update ihm.php
2020-05-03 10:46:48 +02:00
Laurent Destailleur
cc4a9ed10d
Merge pull request #13768 from TobiasSekan/MeasuringDirectoryToolTip
...
NEW tooltip for Unit_type and scale in "Dictionary setup - Measuring Units"
2020-05-01 22:36:04 +02:00
Laurent Destailleur
75dd5f268f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/core/lib/sendings.lib.php
2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254
Fix restore param --quick
2020-05-01 21:01:40 +02:00
Laurent Destailleur
82ace4b4ef
FIX Several pb in export of documents
...
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2020-04-30 11:52:30 +02:00
Tobias Sekan
56dee72b66
add tooltip for unit_type and scale (admin)
2020-04-29 13:30:14 +02:00
stickler-ci
2cf5f12a62
Fixing style errors.
2020-04-28 07:18:45 +00:00
DEMAREST Maxime (Indelog)
740b2c9228
NEW possibilty to group payments by mode and show their subtotal
...
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
2020-04-28 09:01:00 +02:00
kamel
9cb90cb384
NEW: Add prospect status managment for the contact with managment of custom icon
2020-04-27 17:35:14 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
4c605283f5
Fix phpcs
2020-04-27 00:09:21 +02:00
Laurent Destailleur
c0821a8ed6
Fix phpcs
2020-04-27 00:02:31 +02:00
Laurent Destailleur
31157931a9
Fix phpcs
2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280
Enable more PHPCS rules
2020-04-25 19:27:42 +02:00
Laurent Destailleur
068a890c36
Enable more PHPCS rules
2020-04-25 19:13:20 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
6b114a31ce
Look and feel v12
2020-04-25 03:00:41 +02:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
3170060c65
Help show format of price
2020-04-22 18:34:52 +02:00
Laurent Destailleur
52c8e3aff1
Look and feel v12
2020-04-22 18:30:25 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
Laurent Destailleur
536ab95207
FIX: The "test smtp connectivity" failed on page to setup mass emailing
...
Conflicts:
htdocs/admin/mails.php
2020-04-21 12:50:20 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
Laurent Destailleur
2922d16ca2
Look and feel v12
2020-04-20 14:46:02 +02:00
Laurent Destailleur
4bbe307b41
Look and feel v12
2020-04-19 15:34:53 +02:00
ATM john
c334a931de
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-16 20:29:54 +02:00
Laurent Destailleur
5254a94038
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
Laurent Destailleur
855ac5467c
FIX setup of suggested payment mode on proposals and orders
2020-04-16 15:40:16 +02:00
Scrutinizer Auto-Fixer
d021559b16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-15 22:42:57 +00:00
Laurent Destailleur
e26124bf84
Clean code to make option TICKET_NOTIFICATION_EMAIL_TO easier to
...
understand
2020-04-15 12:57:33 +02:00
Laurent Destailleur
c93681ed33
Responsive
2020-04-15 11:51:43 +02:00
Laurent Destailleur
53ceef5b6a
FIX XSS Vulnerability
2020-04-15 02:32:55 +02:00
ATM john
b70cd84402
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-14 14:11:12 +02:00
Laurent Destailleur
dc86f9528d
Fix MRP module
2020-04-13 18:10:20 +02:00
stickler-ci
3a029001f4
Fixing style errors.
2020-04-13 14:23:29 +00:00
ptibogxiv
e589642120
NEW setup template email notification
2020-04-13 16:20:22 +02:00
Laurent Destailleur
e02ac3b518
Trans
2020-04-13 15:57:25 +02:00
Laurent Destailleur
6e92eb4397
Fix descriptor of module was visible for external module only
2020-04-13 15:43:37 +02:00
Laurent Destailleur
057a4517c9
Fix rss
2020-04-13 13:38:57 +02:00
Laurent Destailleur
93a3a03dd2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-13 13:32:25 +02:00
Laurent Destailleur
862977bd94
Fix css
2020-04-13 13:32:09 +02:00
Laurent Destailleur
6bc87d6277
Merge pull request #13591 from TobiasSekan/ShowActiveBoxStateOfRssFeed
...
NEW Show active widget state of a RSS feed
2020-04-13 13:29:40 +02:00
Laurent Destailleur
36669739f3
Update external_rss.php
2020-04-13 13:29:23 +02:00
Scrutinizer Auto-Fixer
387ea73bf3
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-13 11:24:42 +00:00
stickler-ci
cfbb4e9ef6
Fixing style errors.
2020-04-13 08:55:33 +00:00
Sekan, Tobias
e130faf012
Show active box state of a RSS feed
2020-04-13 10:36:24 +02:00
Laurent Destailleur
d503c1b6be
Fix help
2020-04-12 23:18:21 +02:00
Laurent Destailleur
78b455e42a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-12 17:01:53 +02:00
Laurent Destailleur
422e33a68b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Frédéric FRANCE
044a6192b6
doxygen
2020-04-12 16:26:19 +02:00
Maxime Kohlhaas
20e684ec69
Fix #13468 setup working days and hours
2020-04-12 15:30:58 +02:00
Laurent Destailleur
6b16a3ad39
NEW Can check all events in one click in setup of audited events
2020-04-12 13:25:19 +02:00
Laurent Destailleur
d8e0036817
css
2020-04-11 12:41:53 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
9a6c89d03f
Fix phpcs
2020-04-08 18:51:24 +02:00
Laurent Destailleur
361baa0c73
CSS
2020-04-08 17:56:24 +02:00
Laurent Destailleur
02436c1e84
NEW The module selection uses a KanBan view by default.
2020-04-08 17:04:23 +02:00
Laurent Destailleur
fe614658c8
Look and feel v12
2020-04-08 16:13:29 +02:00
Laurent Destailleur
12c033649a
Merge pull request #13512 from frederic34/zopflipng
...
compress png with zopflipng
2020-04-08 14:48:38 +02:00
Laurent Destailleur
5a59f87699
Update phpinfo.php
2020-04-08 14:37:49 +02:00
stickler-ci
6ceb35c5c6
Fixing style errors.
2020-04-08 10:11:06 +00:00
Tobias Sekan
05ec5718bd
Fix overriden PHP POST check
2020-04-08 12:00:47 +02:00
Tobias Sekan
287af6c864
Show better PHP extension info
2020-04-08 11:46:45 +02:00
Laurent Destailleur
9d9364256b
More picto using fontawesome.
2020-04-07 16:45:08 +02:00
Laurent Destailleur
8e7ad726b2
NEW Easier way to setup the different types of tax. Better visibility.
...
FIX edit of tax stamp regenerated the PDF.
2020-04-07 14:06:08 +02:00
Frédéric FRANCE
fc34b5a4cb
compress png with zopflipng
2020-04-06 19:03:48 +02:00
Laurent Destailleur
809c741d11
Can use font awesome as picto of object and modules.
2020-04-06 15:34:28 +02:00
Laurent Destailleur
082b205149
WIP Work on Kanban view for module list
2020-04-06 15:12:42 +02:00
Laurent Destailleur
b1c5490a74
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_add.tpl.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2020-04-05 04:03:53 +02:00
Scrutinizer Auto-Fixer
612bac6598
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-05 00:44:59 +00:00
Laurent Destailleur
ed0f6b56b9
FIX: The "test smtp connectivity" failed on page to setup mass emailing
2020-04-05 00:29:34 +02:00
Laurent Destailleur
28a1b7af35
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-03 18:07:24 +02:00
Laurent Destailleur
a5a5fe55f6
Code simpler
2020-04-03 14:55:46 +02:00
Laurent Destailleur
644d83d799
Rename field to avoid confusion
2020-04-02 19:42:08 +02:00
ATM john
81adc6913e
change conf usage
2020-04-01 12:12:30 +02:00
ATM john
c466beea3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:28:43 +02:00
Laurent Destailleur
4220236aa8
Merge pull request #13425 from andreubisquerra/develop
...
NEW: CUPS printing compatibility for TakePOS
2020-03-30 18:56:14 +02:00
Laurent Destailleur
d5b107211f
Look and feel v12
2020-03-28 15:20:26 +01:00
Laurent Destailleur
ec83f18944
Move more icon definition into CSS
2020-03-28 13:38:25 +01:00
Laurent Destailleur
354cb8c1b0
Work on Kanban view for modules
2020-03-27 01:59:17 +01:00
andreubisquerra
3e4b788316
Update receiptprinter.php with CUPS
2020-03-25 21:23:55 +01:00
Laurent Destailleur
6f1b9c4678
Fix colspan
2020-03-25 18:24:39 +01:00
Laurent Destailleur
3c572c1909
Debug multicurrency
2020-03-25 17:24:20 +01:00
Alexandre SPANGARO
c3e5cf901d
Work on split module fournisseur
2020-03-24 22:20:25 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
3d6849dfea
Fix label of tabs
2020-03-22 17:27:08 +01:00
Laurent Destailleur
ce47351b76
Trans
2020-03-22 17:11:58 +01:00
Laurent Destailleur
4e007fe94c
Import jommla news
2020-03-20 15:12:50 +01:00
Laurent Destailleur
e61222504a
Look and feel
2020-03-20 11:49:00 +01:00
Laurent Destailleur
a0086d73a1
Merge pull request #13371 from aspangaro/12.0_a23
...
Work on split module fournisseur
2020-03-20 10:37:54 +01:00
Laurent Destailleur
222556b464
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00
Laurent Destailleur
7eb4522636
FIX missing token and save of survey description
2020-03-19 11:59:57 +01:00
Alexandre SPANGARO
bac099dc60
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
2020-03-19 11:48:21 +01:00
Laurent Destailleur
8c34a091b4
Fix import
2020-03-18 19:24:11 +01:00
Laurent Destailleur
30b48a9ee3
Fix update
2020-03-18 19:21:32 +01:00
Laurent Destailleur
87edf27bbf
Merge branch 'develop' into dev_NEW_setup_SeparateurCSV
2020-03-18 19:12:52 +01:00
Laurent Destailleur
b9f404b5fa
Fix form inside table
2020-03-18 19:07:15 +01:00
florian HENRY
9bfc60064b
ass credential
2020-03-18 15:12:02 +01:00
florian HENRY
15614abc3f
NEW: add csv separator setup in module admin
2020-03-18 15:08:58 +01:00
Alexandre SPANGARO
033f796398
Work on split module fournisseur
2020-03-17 14:51:48 +01:00
UT from dolibit
8e712c6d0e
Update https for country websites
...
Update https for country websites
2020-03-16 13:13:11 +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
148e2e58e5
Fix MAIN_SHOW_LOGO
2020-03-07 17:37:08 +01:00
Laurent Destailleur
119784fb3d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-07 17:34:01 +01:00
Jean Traullé
a6e3980acb
Update ihm.php
2020-03-06 17:35:03 +01:00
Jean Traullé
ddf87e6d80
Fix param lost
...
Reported on https://www.dolibarr.fr/forum/t/v11-petites-regressions/32228
2020-03-06 16:13:09 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
6f3197bbea
Merge pull request #13258 from atm-ph/fix_11.0_dict_sql_error_sortorder
...
Fix sql syntax error
2020-03-03 22:54:11 +01:00
Laurent Destailleur
d5546df57b
Responsive
2020-03-03 22:50:37 +01:00
Laurent Destailleur
fd64f0fadb
Fix responsive
2020-03-03 22:46:29 +01:00
Laurent Destailleur
88d2e13f02
Fix reponsive
2020-03-03 22:15:55 +01:00
atm-ph
e916ff40ff
Fix sql syntax error
2020-03-03 11:55:05 +01:00
Laurent Destailleur
a3e56994b6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
2020-02-27 18:35:32 +01:00
Laurent Destailleur
b326d1fe49
Add link to wiki doc
2020-02-27 18:26:38 +01:00
Laurent Destailleur
f039008282
Fix reponsive
2020-02-27 16:33:24 +01:00
Laurent Destailleur
957295ee2d
Fix look and feel v11
2020-02-27 01:12:53 +01:00
Laurent Destailleur
3d436eb645
Merge pull request #13208 from oscim/patch-25
...
Update emailcollector_card.php
2020-02-26 16:22:28 +01:00
Laurent Destailleur
aba29207a3
Fix param lost
2020-02-26 16:10:12 +01:00
Laurent Destailleur
4370bf8fdc
FIX Use GETPOST instead of POST
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 15:44:54 +01:00
Laurent Destailleur
8ceafa2624
FIX Use GETPOST instead of POST
2020-02-26 15:21:52 +01:00
stickler-ci
0e91b9e5ec
Fixing style errors.
2020-02-26 07:20:08 +00:00
oscim
2522d1e31b
Update emailcollector_card.php
...
support hook for add action
2020-02-26 08:15:49 +01:00
Laurent Destailleur
2c6e7f2917
Tooltip for example on IP restrictions
2020-02-25 13:40:19 +01:00
Laurent Destailleur
32d74adf20
NEW Truncate columns names when too long and show full title as popup
2020-02-24 21:18:49 +01:00
stickler-ci
028566616d
Fixing style errors.
2020-02-19 11:07:42 +00:00
John Botella
6acf10c0d4
extend retained warranty to be available for all invoices
2020-02-19 11:54:55 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
b618581692
More ajax button in setup. Can reload after on ajaxonoff.
2020-02-18 09:38:34 +01:00
Laurent Destailleur
4b5cda5cd2
Code comment on OAUth ahtent
2020-02-16 21:16:00 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
52aebce789
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-16 18:16:05 +01:00
Laurent Destailleur
5b87b12e64
FIX Vulnerability reported by code16
2020-02-16 18:06:25 +01:00
Laurent Destailleur
35ada37d4d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/filefunc.inc.php
2020-02-14 19:14:26 +01:00
Laurent Destailleur
4f1c8e7f53
FIX #10203
2020-02-13 12:18:26 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
8518e0752f
NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page
2020-02-11 16:01:32 +01:00
Laurent Destailleur
94d6fa06dc
FIX #13022
2020-02-09 18:34:53 +01:00
Laurent Destailleur
df7cdd1da8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/export_files.php
htdocs/comm/mailing/class/advtargetemailing.class.php
htdocs/core/tpl/advtarget.tpl.php
2020-02-08 15:42:35 +01:00
ksar
e951743077
Update export_files.php
...
Remove Warning
2020-02-08 15:04:27 +01:00
ksar
b5da9763ce
Update export_files.php
...
Remove Warning
2020-02-06 12:15:18 +01:00
ksar
16fdab6089
Update export_files.php
...
REmove the Warning
2020-02-06 12:12:20 +01:00
Laurent Destailleur
5aa4f9b5ae
Fix phpcs
2020-02-05 21:58:53 +01:00
Laurent Destailleur
8ab96447c7
Page of permissions is cleaner now
2020-02-05 21:31:28 +01:00
Laurent Destailleur
bd90cdf492
FIX #13023
2020-02-05 13:03:43 +01:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
Laurent Destailleur
ffa847bc8e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-02 19:32:37 +01:00
Laurent Destailleur
075b1ea744
FIX Log of authentication ko or ko + CVE-2020-7996
2020-02-02 19:05:38 +01:00
Laurent Destailleur
967d97ccd7
FIX CVE-2020-7994
2020-02-02 15:01:57 +01:00
Laurent Destailleur
bd322dc12e
Fix search on country
2020-02-02 12:59:11 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
7b10c2440b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:42 +01:00
Laurent Destailleur
a9d917a3f0
Fix phpcs
2020-01-29 22:40:10 +01:00
Laurent Destailleur
1e879126cd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-01-29 19:28:06 +01:00
Laurent Destailleur
633ba666aa
Add info of email reference syntax to help debug.
2020-01-29 19:26:04 +01:00
Laurent Destailleur
2ccfdce178
var not defined
2020-01-29 14:41:06 +01:00
Laurent Destailleur
65e8113373
Look and feel v11
2020-01-29 14:23:44 +01:00
Laurent Destailleur
7c34d97e2d
Fix messages for SPF
2020-01-29 13:10:16 +01:00
ptibogxiv
ab0d60065d
Update delais.php
2020-01-28 21:27:45 +01:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Laurent Destailleur
40636adb56
Enhance #12865
...
No need of option. A new parameter on url is enough.
2020-01-28 03:34:56 +01:00
Laurent Destailleur
c2c80bf40f
Fix Look and feel v11
2020-01-28 02:44:41 +01:00
Laurent Destailleur
0f2141269a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
de6b30be8c
Look and feel v11
2020-01-25 13:06:10 +01:00
Laurent Destailleur
27a0858050
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
Laurent Destailleur
553107258e
Fix alignement
2020-01-22 17:00:54 +01:00
Laurent Destailleur
b6e7b228ee
Removed useless vars in setup
2020-01-22 01:24:04 +01:00
Laurent Destailleur
a9790f355d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 11:32:40 +01:00
Laurent Destailleur
54a0d97891
Fix responsive
2020-01-21 10:48:15 +01:00
Laurent Destailleur
d2cf4c55ee
Fix label of status
2020-01-20 23:58:01 +01:00
Laurent Destailleur
5b86851cf3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:46:52 +01:00
Laurent Destailleur
5cac54b2e1
Doc
2020-01-20 18:46:13 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc
FIX field 'private' on email templates was not managed.
2020-01-20 18:38:53 +01:00
Laurent Destailleur
65fef47bdb
Enable new pdf templates as stable
2020-01-20 01:05:30 +01:00
Laurent Destailleur
526ae83e8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:04 +01:00
Laurent Destailleur
e803e06c0d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/commande/class/commande.class.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/exports/export.php
2020-01-19 19:01:46 +01:00
Laurent Destailleur
041d5aeb46
FIX XSS vulnerability in description of list of audit events.
2020-01-19 18:55:22 +01:00
Laurent Destailleur
6a958dd45b
FIX XSS vulnerability in description of list of audit events.
2020-01-19 18:51:37 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
c578752714
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-17 11:52:49 +01:00
Laurent Destailleur
26e450fb2a
Fix extension of backup file
2020-01-17 11:52:21 +01:00
Laurent Destailleur
48c077af56
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-17 11:39:46 +01:00
Laurent Destailleur
2099e05f22
Fix translation
2020-01-17 11:39:22 +01:00
Laurent Destailleur
9c1e409feb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-17 11:35:16 +01:00
Laurent Destailleur
906110dc1d
Fix backup. Recommended compression is gzip.
2020-01-17 11:34:31 +01:00
Scrutinizer Auto-Fixer
0aa156db78
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-16 01:54:00 +00:00
Laurent Destailleur
ace43a4227
Fix message
2020-01-16 01:40:14 +01:00
Laurent Destailleur
8f73bce878
Add warning if zip lib missing
2020-01-16 01:11:39 +01:00
Laurent Destailleur
2e70739fe0
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 21:50:32 +01:00
Laurent Destailleur
1de62b1f44
Doc
2020-01-15 21:50:11 +01:00
Laurent Destailleur
d708fcac5e
Fix deploy module
2020-01-15 21:49:17 +01:00
Laurent Destailleur
2c40e4be94
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 20:13:45 +01:00
Laurent Destailleur
ed0e4b53d4
Fix error in mysqldump
2020-01-15 16:11:31 +01:00
Laurent Destailleur
6e367b6406
Fix detection
2020-01-15 12:56:36 +01:00
Tobias Sekan
503671a307
Fix lint error
2020-01-15 10:21:36 +01:00
Tobias Sekan
c47da64476
A few fixes
2020-01-15 10:13:55 +01:00
Tobias Sekan
a893b42202
Show extra short php function overview
2020-01-15 10:02:18 +01:00
Laurent Destailleur
ffd12cd44e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-13 13:44:44 +01:00
Laurent Destailleur
03a1897089
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/stocks.lang
2020-01-13 13:44:32 +01:00
Laurent Destailleur
ed2c75a2f8
Merge pull request #12776 from aspangaro/12.0_a4
...
NEW Add social networks of the company
2020-01-13 13:38:16 +01:00
Laurent Destailleur
5740d17450
Better help
2020-01-13 12:10:20 +01:00
Laurent Destailleur
58e5eeabdd
Fix to be able to use zip signature
2020-01-11 11:15:50 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Laurent Destailleur
ecdd43f770
Fix: If signature is zipped, we must unzip it first
2020-01-07 16:22:58 +01:00
Laurent Destailleur
9e6fb7b2f1
Look and feel v11
2020-01-07 14:55:31 +01:00
Laurent Destailleur
afd32135f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
d3d7592072
FIX Warning for some country must appears if company is in this country.
2020-01-01 22:26:47 +01:00
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +01:00
Alexandre SPANGARO
9879a43cf4
NEW Add social networks of the company
2019-12-30 21:17:41 +01:00
Laurent Destailleur
ece8390277
Add tables to store translation of all objects (like llx_product_lang)
2019-12-26 13:23:18 +01:00
Laurent Destailleur
ea4c236311
fix alignment
2019-12-26 13:05:03 +01:00
VESSILLER
e03222b831
FIX var transkey not defined in input hidden
2019-12-23 14:38:01 +01:00
Laurent Destailleur
07c1a5717e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00
Laurent Destailleur
d59357d88d
Fix help
2019-12-22 21:34:52 +01:00
Laurent Destailleur
693551069b
Fix look and feel v11
2019-12-22 21:32:35 +01:00
Laurent Destailleur
30b8affdb7
Fix look and feel v11
2019-12-22 21:32:19 +01:00
Laurent Destailleur
05a7e62bf4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-22 12:56:25 +01:00
Laurent Destailleur
e2451bcd26
Update images
...
Fix value of delay for warning on project not closed
2019-12-21 17:11:21 +01:00
Laurent Destailleur
ad039ff968
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/repair.php
2019-12-21 14:03:45 +01:00
Laurent Destailleur
583aa3c619
CSS
2019-12-20 11:50:13 +01:00
Laurent Destailleur
92da6c7549
Fix hash for ping
2019-12-20 11:41:18 +01:00
Laurent Destailleur
2ae779a13e
Fix can set zero as value for max number of decimal
2019-12-19 11:08:42 +01:00
Laurent Destailleur
dd0a1b3e10
Merge branch 'develop' into develop_project
2019-12-19 10:56:03 +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
4a734e53a6
Fix column too low.
...
Fix automatic event not found if from a module with several objects
2019-12-17 14:47:58 +01:00
Laurent Destailleur
6e2e02fd40
Look and feel v11
2019-12-16 21:06:32 +01:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
28bcb49957
Fix css
2019-12-16 11:32:27 +01:00
Laurent Destailleur
d979f6f0f4
Debug module ticket. Add error if sender email is not defined.
2019-12-15 20:02:56 +01:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
17b9964678
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2019-12-14 14:43:14 +01:00
Laurent Destailleur
a8de7b850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/admin/system/filecheck.php
2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
9f2a628c3b
Remove bak file
2019-12-14 13:25:21 +01:00
Frédéric FRANCE
50937f8ca1
Update filecheck.php
2019-12-13 12:56:48 +01:00
Frédéric FRANCE
6e64a20f9e
Update filecheck.php
2019-12-13 11:16:46 +01:00
Frédéric FRANCE
a923a48e64
Update filecheck.php
2019-12-13 10:44:12 +01:00
Laurent Destailleur
95141550fa
NEW Support of deployement of metapackages
2019-12-12 15:40:06 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
66805a502a
doxygen
2019-12-11 22:53:57 +01:00
Frédéric FRANCE
c98ab917dd
doxygen
2019-12-11 20:33:58 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo
2019-12-11 19:11:13 +01:00
Laurent Destailleur
ae6d536d1d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Laurent Destailleur
652e99600a
Look and feel v11
2019-12-09 09:43:38 +01:00
Florian Mortgat
4846885eea
NEW 9.0: enable user to use the mysqldump '--quick' option
...
(useful if the server has low RAM or large tables)
2019-12-02 16:54:05 +01:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Laurent Destailleur
f5f8459930
Look and feel v11
2019-11-28 12:50:38 +01:00
Scrutinizer Auto-Fixer
5f99e25c45
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Laurent Destailleur
1e84b0ea97
Merge pull request #12522 from Dolibarr/scrutinizer-patch-15
...
Scrutinizer Auto-Fixes
2019-11-28 12:19:43 +01:00
Laurent Destailleur
c22fea52e5
Fix do not ping name of server
2019-11-27 11:38:30 +01:00
Scrutinizer Auto-Fixer
057ab6a059
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-26 11:52:04 +00:00
Laurent Destailleur
334265ee6e
Merge pull request #12510 from frederic34/patch-8
...
fk_user fk_usergroup are int
2019-11-26 09:21:27 +01:00
Laurent Destailleur
1f8361ea9e
Tooltip
2019-11-25 21:02:26 +01:00
Frédéric FRANCE
d280eef1e0
Update expensereport_rules.php
2019-11-25 20:12:51 +01:00
Laurent Destailleur
712ae48e4e
Fix default setup
2019-11-24 18:07:38 +01:00
Laurent Destailleur
24bb345ee1
Fix bad name of function
2019-11-22 15:35:19 +01:00
Laurent Destailleur
1ed2eacbef
Debug add email profile
2019-11-22 12:40:17 +01:00
Laurent Destailleur
6191307865
Debug v11
2019-11-22 12:22:27 +01:00
Laurent Destailleur
2f2ac90fbf
Try to disable autocomplete
2019-11-21 21:35:16 +01:00
Laurent Destailleur
c9b79c8aa1
Fix norsh
2019-11-21 20:07:22 +01:00
Laurent Destailleur
ab7c5a7575
Fix connectstring imap
2019-11-21 19:12:25 +01:00
Laurent Destailleur
6ef01a09f3
Fix error management
2019-11-21 18:51:26 +01:00
Laurent Destailleur
f9045aa412
Fix var not defined
2019-11-21 18:39:41 +01:00
Scrutinizer Auto-Fixer
cd7523318d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-19 08:30:26 +00:00
Laurent Destailleur
ae0fdf014f
Debug email collector. Missing unique key. Fix initial setup.
2019-11-18 11:55:22 +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
411e9c87e3
Debug feature to set sender profiles
2019-11-14 11:53:28 +01:00
Laurent Destailleur
52787b56b2
Fix when limit = 0
...
Look and feel v11
2019-11-14 11:00:49 +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
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
f65ce1d5d0
Fix var not declared
2019-11-12 10:17:46 +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
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
Scrutinizer Auto-Fixer
0b406172fd
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-07 11:59:59 +00:00
Laurent Destailleur
2aac4b382f
Merge pull request #12372 from OPEN-DSI/fix-admin-dict-transkey-not-defined
...
FIX var transkey not defined in input hidden
2019-11-07 12:56:21 +01:00
Laurent Destailleur
f29a176423
Merge pull request #12357 from frederic34/patch-19
...
can't edit socialnetwork dict
2019-11-07 11:41:57 +01:00
VESSILLER
146fa461c1
FIX var transkey not defined in input hidden
2019-11-07 11:36:17 +01:00
Frédéric FRANCE
6bd90b7e0a
can't edit socialnetwork dict
2019-11-06 07:29:43 +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
Laurent Destailleur
204475efb9
Removed deprecated file
2019-11-05 19:10:29 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
2f05d79352
Merge pull request #12333 from frederic34/patch-14
...
missing newtoken
2019-11-05 10:06:06 +01:00
Laurent Destailleur
c84a17f58a
Merge pull request #12332 from frederic34/patch-13
...
missing newtoken
2019-11-05 10:05:31 +01:00
Frédéric FRANCE
c6c7d1f5e1
missing newtoken
2019-11-04 23:08:00 +01:00
Frédéric FRANCE
5d2386228b
missing newtoken
2019-11-04 23:04:30 +01:00
Frédéric FRANCE
77b05553d4
Update agenda_reminder.php
2019-11-04 23:02:43 +01:00
Frédéric FRANCE
96556dfd04
missing newtoken
2019-11-04 23:01:28 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Frédéric FRANCE
6ad983bb7b
Merge remote-tracking branch 'upstream/develop' into escpos
2019-11-04 18:52:29 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Laurent Destailleur
1f6a86e166
Fix look and feel v11
2019-11-04 13:32:34 +01:00
Laurent Destailleur
e2bae297ea
Look and feel v11
2019-11-04 13:27:01 +01:00
Laurent Destailleur
8aa2fd04ad
NEW The integrity checker now show the expected size of files
2019-11-04 13:23:48 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Frédéric FRANCE
5a3347104f
rework an experimental module
2019-11-03 12:57:06 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module
2019-11-03 00:50:58 +01:00
Frédéric FRANCE
59b30b9cec
wip ticket printer
2019-11-02 21:15:48 +01:00
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
02ebbf17e9
Merge pull request #12250 from oscim/patch-8
...
Update modulehelp.php
2019-11-02 13:42:11 +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
Laurent Destailleur
5785cd101a
Merge pull request #12293 from frederic34/patch-18
...
Update translation.php
2019-11-02 11:41:55 +01:00
Frédéric FRANCE
e191dd7cc0
$key is overwriting a variable from outer foreach loop
2019-11-02 11:39:32 +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
e98619745f
Update translation.php
2019-11-01 16:27:30 +01:00
Frédéric FRANCE
12b6e4fae6
Update translation.php
...
Are you sure the usage of print_barre_liste($title... '', 0, '', '', $limit) is correct as it seems to always return null.
2019-11-01 16:25:22 +01:00
Frédéric FRANCE
ec05e8e2c5
$key is overwriting a variable from outer foreach loop
2019-11-01 16:13:40 +01:00
Laurent Destailleur
135e65c4aa
Look and feel v11
...
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Laurent Destailleur
b8803fa8df
Work on MO
2019-10-31 22:56:08 +01:00
Laurent Destailleur
716c2bb531
Work on MO
2019-10-31 22:46:34 +01:00
Laurent Destailleur
f98df3c807
NEW Can edit link to the translation page in website module
2019-10-31 21:09:33 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Laurent Destailleur
645390c990
Work on BOM templates
2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
Laurent Destailleur
4ea69abd89
Merge pull request #12249 from oscim/patch-7
...
Update modulehelp.php
2019-10-30 02:44:32 +01:00
stickler-ci
9cfa20480f
Fixing style errors.
2019-10-29 10:18:10 +00:00
oscim
490ab95dfa
Update modulehelp.php
...
add function modulehelp_prepare_head
2019-10-29 11:12:27 +01:00
oscim
253e1530c1
Update modulehelp.php
...
how not loaded module hidden. If module is hidden, it is not link to display in modulehelp.
except in a specific context defined by the developer. In this case, this ligen blocks the information display capability of the module.
2019-10-29 10:45:57 +01:00
stickler-ci
f0f61ff0fe
Fixing style errors.
2019-10-29 09:41:47 +00:00
oscim
eb73459899
Update modulehelp.php
...
if module is not loaded, or not found, the $objMod display is last $objMod loaded but not this id for display
2019-10-29 10:39:15 +01:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Laurent Destailleur
18aa03defe
Remove not used dangerous code
2019-10-23 15:14:20 +02:00
Laurent Destailleur
1c6df393a7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/supplier/index.php
2019-10-22 02:41:10 +02:00
Laurent Destailleur
6205913056
FIX CVE-2019-17578 CVE-2019-17577 CVE-2019-17576
2019-10-22 02:35:54 +02:00
Laurent Destailleur
b21bca17de
Add button Save and stay when editing property of web site
2019-10-21 00:55:52 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-20 16:37:18 +02:00
Laurent Destailleur
e550acc688
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-20 13:22:38 +02:00
Laurent Destailleur
bf1b2242ea
Fix no focus if we are on edit mode directly
2019-10-20 13:22:29 +02:00
Frédéric FRANCE
360bf55f5b
clean indent
2019-10-20 01:09:11 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Laurent Destailleur
de396dc9b3
Clean code for order of modules
2019-10-17 19:21:30 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
12f1962085
Better error message when module file is corrupted
2019-10-16 00:40:42 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-14 19:02:46 +02:00
Laurent Destailleur
ef09da8794
Fix CSRF check
2019-10-14 11:45:13 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-11 16:44:25 +02:00
Laurent Destailleur
7ce01c5ceb
Look and feel v11
2019-10-11 14:42:55 +02:00
Laurent Destailleur
60395f2a9c
NEW Look and feel v11: Some setup pages are by default on edit mode
2019-10-11 14:09:26 +02:00
Laurent Destailleur
96dad08db7
Fix option ADD_UNSPLASH_LOGIN_BACKGROUND
2019-10-11 13:51:07 +02:00
Laurent Destailleur
89161910ff
NEW Look and feel v11: Some setup pages are by default on edit mode
2019-10-11 13:45:51 +02:00
Laurent Destailleur
9251f04d63
Update thumbs of themes
2019-10-11 13:26:48 +02:00
Laurent Destailleur
ab8199f71a
Fix avoid deletion of file if we still need it
2019-10-11 11:38:49 +02:00
Laurent Destailleur
de107fb02e
NEW Can set a squarred icon on your company setup
2019-10-11 11:27:05 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-10 23:24:50 +02:00
Laurent Destailleur
aebae5ff83
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
Laurent Destailleur
346e9f3e1b
Fix import of web site
...
Fix sort on constant setup page lost
2019-10-09 15:01:19 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-09 13:40:46 +02:00
Laurent Destailleur
a26281dab3
Merge pull request #12066 from fuhraih/feature1
...
NEW #4301
2019-10-09 11:52:45 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +02:00
Laurent Destailleur
6bfcecf207
Fight against colspan
2019-10-08 16:49:10 +02:00
Laurent Destailleur
f55a4d77e4
css
2019-10-08 16:41:03 +02:00
fuhraih
8aee2fa534
Update dict.php
2019-10-08 15:48:18 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 00:07:27 +02:00
Laurent Destailleur
156eb7fa61
Merge branch '10.0' into hotfix/12041-security-generate-password
2019-10-07 20:22:19 +02:00
Laurent De Coninck
2ba8506608
validate the 0 as min value consecutive; meaning not take that rule into account
2019-10-07 17:53:23 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
...
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
2019-10-07 14:24:22 +02:00
Laurent Destailleur
21ab307cd6
Merge pull request #12020 from frederic34/patch-13
...
Update dav admin
2019-10-07 14:21:30 +02:00
Laurent Destailleur
1a32a3b7f1
Update dav.php
2019-10-07 14:21:22 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
...
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
71e922635b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-07 12:57:52 +02:00
Laurent Destailleur
68a4ab87a2
Fix can set min repeat to 0 for password
2019-10-07 12:57:24 +02:00
Laurent Destailleur
022c67ee68
Merge pull request #12045 from laudeco/hotfix/12041-security-generate-password
...
[fix #12041 ] - Generate password mode perso
2019-10-07 12:54:45 +02:00
Laurent Destailleur
91a922a454
Update security.php
2019-10-07 12:54:28 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-06 15:56:21 +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
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
Laurent Destailleur
7f5ccf4b8e
Remove google+
2019-10-05 19:27:14 +02:00
stickler-ci
a509404636
Fixing style errors.
2019-10-04 16:26:26 +00:00
Laurent De Coninck
c8fb81710f
fix #12041 - Generate password
...
Secure the generate password method "perso".
Now the system checks the minimum possible value. If the value entered
is lower then the system will never trigger the update.
Since the update is done through GET parameters, I also added a check
backend wise. This checks should never be triggered nor in error.
[see: #12041 ]
2019-10-04 18:13:00 +02:00
Laurent Destailleur
503973cec9
FIX Edit of ticket module parameters erased others
2019-10-04 14:04:31 +02:00
Alexandre SPANGARO
ddadff5731
Add globe fa-icon
2019-10-03 21:32:55 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 18:37:14 +02:00
altairis
699a3391c9
FCKeditor setup for tickets
2019-10-03 16:51:05 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 18:59:18 +02:00
Frédéric FRANCE
fe0f190209
Update dav.php
2019-10-02 18:49:05 +02:00
Frédéric FRANCE
eb40d51dda
Update dav.php
2019-10-02 18:32:23 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
a6e429ff32
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-10-02 08:49:00 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 22:03:33 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
...
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 12:25:34 +02:00
Laurent Destailleur
326d176c95
NEW Add last change date of page "Other setup". Can sort on name/date
2019-10-01 12:17:53 +02:00
Laurent Destailleur
322786cabe
Look and feel v10
2019-10-01 11:36:06 +02:00
Laurent Destailleur
6ee17022c0
Fix bad key for type of contact of resources
2019-10-01 11:34:01 +02:00
Laurent Destailleur
35fdaaf355
Fix bad key for type of contact of resources
2019-10-01 11:33:43 +02:00
Frédéric FRANCE
c57c8eee88
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 07:41:10 +02:00
Alexandre SPANGARO
6726a7cbb0
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-10-01 07:07:57 +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
Laurent Destailleur
bd76c1da11
Look and feel v10
2019-10-01 01:35:11 +02:00
Alexandre SPANGARO
8dea427f58
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-30 21:23:27 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-30 19:34:35 +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
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-29 11:28:54 +02:00
Alexandre SPANGARO
8e42ac8cd0
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-28 22:31:08 +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
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-28 00:35:14 +02:00
Alexandre SPANGARO
4b73e09c60
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-27 14:20:53 +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
Laurent Destailleur
f96c9c3bb5
FIX #11931 #11963
2019-09-27 11:51:34 +02:00
Alexandre SPANGARO
e38bb89a2e
NEW Add fa_icon on load_fiche_titre
2019-09-27 11:48:40 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +02:00
Alexandre SPANGARO
f4929c5315
NEW Add fa_icon "tools" for load_fiche_titre
2019-09-25 15:24:52 +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
19c78d42e9
Fix az09 -> aZ09
2019-09-24 14:20:29 +02:00
Laurent Destailleur
db334a3b94
FIX Var not enough sanitized
2019-09-24 14:16:24 +02:00
Laurent Destailleur
7b3e64d67f
NEW Support of Extrafields on Leave requests.
2019-09-24 12:01:18 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
a005408d83
NEW Accountancy - Add an option to hide FAQ on index and add widget in area
2019-09-23 20:42:50 +02:00
Alexandre SPANGARO
bf6fd2a5e2
Translate & style
2019-09-20 09:25:46 +02:00
Alexandre SPANGARO
278312f38f
Translate
2019-09-20 07:02:14 +02:00
Alexandre SPANGARO
b3807bbb20
Merge branch 'develop' into 11.0_translation
2019-09-19 22:34:43 +02:00
Alexandre SPANGARO
4819414d3a
Translate and some fix
2019-09-19 22:33:26 +02:00
Laurent Destailleur
9bf387d43c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/main.inc.php
htdocs/user/card.php
2019-09-18 15:12:38 +02:00
Laurent Destailleur
7b512587aa
FIX XSS
2019-09-18 14:15: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
477c0e2aa4
Merge pull request #11897 from aspangaro/11.0_colorization
...
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-15 10:40:34 +02:00
Alexandre SPANGARO
21e27389d4
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-14 20:58:12 +02:00
Frédéric FRANCE
6444c7378f
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 16:40:23 +02:00
Laurent Destailleur
9934f73574
Update ldap_groups.php
2019-09-14 16:36:04 +02:00
Laurent Destailleur
7965804a34
Update ldap_groups.php
2019-09-14 16:35:00 +02:00
Frédéric FRANCE
6f33874d75
add entity
2019-09-12 21:13:00 +02:00
Abbes Bahfir
5183a1ec7a
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
2019-09-11 22:45:52 +01:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary
2019-09-11 22:27:09 +02:00
Laurent Destailleur
8381b93e80
Fix init of public holidays
2019-09-09 11:06:54 +02:00
Laurent Destailleur
231725e351
Fix scrutinizer
2019-09-06 19:12:43 +02:00
Laurent Destailleur
09d6826e62
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
2e8c915b88
Fix more consistent setup
2019-09-06 02:39:08 +02:00
Laurent Destailleur
80daf29d79
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
Conflicts:
htdocs/fourn/commande/card.php
2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
2019-09-06 01:52:51 +02:00
Laurent Destailleur
37a32af7b0
NEW Add dictionary to store public holidays.
2019-09-05 20:19:13 +02:00
Laurent Destailleur
e7e663a27e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-05 17:57:41 +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
f2f2621da8
FIX Can't save setup of mailman module
2019-09-04 11:33:07 +02:00
Laurent Destailleur
b445c0eec7
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
2019-09-03 22:40:26 +02:00
Laurent Destailleur
0a17e6bfd5
FIX Several pb in export of documents
...
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2019-09-03 22:39:24 +02:00
Laurent Destailleur
7438eecc64
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/type.php
2019-09-02 04:41:43 +02:00
Laurent Destailleur
a269082d70
Replace deprecated code with new one
2019-09-02 03:58:00 +02:00
Laurent Destailleur
f6c2fb77ae
Fix scrutinizer
2019-09-01 22:02:48 +02:00
Laurent Destailleur
df6472254d
Fix var not defined
2019-08-31 13:31:08 +02:00
Laurent Destailleur
b6adfed070
Fix var not defined
2019-08-31 13:09:31 +02:00
Laurent Destailleur
2f49fc6a7b
Fix scrutinizer
2019-08-31 02:49:54 +02:00
Laurent Destailleur
9fd4f839ec
Use css "pictomodule" for picto of modules
2019-08-28 19:28:50 +02:00
Laurent Destailleur
784f5ec097
Fix bad name of hidden constant
2019-08-27 03:23:25 +02:00
Laurent Destailleur
5c13f5d397
Update dolibarr_export.php
2019-08-26 16:33:38 +02:00
Laurent Destailleur
6771af4565
Update dolibarr_export.php
2019-08-26 16:33:22 +02:00
schhub
3c706ae28a
Update dolibarr_export.php
2019-08-23 08:53:43 +02:00
schhub
264763f6b7
Update dolibarr_export.php
2019-08-23 08:31:50 +02:00
schhub
9d3b4eb699
Update dolibarr_export.php
2019-08-23 08:05:44 +02:00
schhub
5bab233252
Delete action correction for documents backup.
...
correction of delete action always trying to delete files in document/admin/backup directory. Documents backups are stored in documents/admin/documents directory. If preg_match is too "heavy" it can be replaced by strpos.
2019-08-22 13:19:45 +02:00
Laurent Destailleur
30266b00eb
Trans
2019-08-22 01:25:25 +02:00
Laurent Destailleur
f5aede8256
NEW GeoIP v2 support is natively provided.
2019-08-21 19:38:45 +02:00
Laurent Destailleur
bfbabbf626
Update geoip v1
2019-08-21 18:26:41 +02:00
Laurent Destailleur
54203dda1f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2019-08-21 16:25:48 +02:00
Laurent Destailleur
9bd229bc7a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/admin/modules.php
2019-08-21 16:04:34 +02:00
Laurent Destailleur
ed7480ddbb
Fix phpcs
2019-08-21 16:03:49 +02:00
Laurent Destailleur
1b21905c55
Fix test on uploaded modules
...
Conflicts:
htdocs/admin/modules.php
2019-08-21 14:53:58 +02:00
Laurent Destailleur
e75d7e4686
Fix test on uploaded modules
2019-08-21 14:51:48 +02:00
Laurent Destailleur
85356603d0
Fix test on uploaded modules
2019-08-21 14:51:18 +02:00
Laurent Destailleur
70dc68426b
Param
2019-08-21 13:12:37 +02:00
Laurent Destailleur
ae3d232797
Look and feel
2019-08-21 04:48:47 +02:00
Laurent Destailleur
2c3b2cd1a0
Look and feel
2019-08-21 04:21:43 +02:00
Laurent Destailleur
bfe6f4a163
Fix RESTRICT_ON_API
2019-08-20 20:32:17 +02:00
Laurent Destailleur
fd3f890f7b
NEW Can restrict access using DAV module to some host IPs only
2019-08-20 14:15:04 +02:00
Laurent Destailleur
54234e011f
Add version of Sabre lib, add log on login errors.
...
Add compatibility with twoauth
2019-08-20 13:26:56 +02:00
Laurent Destailleur
fb8e66a662
Trans
2019-08-19 18:34:54 +02:00
Laurent Destailleur
b8e1cc8d16
Enhance #11643
2019-08-18 03:42:38 +02:00
Laurent Destailleur
ee50c41e74
Fix phpcs
2019-08-16 17:34:23 +02:00
Laurent Destailleur
48125fd957
Fix phpcs
2019-08-16 17:32:58 +02:00
Laurent Destailleur
163ae6d81a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-15 20:42:51 +02:00
Laurent Destailleur
12e6dabc43
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-08-15 20:41:56 +02:00
Laurent Destailleur
f4e58aab22
FIX Enable web site
2019-08-13 04:49:49 +02:00
Laurent Destailleur
155d41ee80
FIX Enable web site
2019-08-13 04:49:12 +02:00
Laurent Destailleur
8ad2081555
NEW Can select website templates from available default templates
2019-08-12 22:19:24 +02:00
Laurent Destailleur
a35a999d74
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 02:52:53 +02:00
Laurent Destailleur
00660d4885
Fix responsive
2019-08-12 02:52:36 +02:00
Laurent Destailleur
86d39b435b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 02:42:11 +02:00
Laurent Destailleur
49e2f447a8
Fix responsive
2019-08-12 02:41:27 +02:00
Ferran Marcet
cda8b15c7f
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
2019-08-05 14:00:15 +02:00
Laurent Destailleur
3d8f6dca76
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 16:30:32 +02:00
Laurent Destailleur
d6ae62478c
FIX #10984 FIX reposition on "Build backup" button
...
FIX Fatal error on dol_htmloutput_mesg with corrupted array
2019-08-01 15:42:44 +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
Laurent Destailleur
8f2e781df6
FIX #11537
2019-08-01 12:42:12 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
...
NEW Management of retained warranty on situation invoices
2019-07-30 21:53:09 +02:00
Laurent Destailleur
ecc0b4ed32
Add prefixsession in event table
2019-07-29 02:16:21 +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
f5afc50067
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
2019-07-22 18:47:35 +02:00
Alexandre SPANGARO
2c74caff90
WIP
2019-07-22 06:56:55 +02:00
Laurent Destailleur
f0f0b989e9
FIX Add warning when setup is strange
2019-07-21 16:41:01 +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
20e58bdd97
FIX Limit of uploaded files (max_post_size was not used)
2019-07-20 13:09:25 +02:00
Laurent Destailleur
9f9598ac99
FIX missing token
2019-07-20 11:44:54 +02:00
Laurent Destailleur
e85c2202e8
FIX missing token
2019-07-20 11:44:31 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries
2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
327e5ebe78
FIX Show list of events on tickets
2019-07-19 19:09:38 +02:00
Laurent Destailleur
f745d01bf3
Prepare change of properties "titre" into "title"
2019-07-19 13:22:54 +02:00
Laurent Destailleur
278c2d7152
Enhance the perf page
2019-07-19 12:58:21 +02:00
Laurent Destailleur
fe89e158fe
Fix: Avoid deletion of system entries in dictionary
2019-07-19 04:03:33 +02:00
Laurent Destailleur
2afefada40
Fix: Avoid deletion of system entries in dictionary
2019-07-19 04:02:42 +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
b9fe874b5f
Revert "Merge pull request #11022 from altatof/freetext"
...
This reverts commit 879b4d8e7fddc01b4c27
2019-07-18 18:19:51 +02:00
Laurent Destailleur
c27ac63a3a
Revert "Fix phpcs"
...
This reverts commit 03e5cc16ca
2019-07-18 18:18:07 +02:00
Laurent Destailleur
a09d33b427
Fix responsive
2019-07-18 17:47:00 +02:00
Laurent Destailleur
03e5cc16ca
Fix phpcs
2019-07-18 17:33:47 +02:00
Laurent Destailleur
879b4d8e7f
Merge pull request #11022 from altatof/freetext
...
NEW : manage output languages for free text
2019-07-18 17:29:45 +02:00
Laurent Destailleur
c1df3ae5c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 11:10:18 +02:00
Laurent Destailleur
a23bae6c96
Work to mke the page perf.php public by default.
2019-07-18 11:10:09 +02:00
Alexandre SPANGARO
21bd46fc15
Merge remote-tracking branch 'upstream/develop' into 11.0_salaries
2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda
NEW Extrafields on salaries
2019-07-17 14:09:25 +02:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Frédéric FRANCE
61c83117fe
Update ihm.php
2019-07-09 15:18:51 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
69db6e6aa7
Fix look and feel v10
2019-07-05 18:45:13 +02:00
Laurent Destailleur
ee109ac568
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-05 17:44:50 +02:00
Laurent Destailleur
42576eb27a
Fix status of email templates not visible for non admin users
2019-07-05 17:22:13 +02:00
Laurent Destailleur
5c6684bb73
Fix setup of ticket module
2019-07-05 11:53:33 +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
John Botella
a75a2ae8e4
Fix missing hidden input and short label
2019-07-02 15:44:42 +02:00
John Botella
9c2e83dcae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-07-01 09:51:26 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
John Botella
75b55ac5d6
fix travis recommendations
2019-06-28 16:10:41 +02:00
John Botella
8b7c260180
fix travis recommendations
2019-06-26 12:13:52 +02:00
John Botella
a8157f865e
fix travis recommendations
2019-06-26 11:59:35 +02:00
John Botella
ee98f3e6d7
fix travis recommendations
2019-06-26 10:48:22 +02:00
John Botella
7e14a598e2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-26 09:43:43 +02:00
John Botella
6b165d4a15
Fix function name and doc
2019-06-25 09:07:04 +02:00
Laurent Destailleur
a7bd734ece
Rename ->produit into ->product. Still permissions to rename.
2019-06-24 21:18:49 +02:00
John Botella
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Laurent Destailleur
2e5b4ee4e7
Fix phpcs
2019-06-23 19:32:29 +02:00
Laurent Destailleur
76f394cc43
Fix phpcs
2019-06-22 18:58:14 +02:00
Laurent Destailleur
eb20df8e64
Fix debug save of state into setup
2019-06-22 14:47:46 +02:00
Laurent Destailleur
22b91f3693
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 13:28:44 +02:00
Laurent Destailleur
ee8ddb5744
Fix link to fix table charset
2019-06-22 13:23:00 +02:00
Laurent Destailleur
9644b9c669
Merge pull request #10932 from tony13tv/patch-6
...
[CHANGE] Make State available in .odt templates...
2019-06-22 11:26:32 +02:00
Laurent Destailleur
e9a8eb19bb
Update company.php
2019-06-22 11:24:21 +02:00
Laurent Destailleur
3afa4175db
Update company.php
2019-06-22 11:22:04 +02:00
Laurent Destailleur
4ffa48d9bd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 13:50:47 +02:00
Laurent Destailleur
afb6362317
Fix look and feel v10
...
Fix link to direct debit payment order
2019-06-20 13:37:06 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
...
NEW add extrafields in warehouses
2019-06-20 03:16:49 +02:00
Laurent Destailleur
7afcdb46eb
Debug module ticket
2019-06-19 12:10:05 +02:00
Laurent Destailleur
08d5ca4ddb
Debug page to export accounting documents
2019-06-17 17:53:43 +02:00
Laurent Destailleur
a7ca177100
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-06-14 13:58:19 +02:00
Laurent Destailleur
239e41f6c4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-14 13:57:49 +02:00
Laurent Destailleur
e6b6246fea
Merge pull request #11334 from atm-florianm/8.0_FIX-print-dictionaries-escape
...
FIX: in edit mode, dictionary inputs do not escape the string inside …
2019-06-14 13:36:06 +02:00
atm-florian.m
787e1319b9
FIX: in edit mode, dictionary inputs do not escape the string inside the 'value' attribute, causing errors if there are any double quotes
2019-06-13 16:21:07 +02:00
Laurent Destailleur
bf6f9dd7ea
Fix phpcs
2019-06-12 13:58:48 +02:00
Laurent Destailleur
27a5f1172b
Merge pull request #11322 from aspangaro/10.0_b3
...
FIX Define company opening hours information
2019-06-12 12:12:02 +02:00
Laurent Destailleur
5554bd231f
Update openinghours.php
2019-06-12 12:11:06 +02:00
Laurent Destailleur
6d5637c389
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/admin/multicurrency.php
htdocs/core/actions_massactions.inc.php
2019-06-12 12:03:46 +02:00
Laurent Destailleur
2d52537106
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-12 10:07:08 +02:00
Alexandre SPANGARO
293048f9fb
NEW Define company opening hours information
2019-06-11 22:10:28 +02:00
florian HENRY
beb2a0131c
fix travis
2019-06-06 16:11:12 +02:00
Maxime Kohlhaas
9c7c1ddceb
Fix multicurrency setup page
2019-06-06 11:20:10 +02:00
florian HENRY
d98ce172ad
multicurrency:fix display error message on failed update
2019-06-05 17:26:37 +02:00
Laurent Destailleur
0c331602e8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-06-04 20:03:51 +02:00
Laurent Destailleur
ab77051317
Fix time delay for purge
2019-06-04 20:03:27 +02:00
John BOTELLA
d7a393bbd3
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-04 14:00:18 +02:00
Laurent Destailleur
fd50e68f9a
Fix look and feel v10
2019-06-04 02:15:52 +02:00
Lionel VESSILLER
439eafb637
NEW add extrafields in warehouses
...
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
2019-06-03 15:44:17 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Laurent Destailleur
18f1952e2d
Fix set of properties
2019-05-22 14:49:18 +02:00
Laurent Destailleur
5707aff7c4
Look and feel v10
2019-05-21 21:52:04 +02:00
Laurent Destailleur
0415edb8cd
Fix phpcs
2019-05-21 16:17:32 +02:00
Laurent Destailleur
657bd5c2fe
Move module from develop to experimental
2019-05-21 15:50:16 +02:00
Laurent Destailleur
e463b17c15
Fix look and feel v10
2019-05-21 15:31:56 +02:00
Laurent Destailleur
42f5ebed2d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/external_rss.php
htdocs/admin/system/database-tables.php
htdocs/admin/tools/export_files.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/lib/files.lib.php
htdocs/core/lib/functions.lib.php
2019-05-21 15:13:25 +02:00
Laurent Destailleur
61ead06950
Fix Injection
2019-05-21 14:35:05 +02:00
Laurent Destailleur
479f8616e1
Fix sanitize data
2019-05-21 14:03:28 +02:00
Laurent Destailleur
ae3605d82d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf.php
htdocs/core/class/extrafields.class.php
2019-05-20 15:47:06 +02:00
Laurent Destailleur
2a2fcf6784
FIX only profid1 to 4 were editable for pdf option to show. Not 5 and 6.
2019-05-20 15:38:33 +02:00
Laurent Destailleur
5f23cf7e2a
CSS
2019-05-19 13:51:47 +02:00
Laurent Destailleur
2bbb04085e
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
Maxime Kohlhaas
6c195d7bdf
Add warning delay for holidays
2019-05-18 17:07:29 +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
e95acc9a81
Add warning if missing module
2019-05-17 13:19:22 +02:00
Laurent Destailleur
a664cd6461
Fix check when uploading a non image as user photo
2019-05-10 20:09:41 +02:00
Laurent Destailleur
1206e465d9
Fix function name
2019-05-10 18:19:10 +02:00
Laurent Destailleur
0bd4c61009
Fix default setup of module workflow was not set
2019-05-10 18:15:09 +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
e87a32e92f
Fix Try to fix DAV pb with some buggy clients by disabling browser
2019-05-10 09:53:10 +02:00
Juanjo Menent
e36df726a1
Merge remote-tracking branch 'upstream/9.0' into 9.0
2019-05-09 20:42:04 +02:00
Juanjo Menent
2b182c1cc1
FIX : #11097
2019-05-09 20:39:30 +02:00
Laurent Destailleur
46b0545c4a
Debug module reception
2019-05-09 17:26:06 +02:00
Laurent Destailleur
57911150d1
CSS
2019-05-09 16:50:22 +02:00
Laurent Destailleur
52153d6aa2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-09 12:38:27 +02:00
Laurent Destailleur
af8d2e0e1a
Fix error message when module disabled
2019-05-09 12:31:51 +02:00
Laurent Destailleur
9115df7439
Debug v10
2019-05-03 11:25:53 +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
ae7ba162f2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-05-02 14:37:46 +02:00
Laurent Destailleur
e81f10c790
Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION
2019-05-02 13:45:49 +02:00
Laurent Destailleur
5145680279
Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION
2019-05-02 13:31:47 +02:00
Laurent Destailleur
4a81e8fd62
Debug call to apilayer
2019-05-02 13:24:28 +02:00
Laurent Destailleur
9955af5194
Debug ticket module
2019-05-01 17:53:41 +02:00
Laurent Destailleur
50b1a54dca
FIX Update/delete currency on same languages
2019-05-01 14:06:30 +02:00
Laurent Destailleur
3bda9be775
Fix error 500
2019-05-01 13:46:45 +02:00
Laurent Destailleur
8091cff009
Can edit param of operation for email collector
2019-04-29 15:44:16 +02:00
Laurent Destailleur
4bd732cc40
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
htdocs/core/class/utils.class.php
htdocs/langs/en_US/website.lang
2019-04-25 23:25:21 +02:00
Laurent Destailleur
01075081cb
FIX CVE-2019-11200
2019-04-25 22:25:19 +02:00
Laurent Destailleur
10dde837d0
Debug email collector
2019-04-25 19:32:48 +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
Laurent Destailleur
d64e6a6a1b
Merge branch 'develop' into patch-6
2019-04-25 02:54:03 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
Christophe Battarel
c157cfad74
add freetextsubstitutionexclude parameter
2019-04-16 16:21:32 +02:00
Christophe Battarel
502b1e4d31
add lang management to freetext
2019-04-16 16:16:37 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
Laurent Destailleur
d728af9ced
Add the test for ckeditor with mode "inline" in setup page of ckeditor
2019-04-12 17:44:22 +02:00
Laurent Destailleur
cf058e7d3b
NEW Ask date of invoice when using the Clone feature.
2019-04-12 12:12:08 +02:00
Laurent Destailleur
203cbd56c2
Finished debug of emailcollector module
2019-04-10 17:35:33 +02:00
Laurent Destailleur
05c14e4f2f
Look and feel v10
2019-04-10 15:54:29 +02:00
Laurent Destailleur
2eeb4b8734
Debug ticket module
2019-04-10 15:45:55 +02:00
Laurent Destailleur
26594fab98
Debug module ticket
2019-04-10 15:11:38 +02:00
Laurent Destailleur
ff629b2355
NEW Color for hover and for checked line is on by default
2019-04-09 15:57:26 +02:00
Laurent Destailleur
f9860e1425
Work on email collector
2019-04-09 13:23:30 +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
22ca858b36
Enhance setup of email collector
2019-04-07 18:32:01 +02:00
Laurent Destailleur
fad2fa48dd
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
2019-04-07 15:44:17 +02:00
Laurent Destailleur
0091b65a83
Fix phpcs
2019-04-01 18:10:14 +02:00
Laurent Destailleur
c959c8b645
Fix api with prestashop
2019-03-31 18:21:00 +02:00
Laurent Destailleur
ecd049b4e6
Debug dolistore
2019-03-31 13:39:51 +02:00
Laurent Destailleur
bb2545c7b4
Clean code
2019-03-31 13:05:35 +02:00
Laurent Destailleur
b10682e5db
Fix search in dolistore
2019-03-31 13:03:38 +02:00
Laurent Destailleur
fca404e8d5
Show price without tax to prepare tax per customer country.
2019-03-30 19:30:58 +01:00
Laurent Destailleur
67c207db12
NEW Better explanation for setup of WebDav module
2019-03-30 11:58:49 +01:00
Laurent Destailleur
80f7cef0a8
Better translation
2019-03-28 09:20:05 +01:00
Cristian Torres
64e91fa25b
[CHANGE] Making State available in .odt templates...
...
...making use of the same strategy when loading Country info from single attribute.
Previously attempted on PR #10463 which has been closed
This also relates to #7428
2019-03-27 17:09:59 -06:00
Laurent Destailleur
d8212d84df
Debug emailcollector
2019-03-26 19:15:18 +01:00
Laurent Destailleur
f991d4ba99
Fix typo
2019-03-26 18:10:28 +01:00
Laurent Destailleur
9eaef2ce7a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/export.php
htdocs/langs/en_US/admin.lang
2019-03-26 12:40:36 +01:00
Laurent Destailleur
1787b31932
FIX setup of module export
2019-03-26 12:18:28 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
82381533dd
Better responsive
2019-03-25 09:14:28 +01:00
Laurent Destailleur
a16b6daa92
Look and feel v10
2019-03-24 16:10:03 +01:00
Laurent Destailleur
77843ddeba
Allow use of log file or not for debugbar
2019-03-23 14:50:28 +01:00
Laurent Destailleur
df9e121ac6
Enhance the module debugbar. Do not scan the log anymore.
2019-03-23 14:37:54 +01:00
Laurent Destailleur
805493f43d
Merge pull request #10894 from grandoc/new_branch_20_03_2019
...
update with html5 compliant code
2019-03-21 18:23:40 +01:00
Philippe GRAND
e17ab64dbd
update with html5 compliant code
2019-03-20 09:56:17 +01:00
Philippe GRAND
569be67317
update with html5 compliant code
2019-03-20 09:55:34 +01:00
Philippe GRAND
dee46173ff
update with html5 compliant code
2019-03-20 09:53:29 +01:00
Philippe GRAND
5e6b451195
update with html5 compliant code
2019-03-20 09:52:33 +01:00
Philippe GRAND
963847c89c
update with html5 compliant code
2019-03-20 09:49:38 +01:00
Philippe GRAND
644743dce8
update with html5 compliant code
2019-03-20 09:47:06 +01:00
Philippe GRAND
427a3fc02d
update with html5 compliant code
2019-03-20 09:35:16 +01:00
Philippe GRAND
819253abee
update with html5 compliant code
2019-03-20 09:32:57 +01:00
Philippe GRAND
6aa4e82e20
update with html5 compliant code
2019-03-20 09:31:28 +01:00
Philippe GRAND
e519bfc64b
update with html5 compliant code
2019-03-20 09:27:28 +01:00
Philippe GRAND
8563d1e867
update with html5 compliant code
2019-03-19 14:19:40 +01:00
Philippe GRAND
1a21799585
update with html5 compliant code
2019-03-19 14:19:01 +01:00
Philippe GRAND
c9cd4260d6
update with html5 compliant code
2019-03-19 14:17:59 +01:00
Philippe GRAND
11c66a88bc
update with html5 compliant code
2019-03-19 14:17:20 +01:00
Philippe GRAND
200e7172ad
update with html5 compliant code
2019-03-19 14:16:42 +01:00
Laurent Destailleur
cb9f30ceeb
Look and feel v10
2019-03-19 10:36:37 +01:00
Laurent Destailleur
6a41819d0f
Enhance the perf page.
2019-03-17 00:55:18 +01:00
Laurent Destailleur
a6add0d8a9
Debug module debugbar
2019-03-17 00:48:12 +01:00
Laurent Destailleur
1abfd1f58e
Add page to setup module debugbar
...
Fix CSS
2019-03-17 00:32:39 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
bcf0dd0168
Merge branch 'develop' into patch-5
2019-03-14 16:47:08 +01:00
Frédéric FRANCE
f25ce3b40c
Update facture.php
2019-03-14 16:43:52 +01:00
Laurent Destailleur
cdf6e4b65a
Fix some PSR rules
2019-03-14 16:43:27 +01:00
Frédéric FRANCE
1222d90537
phpcs fix
2019-03-14 16:40:44 +01:00
Laurent Destailleur
39e6e71b0d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2019-03-14 14:20:34 +01:00
Laurent Destailleur
f8a4d9075b
Fix css for fontawesome 5
2019-03-14 11:48:25 +01:00
Laurent Destailleur
ae6b672204
Look and feel v10
2019-03-13 15:04:38 +01:00
Laurent Destailleur
98ca9bf17a
Reduce quantity of string to translates
2019-03-12 19:44:59 +01:00
Regis Houssin
47057b431d
FIX translation
2019-03-12 07:56:22 +01:00
Regis Houssin
259fa0ac81
FIX check only if invoice module is enabled (bank is check after)
2019-03-12 07:42:25 +01:00
Regis Houssin
94c58072d7
FIX possibility to set up payment mode when invoice module is disabled
2019-03-12 07:29:29 +01:00
Laurent Destailleur
b710e28ffa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent.php
htdocs/admin/barcode.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/admin.lang
2019-03-09 01:20:13 +01:00
Laurent Destailleur
1a96a7a88f
FIX More complete auto setup of barcode module
...
Add tooltip help on member setup module
2019-03-08 11:31:12 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
e67890bd22
NEW Can enter price with or without tax when entering expense repor line
2019-03-07 11:09:04 +01:00
Laurent Destailleur
31c296f44b
Fix bad tooltip to rm file
2019-03-06 20:01:21 +01:00
Laurent Destailleur
e66447eabc
Fix phpcs
2019-03-05 15:53:57 +01:00
Laurent Destailleur
b7066d92cc
More info
2019-03-04 20:37:03 +01:00
Laurent Destailleur
e974a3b2b3
Add more info
2019-03-04 20:36:05 +01:00
Laurent Destailleur
1cfbf5f551
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/security.php
2019-03-04 20:18:23 +01:00
Laurent Destailleur
15138aa543
FIX error on setup of password if pass generators have a .old file.
2019-03-04 20:00:36 +01:00
Laurent Destailleur
ff9b6c2f04
Module ticket
2019-03-04 19:19:20 +01:00
Laurent Destailleur
4a582485b9
Debug module ticket
2019-03-04 19:19:09 +01:00
Laurent Destailleur
bb9a64fd07
Fix phpcs
2019-03-04 17:25:13 +01:00
Laurent Destailleur
d8259f94e1
Work on BOM module
2019-03-04 13:40:16 +01:00
Laurent Destailleur
925def5390
Work on BOM module
2019-03-04 13:37:00 +01:00
Laurent Destailleur
7b7ff33fdf
Work on BOM module
2019-03-04 13:30:43 +01:00
Laurent Destailleur
34c179ab2b
Fix responsive
2019-03-04 10:42:09 +01:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Frédéric FRANCE
9b165f6b3f
add visibility
2019-02-27 20:45:07 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin
2019-02-27 01:16:21 +01:00
Laurent Destailleur
3a2a1b4a56
Debug module ticket
2019-02-26 13:43:09 +01:00
Alexandre SPANGARO
2da1447a0b
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a
NEW: Add LinkedIn field
2019-02-25 09:07:58 +01:00
Frédéric FRANCE
48de805bce
replace html code by html5 in admin
2019-02-23 21:57:35 +01:00
Laurent Destailleur
cdf85b0d00
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-23 16:02:35 +01:00
Laurent Destailleur
0081d3c25d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-23 16:02:10 +01:00
Laurent Destailleur
af6c482f26
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-02-23 16:01:30 +01:00
ptibogxiv
454ab2e866
FIX Stripe live Oauth
2019-02-22 14:54:26 +01:00
Laurent Destailleur
4a3751a054
Fix html5
2019-02-21 19:50:54 +01:00
gauthier
58d82eb477
FIX : function sendEmailsReminder isn't completely developed, then MAIN_FEATURES_LEVEL must be 2 to "use" it
2019-02-21 11:08:55 +01:00
Laurent Destailleur
e6e18ff616
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
2019-02-14 15:33:17 +01:00
Laurent Destailleur
3050366372
Fix table of units already exists. Merge duplicate c_measuring_units
...
with c_units.
2019-02-14 13:02:44 +01:00
Laurent Destailleur
fbfb4ce566
FIX creation of new left menu entry
2019-02-14 10:10:31 +01:00
florian HENRY
dd9896516b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
2019-02-13 12:52:07 +01:00
Laurent Destailleur
5c27ec5d25
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/compta/compta-files.php
2019-02-13 11:21:20 +01:00
florian HENRY
e2d13c0e1f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
Laurent Destailleur
11f48460b2
Fix
2019-02-12 23:26:25 +01:00
Laurent Destailleur
d86017b8ff
Fix create left menu entry
2019-02-12 23:21:53 +01:00
Laurent Destailleur
639dfa09aa
Fix creation of left menu
2019-02-12 23:17:40 +01:00
Laurent Destailleur
1f9f335e44
FIX creation of menu entry with parent id not int
...
Conflicts:
htdocs/admin/menus/edit.php
2019-02-12 19:11:05 +01:00
Laurent Destailleur
986fb2ae38
FIX creation of menu entry with parent id not int
2019-02-12 19:09:27 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Laurent Destailleur
843f7bea8d
Merge pull request #10546 from frederic34/patch-20
...
Update index.php
2019-02-12 13:46:33 +01:00
Laurent Destailleur
205152501e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Frédéric FRANCE
be9cfdae85
Update index.php
2019-02-11 00:05:38 +01:00
Frédéric FRANCE
4d6dcf400e
first parameter of print_liste_field_titre was translated
2019-02-10 17:30:34 +01:00
Frédéric FRANCE
ba32c3b782
first parameter of print_liste_field_titre was translated
2019-02-10 16:06:07 +01:00
Frédéric FRANCE
aecac3632f
wip
2019-02-10 11:08:48 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
7f4bbcf9a5
Some minor fix in default values and modulebuilder
2019-02-09 13:40:22 +01:00
Laurent Destailleur
aa574c2a47
Merge pull request #10517 from frederic34/patch-18
...
fix phpcs
2019-02-08 09:56:50 +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
Frédéric FRANCE
c0686733e8
fix phpcs
2019-02-06 15:56:13 +01:00
Laurent Destailleur
9e28db4202
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
2019-02-06 00:51:10 +01:00
Laurent Destailleur
44f5223c90
Remove warning
2019-02-05 18:54:38 +01:00
Laurent Destailleur
d49dd8d593
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-05 15:16:44 +01:00
Laurent Destailleur
bb8b3d4e5c
Add br
2019-02-05 00:25:42 +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
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found
2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Frédéric FRANCE
b2e2b2e186
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-31 18:27:27 +01:00
Philippe GRAND
0cc8053708
update with html5 compliant code
2019-01-31 12:42:38 +01:00
Philippe GRAND
1cda3106b2
update with html5 compliant code
2019-01-31 12:40:50 +01:00
Philippe GRAND
2a9c378c1f
update with html5 compliant code
2019-01-31 12:35:49 +01:00
Philippe GRAND
ff46a0ee30
update with html5 compliant code
2019-01-31 12:33:01 +01:00
Laurent Destailleur
4c31749f4b
Add tooltip on setup
2019-01-31 11:11:56 +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
Laurent Destailleur
3198f9fbbe
Merge pull request #10441 from aspangaro/10.0_email
...
Move my email to the new one
2019-01-30 14:59:58 +01:00
Laurent Destailleur
6d3529b606
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-30 14:47:28 +01:00
Laurent Destailleur
340412ed00
FIX generation of document for supplie rinvoice
2019-01-30 14:07:50 +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
ecc30b8ffe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2019-01-27 18:27:58 +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
Laurent Destailleur
3c88816bf8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-27 17:44:13 +01:00
Laurent Destailleur
d59097f65c
Fix upload of module file
2019-01-27 17:40:56 +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
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
e42fe4022a
Uniformize lenght of small list
2019-01-25 15:22:36 +01:00
Philippe GRAND
0a45d87f4a
update with html5 compliant code
2019-01-22 11:56:09 +01:00
Philippe GRAND
a75ecc0832
update with html5 compliant code
2019-01-22 11:51:03 +01:00
Philippe GRAND
a609c11383
update with html5 compliant code
2019-01-22 11:48:15 +01:00
Philippe GRAND
05b33c149c
update with html5 compliant code
2019-01-22 11:46:12 +01:00
Philippe GRAND
7a7a7e7aa9
update with html5 compliant code
2019-01-22 11:40:53 +01:00
Philippe GRAND
8d877fd289
update with html5 compliant code
2019-01-22 11:37:23 +01:00
Philippe GRAND
e671c6705c
update with html5 compliant code
2019-01-21 22:37:42 +01:00
Philippe GRAND
218636271a
update with html5 compliant code
2019-01-21 22:36:14 +01:00
Laurent Destailleur
fbf5a1c056
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 20:48:19 +01:00
Laurent Destailleur
3cf81d14e3
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-21 20:47:44 +01:00
Laurent Destailleur
6f553db93d
Remove bad text
2019-01-21 20:47:07 +01:00
Philippe GRAND
37c7837bd3
update with html5 compliant code
2019-01-21 09:52:49 +01:00
Laurent Destailleur
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays
...
Add configurable days to SEPA Withdrawal Execution Date
2019-01-20 19:47:57 +01:00
markus
a45ea9239d
Rename consts and cleanup
2019-01-19 14:24:20 +01:00
ptibogxiv
b3cbbc1b11
FIX lang for dolistore in module.php
2019-01-19 11:41:47 +01:00
ptibogxiv
ff99927f65
FIX lang for dolistore in module.php
2019-01-19 11:18:07 +01:00
markus
de9b8f427d
Add configurable days to SEPA Withdrawal Execution Date
2019-01-18 16:16:55 +01:00
Laurent Destailleur
3187636c1c
Merge pull request #10352 from hregis/develop_mc
...
FIX DAV compatibility with mutlicompany
2019-01-17 18:58:32 +01:00
Philippe GRAND
98e5397e38
update with html5 compliant code
2019-01-17 14:19:15 +01:00
Regis Houssin
528f1d6f5c
FIX DAV add url public
2019-01-17 08:28:51 +01:00
Laurent Destailleur
e7943ae844
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Laurent Destailleur
21741b6409
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 13:57:42 +01:00
Laurent Destailleur
a72d92006b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 13:57:33 +01:00
Philippe GRAND
c743b7803e
Clean code and add translation
2019-01-16 13:15:10 +01:00
Laurent Destailleur
c357cb8c4e
Clean code
2019-01-16 12:42:54 +01:00
Laurent Destailleur
1f87b8bb18
FIX Position of price symbol (before) for nl_NL
2019-01-16 01:54:08 +01:00
ptibogxiv
a4d1c663ef
NEW add company schedule
2019-01-15 13:29:53 +01:00
Laurent Destailleur
1aa2b7a164
FIX SQL injection on rowid of dict.php
2019-01-10 03:26:34 +01:00
Laurent Destailleur
5d0ff28556
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/card.php
2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/admin/defaultvalues.php
htdocs/societe/card.php
2019-01-08 01:53:00 +01:00
Laurent Destailleur
f85389ac29
Fix missing td column
2019-01-08 01:11:34 +01:00
Laurent Destailleur
34413727d8
Fix
2019-01-07 13:50:59 +01:00
Laurent Destailleur
6e078105ab
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
2019-01-06 01:22:10 +01:00
Laurent Destailleur
38ec05f2f1
Fix search filter lost
2019-01-06 01:17:11 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
dbbfdd984a
Fix emailcollector can't be used without syntax rules
2019-01-03 11:47:27 +01:00
Laurent Destailleur
8c1d362e8d
Merge pull request #10286 from ptibogxiv/patch-103
...
New Use ajax switch into on socialnetworks.php
2019-01-02 20:00:44 +01:00
Laurent Destailleur
d613041703
Merge pull request #10282 from ptibogxiv/patch-99
...
NEW: Use ajax swith button on setup of multi-currency module
2019-01-02 19:58:20 +01:00
