Philippe Grand
85513318d0
Update functions.lib.php
2020-10-20 09:30:41 +02:00
Philippe GRAND
5233c6064f
fix : Warning: A non-numeric value encountered in /home/httpd/vhosts/.../domains/httpdocs/core/lib/functions.lib.php on line 4379
2020-10-19 16:30:12 +02:00
Laurent Destailleur
4fe857f5d2
Change picto to close a widget
2020-10-17 17:54:09 +02:00
Laurent Destailleur
5905d3be64
Fix phpcs
2020-10-16 00:06:26 +02:00
Laurent Destailleur
5b37ff0bfd
Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
...
tests.
2020-10-15 19:36:08 +02:00
Laurent Destailleur
20d5098ce2
Fix regression in dol_getdate()
2020-10-14 19:42:17 +02:00
Laurent Destailleur
e8ea7125e5
Removed the FIXME. The dol_getdate can now use a timezone.
2020-10-14 17:11:22 +02:00
Laurent Destailleur
3cf2b6b5eb
Doc comment.
2020-10-14 15:01:50 +02:00
Laurent Destailleur
bc6b5d919a
Better responsive
2020-10-13 10:51:51 +02:00
Laurent Destailleur
cc82a15688
css
2020-10-09 18:43:24 +02:00
Laurent Destailleur
b6fc33c454
Fix avoid error when we sumbit form to change page on conciliation
2020-10-09 11:13:02 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Laurent Destailleur
24d35ff9b5
CSS
2020-10-08 11:52:58 +02:00
Laurent Destailleur
70fa262293
CSS
2020-10-08 09:30:15 +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
d1c2772ee7
NEW Add function dolButtonToOpenUrlInDialogPopup() to be able to open
...
any url into a dialog popup.
2020-10-07 12:31:15 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697
2020-10-06 15:57:50 +02:00
Laurent Destailleur
95f67309e2
Clean code
2020-10-06 15:11:45 +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
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
9b3cd421ee
Fix doc
2020-10-03 14:56:04 +02:00
Laurent Destailleur
3b34c496cc
Code
2020-10-03 14:11:47 +02:00
Laurent Destailleur
581a3d8808
FIX Add a better message when file size is too large
2020-10-03 14:02:53 +02:00
Laurent Destailleur
1e176fad8f
Fix GETPOST on array
2020-09-29 21:28:07 +02:00
Laurent Destailleur
68a6239322
Clean code
2020-09-26 04:25:14 +02:00
Laurent Destailleur
611684a9a7
FIX Substitution for member subscription was not done
2020-09-26 02:39:19 +02:00
Laurent Destailleur
d3e9815cfa
Fix phpunit
2020-09-25 17:48:04 +02:00
Laurent Destailleur
1b83b55995
Fix to exclude possible sql injection
2020-09-25 17:11:54 +02:00
Laurent Destailleur
0d797a793a
On technical error, return http code 500
2020-09-25 15:01:15 +02:00
Laurent Destailleur
95cf3d2f51
NEW Can use desired stock of a given warehouse for replenishment
2020-09-23 23:02:31 +02:00
Laurent Destailleur
5f4547bf7c
Prepare table for future features
2020-09-22 10:38:16 +02:00
Laurent Destailleur
438e884c01
Fix phpcs
2020-09-21 14:17:05 +02:00
Laurent Destailleur
3ca379c9e6
FIX Restore multiselect (selection of prospect level)
...
Conflicts:
htdocs/core/class/html.form.class.php
2020-09-21 12:22:57 +02:00
Laurent Destailleur
6380a294fc
FIX Restore multiselect (selection of prospect level)
2020-09-21 12:16:22 +02:00
Laurent Destailleur
43376b3abc
Removed warning
2020-09-20 21:27:11 +02:00
Laurent Destailleur
2fcc0791ac
Fix regression on backtopage
2020-09-20 19:55:44 +02:00
Laurent Destailleur
b024ce799c
Merge pull request #14782 from b92/patch-1
...
FIX: Members substitution variable not substituted if empty
2020-09-20 17:13:29 +02:00
Laurent Destailleur
2eb46b4900
Enhance antiXSS by excluding non printable chars used to obfuscate hack
2020-09-20 04:56:45 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
b5703350da
Fix escape
2020-09-19 22:41:05 +02:00
Laurent Destailleur
54c0f742b1
Fix escape
2020-09-19 21:19:04 +02:00
Laurent Destailleur
3bd94d52a1
Fix css
2020-09-19 15:15:49 +02:00
Laurent Destailleur
e142b42f19
Clean code
2020-09-19 04:14:49 +02:00
Laurent Destailleur
93b7956156
Fix sanitizing of backtopage
2020-09-19 02:12:08 +02:00
Laurent Destailleur
a0b230fa46
Fix #yogosha4534
2020-09-19 01:58:46 +02:00
Laurent Destailleur
63bc3aa48a
Better sanitizing
2020-09-19 00:05:29 +02:00
Laurent Destailleur
6d2d5d7cae
Fix #yogosha4529
2020-09-19 00:02:38 +02:00
Bernard Saulme
d86f541b35
FIX|members substitution variable not substituted if empty
...
Members substitution variables not substituted if empty for the __MEMBER_ ... variables, the variable is showed instead.
Change to display '' instead
2020-09-18 18:29:52 +02:00
Laurent Destailleur
4e2aff2cdc
Fix sql injection when forging requests with IN
2020-09-18 17:28:02 +02:00
Laurent Destailleur
72d5850a5f
Fix regression
2020-09-18 15:45:26 +02:00
Laurent Destailleur
cf8e8ee68b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
2020-09-18 14:54:20 +02:00
Laurent Destailleur
f09aea90df
Fix bad test
2020-09-18 14:51:04 +02:00
Laurent Destailleur
56a9f5c48b
Fix
2020-09-18 14:49:20 +02:00
Laurent Destailleur
0b2aa2b01d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
2020-09-18 14:46:23 +02:00
Laurent Destailleur
2fe9514b6b
Doc
2020-09-18 14:01:00 +02:00
Laurent Destailleur
9134892c71
Fix remove useless code
2020-09-18 13:58:09 +02:00
Laurent Destailleur
534846c5c7
NEW Framework is ready for CSRF token protection on explicit GET URLs.
2020-09-18 04:30:24 +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
0f0e4feeaf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modSociete.class.php
2020-09-17 19:33:29 +02:00
Laurent Destailleur
eae5410ced
Protect md file
2020-09-17 16:57:39 +02:00
Laurent Destailleur
7cc75ac873
Fix: removing also " when removing " from a received parameter.
2020-09-17 14:43:58 +02:00
Laurent Destailleur
2f100fdf79
Fix alpha into alphanohtml
2020-09-17 12:53:58 +02:00
Laurent Destailleur
5e3f6ce736
Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup
...
Use new table function for comm/propal + cleanup
2020-09-17 11:20:31 +02:00
Alexandre SPANGARO
bc457ebb66
Stickler
2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913
FIX Yogosha report 4425 (backport)
2020-09-16 20:55:28 +02:00
Laurent Destailleur
4630887591
Fix css
2020-09-16 20:09:40 +02:00
Laurent Destailleur
47031cb656
Fix phpcs
2020-09-16 18:51:19 +02:00
Laurent Destailleur
d7aa376c3c
FIX Yogosha report 4425
2020-09-16 14:37:05 +02:00
Sekan, Tobias
91641e593f
MAIN_DASHBOARD_USE_TOTAL_HT + more clean
2020-09-16 14:03:41 +02:00
Laurent Destailleur
09558d0ce9
Fix MAIN_OPTIMIZEFORTEXTBROWSER
2020-09-16 13:15:57 +02:00
Sekan, Tobias
ac1fdb4a59
Use new table function for comm/propal + cleanup
2020-09-16 10:51:19 +02:00
Laurent Destailleur
7bcf2c9089
css
2020-09-15 14:45:51 +02:00
Laurent Destailleur
cc24e9b155
Look and feel v13
2020-09-15 13:27:48 +02:00
Laurent Destailleur
3fd041e861
Update functions.lib.php
2020-09-15 11:28:49 +02:00
Alexandre SPANGARO
4137e92430
Time to enable fontawesome icons on weather feature
2020-09-15 03:42:35 +02:00
Laurent Destailleur
b7b1de4580
Fix position of GPAO must be after Product.
...
CSS
2020-09-15 02:41:08 +02:00
Laurent Destailleur
f626bd70d0
Look and feel v13
2020-09-14 20:53:42 +02:00
Laurent Destailleur
8afd448def
Add warning if a hidden option is on to encourage to remove it.
2020-09-14 15:05:35 +02:00
Laurent Destailleur
33d61333b1
Fix picto
2020-09-14 12:50:07 +02: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
fab3a774d2
Merge pull request #14636 from TobiasSekan/AddTableHelperMethod
...
NEW Add helper function for table headers with numbers
2020-09-12 01:21:24 +02:00
Laurent Destailleur
c4383747a1
Look and feel v13
2020-09-11 13:57:16 +02:00
Laurent Destailleur
64b28020c8
Look and feel v13
2020-09-11 13:14:14 +02:00
Sekan, Tobias
747d8c32e2
Fix Sticker CI (again :'-( )
2020-09-10 12:29:01 +02:00
Sekan, Tobias
2292f83258
fix sticker ci
2020-09-10 11:26:17 +02:00
Sekan, Tobias
3f8b2153ea
fix sticker Ci and add missing doc
2020-09-10 11:25:35 +02:00
Sekan, Tobias
d2903c5de6
adress feedback + massive cleanup
2020-09-10 11:04:41 +02:00
Sekan, Tobias
49d009502c
fix sticker CI
2020-09-09 08:16:26 +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
Sekan, Tobias
bd96e0fe42
finished helper method and usage of it
2020-09-08 11:15:33 +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
Laurent Destailleur
d700649fb9
The deprecated subsitution key __SIGNATURE__ has been removed. Replace
...
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
2020-09-06 19:25:25 +02:00
Laurent Destailleur
84efd70dcb
FIX Clean tooltip of help for substition for long notes
2020-09-06 19:19:55 +02:00
Sekan, Tobias
0375f5fd37
Add helper function for table headers with numbers
2020-09-04 15:24:45 +02:00
atm-lena
e3ce3cbb7c
Function sendEmailsReminder()
2020-08-27 15:49:56 +02:00
Laurent Destailleur
f010e44a71
WIP
2020-08-23 22:13:06 +02:00
Laurent Destailleur
b600478a5a
Work on recruitment module
2020-08-23 22:11:16 +02:00
Laurent Destailleur
34d2d9a7c6
Look and feel v13
2020-08-23 15:17:22 +02:00
Laurent Destailleur
23cda5f464
Enhance recruitment module
2020-08-22 14:37:09 +02:00
Laurent Destailleur
220fc6db98
Work on recruitment module
2020-08-21 13:00:12 +02:00
Laurent Destailleur
bd65e5612f
Fix duplicate id
2020-08-17 20:06:01 +02:00
Laurent Destailleur
c63d54631c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
2020-08-17 19:59:17 +02:00
Laurent Destailleur
487d26c7db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
2020-08-17 19:54:23 +02:00
Bernard Saulme
52b84a3ea2
Update functions.lib.php
2020-08-14 18:08:59 +02:00
Laurent Destailleur
65ceaac42e
Better message
2020-08-14 12:56:17 +02:00
Laurent Destailleur
74da63c0e4
Merge pull request #14448 from 418sec/develop
...
Security Fix for Cross-site Scripting (XSS) - huntr.dev
2020-08-14 03:17:35 +02:00
lvessiller
f385e02c53
FIX title button attribute id empty
2020-08-13 17:43:18 +02:00
spooky360
a94fa93973
Fixed missing quote... => Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr )
2020-08-05 17:11:19 +02:00
spooky360
b9513255fd
Fix for self XSS vuln (See https://www.huntr.dev/bounties/2-packagist-dolibarr ).
2020-08-05 17:02:59 +02:00
Laurent Destailleur
c09827248b
Merge pull request #14360 from ATM-Consulting/FIX_12.0_dol_string_onlythesehtmltags_remove_class_by_default
...
FIX 12.0 - dol_string_onlythesehtmltags(): remove class attribute by default
2020-08-04 12:27:31 +02:00
Florian Mortgat
ce18a4f029
FIX 12.0 - in dol_string_onlythesehtmltags, remove the class attribute by default
2020-08-03 12:28:12 +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
04903460b1
Add contact on job page
2020-08-02 18:09:53 +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
Laurent Destailleur
367914015c
NEW Add a counter of number of words of pages in website module
2020-08-02 15:53:34 +02:00
Laurent Destailleur
d08c42a205
CSS Better visibility for buttons and status
2020-08-02 00:15:21 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
8b879ee23b
FIX Edit extrafield of type long text loose carriage returns
2020-07-30 14:49:00 +02:00
Laurent Destailleur
2687666579
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-29 13:54:12 +02:00
Laurent Destailleur
f2390e85b9
Merge pull request #14287 from atm-florianm/FIX_allow_more_html_tags
...
NEW: additional html tags allowed by dol_string_onlythesehtmltags()
2020-07-29 13:34:45 +02:00
Laurent Destailleur
d945ef67e1
FIX Picto of HRM module
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-07-26 20:53:22 +02:00
Laurent Destailleur
5d7a9c9af4
FIX Picto of HRM module
2020-07-26 20:51:49 +02:00
Laurent Destailleur
b63a6bc72a
NEW Can use dynamic code into the 'enabled' property of DAO fields
2020-07-26 20:45:54 +02:00
FlorianMortgat
c48a294a2b
FIX: allow more harmless html tags
2020-07-25 00:57:40 +02:00
Laurent Destailleur
3ed4773d7f
Fix tab popup when there is 2 head tabs in same page
2020-07-24 18:31:14 +02:00
Laurent Destailleur
93fea8591c
Fix phpcs
2020-07-24 12:17:02 +02:00
Laurent Destailleur
6e36fba4f3
NEW Development of module Recruitment
2020-07-24 11:54:57 +02:00
Laurent Destailleur
0a708e46bf
css
2020-07-09 00:46:59 +02:00
Laurent Destailleur
96729769f7
Standardize Agenda view
2020-07-08 18:06:14 +02:00
Laurent Destailleur
fce81a4bf1
Rename var and fix position of checkbox
2020-07-03 01:30:53 +02:00
Laurent Destailleur
c36c8ed447
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 14:45:15 +02:00
Laurent Destailleur
23df5596e8
FIX vulenrability reported by wizlynx WLX-2020-012
2020-06-17 13:42:38 +02:00
Laurent Destailleur
1736ecfa26
Fix phpcs
2020-06-15 04:32:59 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
78204f92e6
Fix tag
2020-06-11 17:00:22 +02:00
Laurent Destailleur
58fdd8a59a
Fix tag at bad place
2020-06-11 16:59:24 +02:00
Laurent Destailleur
503206af88
Fix analytics tag
2020-06-11 16:38:58 +02:00
Laurent Destailleur
5794b1abea
Fix for use with text browser
...
Conflicts:
htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
bd22ad4174
Fix for use with text browser
2020-06-10 12:35:39 +02:00
Laurent Destailleur
c175fbd697
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/website/class/website.class.php
htdocs/website/index.php
2020-06-09 22:09:57 +02:00
Laurent Destailleur
756ef0b583
Fix disallow < > into meta info
...
Fix message page regenerated
2020-06-09 21:43:42 +02:00
Laurent Destailleur
88aaec63f7
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-06 18:57:41 +02:00
Laurent Destailleur
e31e889595
Add url in error message
2020-06-06 18:30:04 +02:00
Laurent Destailleur
474860d546
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-03 14:06:35 +02:00
Laurent Destailleur
7b84518e59
Fix webp support
2020-06-03 14:05:18 +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
16625af34e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/files.lib.php
htdocs/core/tpl/filemanager.tpl.php
2020-05-27 14:28:20 +02:00
Laurent Destailleur
c0ce584487
Look and feel v12
2020-05-27 00:26:04 +02:00
Laurent Destailleur
c607c2daa0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 22:31:47 +02:00
Laurent Destailleur
91ecd3455f
Fix CSS
2020-05-26 22:30:11 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule
2020-05-23 21:07:47 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
2020-05-22 08:27:12 +02:00
Laurent Destailleur
5d78f6dac5
NEW Add link to edit property from search result of website pages
2020-05-22 00:38:01 +02:00
Frédéric FRANCE
5940d3705a
add new rule
2020-05-21 16:00:12 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule
2020-05-21 01:41:27 +02:00
Frédéric FRANCE
ccadb1ec7a
add new rule
2020-05-21 00:47:16 +02:00
Laurent Destailleur
c5e341883d
Fix popup of supplier invoice
2020-05-19 23:22:40 +02:00
Laurent Destailleur
af46108cc4
Look and feel v12
2020-05-17 13:34:16 +02:00
Laurent Destailleur
5fe9c45fb2
Fix look and feel v12
2020-05-15 16:07:39 +02:00
Laurent Destailleur
ae0e6e4dc8
FIX dol_concatdesc to escape <
...
Better help
2020-05-14 14:30:36 +02:00
Laurent Destailleur
44d36815bd
Look and feel v12
2020-05-11 19:00:27 +02:00
Laurent Destailleur
a8dcd2d09b
Clean code
2020-05-11 11:53:13 +02:00
Laurent Destailleur
501f1ba2c4
Fix look and feel v12
2020-05-10 15:45:07 +02:00
Laurent Destailleur
206b16410e
Revert the option to avoid to introduce a feature that is duplicate with
...
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Frédéric FRANCE
c28e6630bb
Update functions.lib.php
2020-05-07 15:41:21 +02:00
Frédéric FRANCE
dd1d29f983
add some substitutions for date datetime
2020-05-07 15:37:32 +02:00
Laurent Destailleur
b09f179a16
NEW Website logs are now into a separated log file.
2020-05-06 04:32:48 +02:00
Laurent Destailleur
30fede216c
Fix Add '_pw' var as var sensibles.
2020-05-06 04:03:07 +02:00
Laurent Destailleur
247acdd274
Fix position of custom groups of modules
2020-05-06 03:47:28 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
62a2469c71
Fix position of modules
2020-05-02 00:41:27 +02:00
Laurent Destailleur
5948d385a3
Look and feel v12
2020-04-30 14:46:49 +02:00
kamel
28d330996c
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:01:07 +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
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Laurent Destailleur
1121d2c1c6
Look and feel v12
2020-04-25 13:49:44 +02:00
Laurent Destailleur
5ce3174181
Look and feel v12
2020-04-25 03:31:47 +02:00
Laurent Destailleur
6b114a31ce
Look and feel v12
2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109
Look and feel v12
2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a
Look and feel v12
2020-04-24 23:56:57 +02:00
Laurent Destailleur
39c454d07b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-22 18:28:52 +02:00
Laurent Destailleur
7bc8a70b0a
FIX #13670
2020-04-22 18:23:48 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
Laurent Destailleur
9a5986e190
css
2020-04-22 12:40:11 +02:00
Laurent Destailleur
5c573e197b
Look and feel v12
2020-04-22 00:50:04 +02:00
Laurent Destailleur
cadb52c5b3
Look and feel v12
2020-04-20 19:39:34 +02:00
Laurent Destailleur
230fe26b58
Look and feel v12
2020-04-20 18:38:25 +02:00
Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +02:00
Laurent Destailleur
fe674f08d9
Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER
2020-04-20 03:00:10 +02:00
Laurent Destailleur
8d59ce2e03
Look and feel v12
2020-04-20 02:48:05 +02:00
Laurent Destailleur
fa056e59df
Look and feel v12
2020-04-20 02:14:43 +02:00
Laurent Destailleur
3740d59848
Look and feel v12
2020-04-13 04:14:28 +02:00
Laurent Destailleur
d0dbf323ed
css
2020-04-13 01:42:10 +02:00
Laurent Destailleur
549b126eff
Look and feel v12
2020-04-12 21:36:57 +02:00
Laurent Destailleur
ed51ce8734
Look and feel v12
2020-04-12 19:56:50 +02:00
Frédéric FRANCE
ea78fc48a8
The variable $rep seems to be never defined.
2020-04-12 18:03:51 +02:00
Laurent Destailleur
7d430c08d0
Look and feel v12
2020-04-12 16:36:25 +02:00
Laurent Destailleur
0916017519
Fix addreplace hook
2020-04-12 15:29:13 +02:00
Laurent Destailleur
d7784887d1
More font awesome picto
2020-04-12 14:58:50 +02:00
Maxime Kohlhaas
f5ab957faf
FIX #13535 : state in italian address
2020-04-11 17:56:23 +02:00
Laurent Destailleur
760121a3d1
Can sort list of answers.
2020-04-11 14:13:16 +02:00
Laurent Destailleur
069fb27ced
Look and feel v12
2020-04-10 12:27:34 +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
5f00f0133e
Merge pull request #13529 from bb2a/patch-4
...
Display Phone link and separ personalise in const
2020-04-09 19:54:48 +02:00
Laurent Destailleur
bc2a1d653d
Merge pull request #13542 from ptibogxiv/patch-325
...
FIX pencil with font awesome 5.13
2020-04-09 19:35:35 +02:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
ptibogxiv
5bba22aeeb
FIX pencil with font awesome 5.13
2020-04-09 14:58:42 +02:00
Laurent Destailleur
5819aadf75
Clean html code (replace table into table with div)
2020-04-09 13:40:26 +02:00
Laurent Destailleur
fe614658c8
Look and feel v12
2020-04-08 16:13:29 +02:00
Anthony Berton
97153fd57d
Update functions.lib.php
2020-04-08 15:13:19 +02:00
Laurent Destailleur
18f2087cc6
Fix look and feel v12
2020-04-08 15:13:01 +02:00
Laurent Destailleur
1adee36314
Upgrade to font awesome 5.13
2020-04-07 21:11:18 +02:00
Laurent Destailleur
9d9364256b
More picto using fontawesome.
2020-04-07 16:45:08 +02:00
Laurent Destailleur
ff1b3db54b
Fix regression on hamburger picto
2020-04-06 23:38:30 +02:00
Laurent Destailleur
0933fefa1d
More fontawesome logo
2020-04-06 18:36:33 +02:00
Laurent Destailleur
665dc6f8d2
More fontawesome logo
2020-04-06 18:16:21 +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
d2de6a22eb
WIP Can set values in extra languages
2020-04-01 18:11:28 +02:00
Laurent Destailleur
4727800206
Can show technical ID of any object in banner.
2020-04-01 16:51:45 +02:00
Laurent Destailleur
9fcbec9f02
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-03-30 19:36:07 +02:00
Francis Appels
3eda785ca5
Add newline end of file
2020-03-30 10:36:49 +02:00
Francis Appels
076caa11ab
Add token functions to improve modulebuilder compatiblity with maintained versions.
2020-03-30 10:28:20 +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
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
3855ef6073
Add rounding code 'CR' (currency rate'
2020-03-25 17:41:39 +01:00
Laurent Destailleur
92db075aa1
Add parameter morecss to img_credit_card()
2020-03-24 21:40:25 +01:00
Laurent Destailleur
62fefab5ac
Standardize color of status
2020-03-24 19:06:37 +01:00
Laurent Destailleur
24dc202022
Doc
2020-03-23 15:33:52 +01:00
Laurent Destailleur
f904ff5240
Add dol_escape_json method
2020-03-20 17:10:35 +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
Laurent Destailleur
8e1ffa5144
Fix management of token
2020-03-19 10:52:07 +01:00
Laurent Destailleur
76fc722638
NEW Can get some variables (not available by default)
2020-03-17 13:33:21 +01:00
Laurent Destailleur
5f255a6c14
A new way to navigate between pages in list is available
2020-03-17 03:24:24 +01:00
Laurent Destailleur
52290b002a
NEW Another way to navigate between pages for some lists
2020-03-13 12:53:22 +01:00
Laurent Destailleur
967d4223c6
FIX #13277
2020-03-12 16:15:48 +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
fc05e8d768
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/other.lang
2020-03-11 18:03:15 +01:00
Laurent Destailleur
25eae4db9c
Fix missing __USER_EMAIL__ substitution
2020-03-11 16:28:00 +01:00
Laurent Destailleur
44a611e006
Move getElementProperties and fetchObjectByElement into functions
2020-03-07 15:06:14 +01:00
Laurent Destailleur
47ebc2bbf2
Hide legend
2020-03-06 09:52:51 +01:00
Laurent Destailleur
a5a2d60755
Fix phpcs
2020-03-05 00:20:39 +01:00
Laurent Destailleur
a6d340a22c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2020-03-04 19:28:15 +01:00
Laurent Destailleur
deda6252f2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/class/expensereport.class.php
2020-03-04 19:22:30 +01:00
atm-arnaud
834873ab15
FIX date order was -1D and desc with label repetition
2020-03-04 11:58:42 +01:00
Anthony Berton
2fd7276a30
Update functions.lib.php
2020-03-03 09:53:00 +01:00
Laurent Destailleur
ea7c2aa46b
Update functions.lib.php
2020-03-02 21:47:36 +01:00
Anthony Berton
d9a002a8bd
Update functions.lib.php
2020-03-02 19:27:36 +01:00
Anthony Berton
197f81cb52
Update functions.lib.php
2020-03-02 19:23:45 +01:00
Anthony Berton
12b9897f5c
Update functions.lib.php
2020-03-02 18:53:52 +01:00
Laurent Destailleur
fab39aef9e
Clean menu bar
2020-03-02 17:35:49 +01:00
Laurent Destailleur
8879672122
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 12:52:18 +01:00
Laurent Destailleur
0855598c00
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/lib/functions.lib.php
2020-02-29 12:51:33 +01:00
Laurent Destailleur
56704e4029
Add stats of products in MO
2020-02-28 19:26:52 +01:00
atm-quentin
009eb0d4a4
FIX test on 0 better than isset
2020-02-27 09:34:20 +01:00
atm-quentin
a5baf2bc88
FIX search with '0'
2020-02-26 09:19:39 +01:00
Laurent Destailleur
ace5f2844a
Make Setup of TakePOS faster with Ajax ON-Off Button.
2020-02-25 12:37:44 +01:00
Laurent Destailleur
d78221ea08
css
2020-02-24 21:48:46 +01:00
Laurent Destailleur
7cd49f327e
Look and feel v12: CSS for qty in lists
2020-02-24 21:47:48 +01:00
Laurent Destailleur
68526a14cd
NEW Truncate columns names when too long and show full title as popup
2020-02-24 21:33:28 +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
Laurent Destailleur
9d9429f66b
New: Can limit number of tabs by page.
2020-02-24 20:41:29 +01:00
Laurent Destailleur
096a568e83
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-02-23 23:42:23 +01:00
Laurent Destailleur
3075e40f8c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/core/boxes/box_contacts.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php
2020-02-23 23:37:46 +01:00
Laurent Destailleur
189c0d675b
Fix memory report. Xdebug no more required. Try = null instead of unset.
2020-02-23 22:05:59 +01:00
Alexandre SPANGARO
a7ca7dfbb6
FIX: z-index for moretabsList with constant MAIN_MAXTABS_IN_CARD
2020-02-20 06:00:17 +01:00
Laurent Destailleur
76f0df138b
Try to fix doc
2020-02-20 01:26:40 +01:00
Laurent Destailleur
1dd5ba093d
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
2020-02-19 12:11:16 +01:00
Laurent Destailleur
ac16857501
GETPOST(..., 'alpha') remove " if found instead of returning ''
2020-02-19 11:33:45 +01:00
Laurent Destailleur
6555f5d74f
More default hmtl tags in restricthtmlonly
2020-02-17 20:55:17 +01:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
bf281b7dab
Comment
2020-02-17 11:51:49 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Scrutinizer Auto-Fixer
17010478ba
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 09:44:08 +00: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
05f0242198
NEW The info_admin() can show text after click on other text
2020-02-11 10:38:09 +01:00
Laurent Destailleur
8645fd8946
FIX CVE-2019–17223 FIX #13053
2020-02-09 18:28:57 +01:00
Laurent Destailleur
5e71366ff2
css
2020-02-06 18:06:36 +01:00
Laurent Destailleur
05e08b3596
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
2020-02-06 12:58:02 +01:00
Laurent Destailleur
4f3cc87077
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:00 +01:00
Laurent Destailleur
ddd1ca26b9
CSS
2020-02-05 14:04:19 +01:00
Laurent Destailleur
bb1c9a66dd
Fix code alignement on modulebuilder
2020-02-04 16:37:30 +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
aa54aaeb01
FIX search filter on extrafields were not restored avec "Back to list"
2020-01-31 19:46:03 +01:00
Laurent Destailleur
9372940f17
Fix log through proxy
2020-01-31 17:51:30 +01:00
Laurent Destailleur
8e18a08377
Fix log of proxy forward only if it differs from remote_addr
2020-01-31 16:59:10 +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
f64ad71924
Missing country code
2020-01-28 02:50:11 +01:00
Laurent Destailleur
fc63d7366d
FIX Mandatory fields must stay mandatory if create/update submit fails
2020-01-27 22:23:40 +01:00
Laurent Destailleur
4fe942985f
FIX Mandatory fields must stay mandatory if create/update submit fails
2020-01-27 22:22:59 +01:00
Laurent Destailleur
50d9ac0b52
Fix else if
2020-01-27 02:13:12 +01:00
Laurent Destailleur
08d8670bb3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
8f3f34e1c0
Fix css
2020-01-24 20:11:07 +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
7ad827f212
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/lib/functions2.lib.php
2020-01-23 12:07:17 +01:00
Alexandre SPANGARO
7f47b48559
Move function to functions2.lib.php
2020-01-23 11:47:30 +01:00
Alexandre SPANGARO
5eeef771fa
FIX: FEC export format
2020-01-23 06:20:31 +01:00
Laurent Destailleur
4922567a27
Add .noexec extension for old php4, php5... files
2020-01-21 15:02:04 +01:00
Laurent Destailleur
4fdfba3867
Add .noexec extension for old php4, php5... files
2020-01-21 15:01:22 +01:00
Laurent Destailleur
ab5940f28c
Fix css lost
2020-01-21 00:56:32 +01:00
Laurent Destailleur
acdb28ba25
Add country id and country code in substitution vars
2020-01-21 00:28:53 +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
18f2b09fb1
Debug v11
2020-01-20 12:25:25 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
d9f7c4aec4
FIX #12838
2020-01-18 19:53:48 +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
c556f60c89
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:35 +01:00
Anthony Berton
9a6ee89d43
Update functions.lib.php
2020-01-16 15:44:07 +01:00
Anthony Berton
9a6bcaa683
Update functions.lib.php
2020-01-16 15:20:09 +01:00
Laurent Destailleur
849c78f4cd
Doc
2020-01-16 10:12:39 +01:00
atm-ph
3cdb84b192
Fix note started with <s> balise
2020-01-16 09:50:57 +01:00
Laurent Destailleur
5772dce460
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
Anthony Berton
ef5c1e6c8c
Update functions.lib.php
2020-01-13 23:09:08 +00:00
Anthony Berton
1eff733e1c
Update functions.lib.php
2020-01-13 18:23:50 +01:00
Anthony Berton
f3046589e7
Update functions.lib.php
2020-01-13 18:19:51 +01:00
Anthony Berton
226dbceac0
Update functions.lib.php
2020-01-13 17:11:50 +01:00
Laurent Destailleur
9d4e1a3941
FIX #12797
2020-01-13 14:25:48 +01:00
Laurent Destailleur
e88c11c417
Space
2020-01-13 13:20:58 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
9ebdd82edb
Fix We must refuse to delete a various payment if payment was dispatched
...
in accountancy.
2020-01-10 02:43:24 +01:00
Laurent Destailleur
f48c7d2ecf
Fix modulebuilder
2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896
Fix modulebuilder
2020-01-09 22:27:24 +01:00
Laurent Destailleur
a947215ac1
Fix morecss param was lost
2020-01-07 14:40:59 +01:00
Laurent Destailleur
40ba90d170
css
2020-01-06 15:29:18 +01:00
Laurent Destailleur
e7ac01e1bd
FIX localtax info were not returned correctly when call done with id.
2020-01-01 22:27:47 +01:00
Laurent Destailleur
2e8fd25299
FIX Local taxes was not correctly supported in TakePOS.
2020-01-01 21:54:47 +01:00
Laurent Destailleur
330cca994e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2019-12-23 15:49:00 +01:00
Laurent Destailleur
3250b13f4a
FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n"
2019-12-23 15:45:08 +01:00
Laurent Destailleur
2df9df2db0
Debug v11
2019-12-23 12:24:27 +01:00
Laurent Destailleur
fdf4d86d81
Debug code
2019-12-16 12:38:51 +01:00
Laurent Destailleur
28bcb49957
Fix css
2019-12-16 11:32:27 +01:00
Laurent Destailleur
9e94be8bac
CSS
2019-12-15 20:31:09 +01:00
Laurent Destailleur
7c71f6cae9
Fix message
2019-12-15 17:48:30 +01:00
Laurent Destailleur
d38c73c90a
FIX output of emails from and error on emailing pages.
2019-12-13 15:52:08 +01:00
Laurent Destailleur
63a26ed436
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-09 13:25:49 +01:00
Laurent Destailleur
f2c7d3de2e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-12-09 13:25:23 +01:00
Laurent Destailleur
5dbf060f00
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-12-09 13:24:01 +01:00
Laurent Destailleur
fba274997a
Merge pull request #12647 from atm-john/develop_fix_dolGetBadge
...
Fix dolGetBadge class
2019-12-09 13:05:07 +01:00
Laurent Destailleur
eb0d20b77e
Fix label of country
...
Fix div empty
2019-12-09 09:16:59 +01:00
Laurent Destailleur
394104291a
Fix function not found when creating a payment of an expense report
2019-12-08 04:22:09 +01:00
ATM John BOTELLA
4d3ed4ffd3
Fix dolGetBadge class
2019-12-07 17:41:13 +01:00
Laurent Destailleur
796f34628d
Debug v11
2019-12-06 17:40:22 +01:00
Laurent Destailleur
bde917d7fc
Fix responsive
2019-12-04 15:09:20 +01:00
Laurent Destailleur
d93cfedcbe
Merge pull request #12602 from TobiasSekan/AddMoreFilesForPreview
...
Add preview button for MD, CSS, XAML files
2019-12-03 13:20:08 +01:00
Tobias Sekan
f4e4e1e518
Add preview for MD, CSS, XAML files
2019-12-02 13:53:28 +01:00
Laurent Destailleur
f378141fbd
PHPCS
2019-12-01 12:51:01 +01:00
ATM John BOTELLA
773f823748
factoring token usage
2019-12-01 10:20:11 +01:00
Laurent Destailleur
a352fd5a6e
Revert "FIX#12482"
2019-11-30 21:00:56 +01:00
Nicolas
f2ff443641
FIX #12482
2019-11-30 20:04:27 +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
d1419f81da
Merge pull request #12390 from bb2a/patch-4
...
Use english name of subsitution variables for thirdparties
2019-11-26 10:26:45 +01:00
Laurent Destailleur
e8bc8b68c1
Fix missing field in migration
2019-11-21 18:17:40 +01:00
Anthony Berton
496aa0c065
Update functions.lib.php
2019-11-21 10:38:59 +01:00
Anthony Berton
fe3c921152
Merge branch 'develop' into patch-4
2019-11-17 10:17:47 +01:00
Anthony Berton
e1f36ae107
Update functions.lib.php
2019-11-16 17:37:18 +01:00
Laurent Destailleur
1f5bea01f5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
2019-11-14 21:30:16 +01:00
Laurent Destailleur
7e52c70321
FIX Advisory ID: usd20190067
2019-11-14 21:16:18 +01: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
Scrutinizer Auto-Fixer
038bda254d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 22:59:36 +00:00
Laurent Destailleur
771f304c79
Fix typo
2019-11-09 18:40:08 +01:00
Anthony Berton
4449c6d2a7
Update functions.lib.php
2019-11-08 16:34:20 +01:00
Laurent Destailleur
747113551b
Debug pagination of bookmark list
2019-11-05 09:52:33 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Laurent Destailleur
d9f333d828
Merge pull request #12289 from frederic34/datetime
...
php is > 5.4
2019-11-02 11:46:34 +01:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Laurent Destailleur
8608c5db9c
Fix color of task progression
2019-11-01 23:16:08 +01:00
Laurent Destailleur
135e65c4aa
Look and feel v11
...
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Frédéric FRANCE
da238e94e1
php is > 5.4
2019-11-01 15:21:21 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Laurent Destailleur
5b5a2e9804
Clean code
2019-11-01 03:25:09 +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
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Laurent Destailleur
f4545a2068
Debug method MAIN_STATUS_USES_CSS
2019-10-23 17:31:54 +02:00
Laurent Destailleur
c4be61c55c
FIX Better compatible fix for the trouble of weight / size units
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d
FIX Better compatible fix for the trouble of weight / size units
2019-10-22 18:36:36 +02:00
Laurent Destailleur
8242281ef8
Close #12096
2019-10-22 14:39:33 +02:00
Laurent Destailleur
b2bbee55f1
Fix phpcs
2019-10-22 12:37:36 +02:00
Anthony Berton
5e7d615250
Update functions.lib.php
2019-10-21 21:06:48 +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
49c101bb77
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8
Clean code
2019-10-20 15:16:40 +02:00
Laurent Destailleur
84f6fd64a9
Merge pull request #12176 from Ahuahuachi/develop
...
Translation of some function documentation
2019-10-20 13:31:25 +02:00
Frédéric FRANCE
33c35780e0
wip
2019-10-20 11:17:54 +02:00
Alfredo Altamirano
71f9b4f36b
Translation of parameter documentation
2019-10-18 12:55:21 -05:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
6d05d42c50
Look and feel v11
2019-10-16 11:26:20 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-15 09:39:57 +02:00
Laurent Destailleur
a1c93cb2e6
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
...
Look and feel v11
2019-10-15 02:45:12 +02:00
Laurent Destailleur
c869cbe193
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
...
Unlock title button feature
2019-10-14 23:55:10 +02:00
Frédéric FRANCE
c143584af4
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 21:16:54 +02:00
Laurent Destailleur
c338db6c36
Fix unlink picto
2019-10-12 19:16:36 +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
cc73877e03
Merge branch 'develop' into patch-18
2019-10-11 16:32:48 +02:00
John Botella
9194eb4bec
Fix block title height if no button
2019-10-11 09:14:10 +02:00
John Botella
724999f1ce
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
2019-10-11 08:40:43 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-10 23:24:50 +02:00
Frédéric FRANCE
be00576717
Update functions.lib.php
2019-10-10 08:22:14 +02:00
Frédéric FRANCE
d4757a0b5b
globe fontawesome
2019-10-09 23:20:15 +02:00
Laurent Destailleur
072a0a26d6
Use a font awesome icon to show "shippable" flag on orders.
2019-10-09 18:07:00 +02:00
Laurent Destailleur
db651a607d
Use fontawesome for img_warning
2019-10-09 17:33:46 +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
f55a4d77e4
css
2019-10-08 16:41:03 +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
1060ac4608
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
...
Fix : LibStatut missing dolgetstatus usage
2019-10-07 13:08:33 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
...
Fix Fa-icon
2019-10-07 13:03:27 +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
503973cec9
FIX Edit of ticket module parameters erased others
2019-10-04 14:04:31 +02:00
ATM john
027c8224b0
Fix dolGetStatus unused
2019-10-03 21:34:01 +02:00
Alexandre SPANGARO
ddadff5731
Add globe fa-icon
2019-10-03 21:32:55 +02:00
ATM john
77f666a236
Fix dolGetStatus param
2019-10-03 21:28:11 +02:00
Alexandre SPANGARO
8668e7157a
Add bookmark fa-icon
2019-10-03 21:00:59 +02:00
Alexandre SPANGARO
d0840b038f
Remove constant MAIN_DISABLE_FONT_AWESOME_5
2019-10-03 20:42:02 +02:00
Alexandre SPANGARO
14381927c7
Fix Bank Fa-icon
2019-10-03 20:32:15 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 17:21:31 +02:00
Laurent Destailleur
b60ee4c18c
css
2019-10-03 09:58:49 +02:00
Frédéric FRANCE
37bb548d21
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 20:56:32 +02:00
Laurent Destailleur
b6a95b4be5
Look and feel v11
2019-10-02 19:04:24 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 18:59:18 +02:00
Laurent Destailleur
f89701b4d4
Fix technical id align on left
2019-10-02 18:55:18 +02:00
Laurent Destailleur
d8a8c4fbe6
Look and feel v11. Picto are fontawesome.
2019-10-02 18:36:36 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 22:03:33 +02:00
ATM john
4d5ffbb5c4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
2019-10-01 20:45:04 +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
11e01f5c86
Use correct style for table header
2019-10-01 12:02:28 +02:00
Laurent Destailleur
15e646cc62
Fix bad name of trigger
2019-10-01 11:34:35 +02:00
Laurent Destailleur
c7da05e4a1
Fix bad name of trigger
2019-10-01 11:28:10 +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
ATM john
b01bd979b5
Unlock title button feature
2019-09-30 21:10:16 +02:00
Frédéric FRANCE
f32f528bc2
fix merge
2019-09-30 19:36:57 +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
ecc2e8df67
Fix restore lost images
2019-09-30 17:58:31 +02:00
Laurent Destailleur
dc7ad61940
Add class reposition on button that switch the view mode
2019-09-30 17:46:53 +02:00
Laurent Destailleur
ce7e8c83a3
Use a dedicated css imgforviewmode for button used to switch view
2019-09-30 17:08:57 +02:00
Laurent Destailleur
bbc98c19bc
Update functions.lib.php
2019-09-30 15:25:55 +02:00
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
Alexandre SPANGARO
288aea190b
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9
NEW Add fa_icon on load_fiche_titre
2019-09-28 06:02:25 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-28 00:35:14 +02:00
Laurent Destailleur
981c5c877a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-27 20:02:08 +02:00
Laurent Destailleur
24ad67e0e1
Fix missing $conf
2019-09-27 20:01:57 +02:00
Laurent Destailleur
d0d884742f
FIX #11861 Not consistent code to manage measuring units
2019-09-27 19:45:33 +02:00
Laurent Destailleur
66cbb4020b
Merge branch 'develop' into patch-4
2019-09-27 14:46:39 +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
f3bc319a78
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
2019-09-27 14:11:14 +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
Laurent Destailleur
aa5f35f14f
Fix image on ticket
2019-09-26 14:28:34 +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
6431e8e16d
FIX SQL injection on qty
2019-09-24 12:43:44 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Laurent Destailleur
40f75b16d8
FIX Substitution of __PROJECT_XXX__ not done
2019-09-23 13:04:22 +02:00
Laurent Destailleur
345ac28c89
Fix js injection
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/user/group/card.php
2019-09-18 14:21:02 +02:00
Frédéric FRANCE
e43f3a0f58
Update functions.lib.php
2019-09-16 18:07:06 +02:00
Frédéric FRANCE
5c00712c0a
Update functions.lib.php
2019-09-16 17:57:40 +02:00
Laurent Destailleur
544a1237bc
FIX regression with option to hide picto on top menu
2019-09-15 15:11:13 +02:00
Laurent Destailleur
7019e69ee2
FIX regression with option to hide picto on top menu
2019-09-15 15:09:36 +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
166d56f7a3
Removed function dol_micro_time. Use native PHP microtime instead.
2019-09-13 11:15:49 +02:00
Frédéric FRANCE
6f33874d75
add entity
2019-09-12 21:13:00 +02:00
Frédéric FRANCE
cd109d04cd
add function
2019-09-12 20:44:24 +02:00
Frédéric FRANCE
e0f17cc71c
add socialnetworks dictionary
2019-09-11 22:47:23 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary
2019-09-11 22:27:09 +02:00
Laurent Destailleur
5f236fda2e
More complete error message with hour/min/sec
2019-09-11 00:28:09 +02:00
Laurent Destailleur
48aedcee20
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-09-10 15:31:29 +02:00
Laurent Destailleur
d4e26fcc55
FIX missing include (dol_convert_file not found)
2019-09-10 15:29:33 +02:00
Laurent Destailleur
ca7ce63648
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2019-09-02 23:04:15 +02:00
Laurent Destailleur
a126b1e538
FIX Add char $ and ; in sanitizing of filenames.
2019-09-02 22:25:44 +02:00
Laurent Destailleur
7f5728ead9
A better message when database is off.
2019-08-31 19:39:39 +02:00
Laurent Destailleur
a3e221468a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-31 01:15:04 +02:00
Laurent Destailleur
7942c5edf7
Fix js injection
2019-08-30 16:22:24 +02:00
Laurent Destailleur
01962cbc67
Clean code
2019-08-29 13:17:14 +02:00
Laurent Destailleur
76ae0cebd6
We don't need anymore code to manage dol_use_jmobile = 3 or 4
2019-08-29 01:32:10 +02:00
Laurent Destailleur
c10f755619
Fix compatibility with old multicompany modules
2019-08-29 00:19:46 +02:00
Laurent Destailleur
76e8384f09
NEW Add option multiselect for developers on the selector of language.
2019-08-28 16:06:19 +02:00
Laurent Destailleur
69688a22e0
Merge
2019-08-27 12:33:42 +02:00
Laurent Destailleur
36c936357c
Add phpunit testDolStringIsGoodIso
2019-08-27 12:25:24 +02:00
Laurent Destailleur
3339f89fc5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
2019-08-22 12:45:23 +02:00
Laurent Destailleur
cdda08c0d3
FIX #11685
2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card"
2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354
Merge pull request #11685 from ptibogxiv/patch-224
...
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-22 11:25:08 +02:00
Laurent Destailleur
bfbabbf626
Update geoip v1
2019-08-21 18:26:41 +02:00
Laurent Destailleur
689aa4979e
Code comment
2019-08-21 17:28:54 +02:00
Laurent Destailleur
c60fc6c3d4
Add param logcontext on dol_syslog
2019-08-20 13:57:25 +02:00
Laurent Destailleur
2f46b40da2
Prepare feature "Never show this message again"
2019-08-18 18:36:18 +02:00
Laurent Destailleur
b8e1cc8d16
Enhance #11643
2019-08-18 03:42:38 +02:00
Laurent Destailleur
467ad3ed22
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/product/stock/card.php
2019-08-16 21:48:46 +02:00
Laurent Destailleur
898996da4a
FIX vulenrability in uploading file found by 美创科技安全实验室
2019-08-16 21:45:13 +02:00
ptibogxiv
93d64bb84e
Update functions.lib.php
2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64
FIX for MAIN_MAXTABS_IN_CARD = $i card
2019-08-13 17:47:30 +02:00
Regis Houssin
7c8b3c9a38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-08-13 07:34:02 +02:00
Laurent Destailleur
a03771ce61
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-01 16:30:40 +02:00
Laurent Destailleur
bf14b4b3d5
Add Canada Dollar in currency that need symbol before
2019-08-01 16:20:18 +02:00
Laurent Destailleur
24bfd9d98b
Merge pull request #11605 from grandoc/new_branch_01_08_2019
...
add CAN$ within list of currencies before
2019-08-01 16:18:37 +02:00
Laurent Destailleur
73715f00af
Update functions.lib.php
2019-08-01 16:18:26 +02:00
Laurent Destailleur
008a54ea19
Update functions.lib.php
2019-08-01 16:14:53 +02:00
dolibarr95
b066431e0e
Add phone format for Jamaica
2019-08-01 15:46:34 +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
Philippe GRAND
4b8963587a
add CAN$ within list of currencies before
2019-08-01 10:02:53 +02:00
Regis Houssin
d9ea61e47c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
2019-07-31 12:49:56 +02:00
Laurent Destailleur
20e58bdd97
FIX Limit of uploaded files (max_post_size was not used)
2019-07-20 13:09:25 +02:00
Regis Houssin
7ffc46e1da
FIX When we are in update mode, so we use $this->entity
2019-07-19 09:47:05 +02:00
Regis Houssin
cbda42d146
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-07-19 09:37:34 +02:00
Laurent Destailleur
8f5b575b19
Fix missing php-intl is not blocking (not working on windows)
2019-06-30 16:19:26 +02:00
Laurent Destailleur
3c4956838e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 15:44:44 +02:00
John Botella
ec7ebe9f39
redo backported fix and update adherent substitution methode
2019-06-21 15:32:38 +02:00
John Botella
200b66d11f
Remove a backported fix because failling at init test
2019-06-21 14:52:12 +02:00
John Botella
b21006614c
Fix substitutions null
2019-06-20 12:00:44 +02:00
Laurent Destailleur
42e58d9ea5
Fix preview of interventions
2019-06-17 18:38:14 +02:00
Regis Houssin
6597c9f60d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
2019-06-17 06:45:08 +02:00
Laurent Destailleur
122c4eb8bd
Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction
...
FIX empty test
2019-06-14 13:51:34 +02:00
ATM john
e7d81a68f0
Fix Override Attribute
2019-06-13 22:11:47 +02:00
ATM john
0ef9a8843a
Fix empty test
2019-06-13 21:57:30 +02:00
Laurent Destailleur
a08dcec7fc
Fix doc
2019-06-04 20:02:29 +02:00
Regis Houssin
e5e6111544
FIX wrong function name
2019-06-03 12:05:58 +02:00
Regis Houssin
b0042995ac
FIX add docs
2019-06-03 12:04:17 +02:00
Regis Houssin
38246b4088
NEW add new function "setEntity()"
2019-06-03 11:13:26 +02:00
Laurent Destailleur
5530e003ba
Fix title
2019-06-02 19:47:19 +02:00
Laurent Destailleur
e6100310af
Fix missing title
2019-06-02 19:47:01 +02:00
Laurent Destailleur
ab73d8a6fc
Merge pull request #11258 from hregis/develop_security
...
FIX add Windows and Mac executable
2019-05-29 13:52:19 +02:00
Laurent Destailleur
05063016e8
FIX #11244 Enhance repair tool
2019-05-29 12:21:51 +02:00
Laurent Destailleur
2404e6a521
Fix cast to int
2019-05-28 12:38:21 +02:00
Regis Houssin
3df6f0f6c3
FIX wrong extension
2019-05-27 11:43:06 +02:00
Regis Houssin
c1242f409b
FIX add Windows and Mac executable
2019-05-27 11:32:46 +02:00
Laurent Destailleur
11bcfb4f5e
Fix check on VAT syntax not visible on list
2019-05-22 15:37:59 +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
f283e24b48
Fix the noexe must be added for dangerous extension like js and shells
2019-05-21 13:53:12 +02:00
Laurent Destailleur
94f5f6c655
Merge pull request #11207 from atm-john/FIX_scrutyniser
...
FIX: scrutinizer feedback
2019-05-18 16:05:24 +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
ATM John BOTELLA
f714b45efb
FIX scrutinizer feedback
2019-05-18 15:53:07 +02:00
Laurent Destailleur
2d0b3b7b23
Fix dol_sort_array for objects
2019-05-16 12:25:14 +02:00
Laurent Destailleur
4a69541419
Several bug fixes using phpstan
2019-05-15 18:59:46 +02:00
Laurent Destailleur
717cafe213
Fix doc
2019-05-15 17:50:35 +02:00
ptibogxiv
f50280f13b
Fix img_credit_card with payment methods
2019-05-10 01:16:58 +02:00
Laurent Destailleur
8442c86436
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
2019-05-02 17:40:41 +02:00
Laurent Destailleur
8d7f24a6d9
FIX Default value on form to send email
2019-05-02 15:34:29 +02:00
Laurent Destailleur
90a1181dc5
Debug module Ticket
2019-05-01 20:41:03 +02:00
Laurent Destailleur
a75c6a81d1
FIX Follow rule to create a new page
2019-05-01 17:15:42 +02:00
Laurent Destailleur
10dde837d0
Debug email collector
2019-04-25 19:32:48 +02:00
Laurent Destailleur
f19d96bf8d
NEW Show enabled modules in dol_print_error
2019-04-23 10:24:05 +02:00
ATM john
945e3db952
remove text
2019-04-16 22:03:11 +02:00
ATM john
965c973bda
Change class name
2019-04-16 22:02:23 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
John BOTELLA
a60d4b3b52
Appli btn apply to links
2019-04-16 09:09:25 +02:00
ATM john
07e6ce5460
Appli function to links
2019-04-15 21:33:31 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +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
cfa414b2de
Better log
2019-04-10 16:42:45 +02:00
Laurent Destailleur
917b9d69fa
Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and
...
not recommanded to use in Dolibarr.
2019-04-08 14:55:31 +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
54714bc755
Deprecated property ->fk_departement is now ->state_id everywhere.
2019-04-05 20:06:13 +02:00
Laurent Destailleur
1f00e24abc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-03 18:52:47 +02:00
Laurent Destailleur
9e5d87e821
Fix warning
2019-04-03 18:39:27 +02:00
Laurent Destailleur
82c19a6372
FIX Avoid error 500 when extension php-intl not loaded
2019-04-03 18:38:27 +02:00
Laurent Destailleur
c5f5abc67d
Fix css for MD theme
2019-04-03 14:37:38 +02:00
Laurent Destailleur
8a6e28860b
A better transition with deprecation
2019-04-01 22:09:24 +02:00
Laurent Destailleur
8fe1be1a67
Removed deprecated use of string in dol_print_date(). Only date allowed.
2019-04-01 19:27:34 +02:00
Laurent Destailleur
fc983fa65c
Move a function into functions2.lib.php
2019-04-01 18:46:13 +02:00
Laurent Destailleur
0c051e0cf0
Merge pull request #10923 from ptibogxiv/patch-145
...
NEW automatic / manual selector form
2019-04-01 18:44:05 +02:00
Laurent Destailleur
039e6034d1
Merge pull request #10936 from aspangaro/10.0_WARNING
...
LOG_WARNING on function dol_print_date with deprecated value
2019-03-31 18:45:01 +02:00
Laurent Destailleur
fca404e8d5
Show price without tax to prepare tax per customer country.
2019-03-30 19:30:58 +01:00
Alexandre SPANGARO
8163739a68
LOG_WARNING on function dol_print_date with deprecated value
2019-03-28 12:03:04 +01:00
ptibogxiv
2c71b98d0d
NEW automatic / manual selector form
2019-03-27 11:05:43 +01:00
Laurent Destailleur
513ef1e727
Fix label short
2019-03-25 16:16:08 +01:00
Laurent Destailleur
a950d8389e
WIP Attach document to expense report lines
2019-03-24 20:22:05 +01:00
Laurent Destailleur
152c27139f
Doc
2019-03-24 14:54:04 +01:00
Laurent Destailleur
614b4afeb0
NEW The preview of PDF files generates 1 png file even if several pages.
2019-03-24 14:53:26 +01:00
Laurent Destailleur
949ef79227
Better error message
2019-03-24 14:26:16 +01:00
Laurent Destailleur
fad6efd86c
WIP file attachment on expense report lines
2019-03-24 13:27:26 +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
28fede950f
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
...
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
Laurent Destailleur
70c2ffc816
FIX toggle of login_block was ko with eldy theme
2019-03-19 14:22:57 +01:00
Laurent Destailleur
5f9fa817fb
Fix bad log
2019-03-16 23:41:06 +01:00
Laurent Destailleur
e5567c7ee4
Fix typo
2019-03-16 14:48:41 +01:00
Laurent Destailleur
40c2ca4310
Fix label of status of third party record when using smartphone
2019-03-15 23:08:00 +01:00
Laurent Destailleur
7a5a561170
Fix label of status of invoice record when using smartphone
2019-03-15 23:00:50 +01:00
Laurent Destailleur
91f80934f3
Fix: On smartphone, hide label of status only on lists.
2019-03-15 20:39:55 +01:00
Laurent Destailleur
b6cacf3a20
Fix label of status for members on smartphone
2019-03-15 20:18:35 +01:00
Laurent Destailleur
d512e54407
Restore toggle of login_block because it was no more visible
2019-03-15 20:10:39 +01:00
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
...
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
6f0fbc42c1
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
...
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/members/new.php
htdocs/public/opensurvey/studs.php
2019-03-15 15:16:29 +01:00
Laurent Destailleur
e5c08978c3
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
2019-03-15 15:13:28 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
f8a4d9075b
Fix css for fontawesome 5
2019-03-14 11:48:25 +01:00
Laurent Destailleur
fcbd39fda9
Fix typo
2019-03-13 19:07:19 +01:00
Laurent Destailleur
e7cd8d690c
Remove warnings
2019-03-13 19:06:45 +01:00
Laurent Destailleur
1bd9d6a8e5
Fix font awesome 5 picto for notes
2019-03-13 15:02:43 +01:00
Laurent Destailleur
7d82073eab
Use fontawesome for icon "setup".
2019-03-12 11:57:55 +01:00
Laurent Destailleur
d762766a56
Font awesome 5 by default
2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle
2019-03-12 09:24:42 +01:00
Laurent Destailleur
abdc2aa21a
Fix phpcs
2019-03-11 21:03:23 +01:00
John BOTELLA
57c6c60118
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-11 14:44:35 +01:00
John BOTELLA
5d7118340b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-11 14:40:19 +01:00
Laurent Destailleur
fac329e637
Clean code
2019-03-11 01:01:15 +01:00
John BOTELLA
ccebb8d1a7
Fix travis errors
2019-03-08 14:40:22 +01:00
John BOTELLA
37cd62b564
Add user friendly behavior
2019-03-08 14:26:06 +01:00
John BOTELLA
218690db00
add css behavior
2019-03-07 17:05:27 +01:00
John BOTELLA
a0b14b9105
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-07 15:53:41 +01:00
John BOTELLA
74c8754092
fix travis
2019-03-07 15:49:16 +01:00
John BOTELLA
e382f13637
remove test
2019-03-05 17:16:38 +01:00
John BOTELLA
ef9ad4d109
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
2019-03-05 17:14:59 +01:00
John BOTELLA
600f0c9fa6
Fix condition
2019-03-05 17:14:29 +01:00
John BOTELLA
72d96d2ac3
prepare badges
2019-03-05 17:13:20 +01:00
John BOTELLA
6b98eecd32
fix compatibility status
2019-03-05 16:58:05 +01:00
John BOTELLA
95981ca14c
PR feedback
2019-03-05 15:26:19 +01:00
John BOTELLA
7cadaca8fc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-04 11:37:16 +01:00
John BOTELLA
c420cab500
fix travis errors
2019-03-04 11:11:15 +01:00
Laurent Destailleur
8fce6e5e31
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
03237d1730
NEW Look and feel v10 - Add CSS tabBarNoTop
2019-03-02 18:20:13 +01:00
Laurent Destailleur
5f6ca1119a
Replace arrow picto with fontawesome
2019-03-02 14:07:13 +01:00
John BOTELLA
421c009e58
Standardise new function name
2019-03-01 15:33:23 +01:00
John BOTELLA
162c3249cf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-01 13:49:42 +01:00
John BOTELLA
b222c44bb9
Add helper functions and little review size of badges
2019-03-01 12:01:25 +01:00
Laurent Destailleur
429da47d68
Fix default language of reminders
2019-02-28 13:11:14 +01:00
Laurent Destailleur
29cfa03fa4
Fix font awesome 5 regressions
2019-02-27 13:54:39 +01:00
John BOTELLA
9f0a93f68f
Add color lib for color automation
2019-02-26 17:44:16 +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
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
Laurent Destailleur
a3a89b755f
NEW Gain space by moving the meteo on title line
2019-02-20 06:01:13 +01:00
Laurent Destailleur
abfd610bbc
Fix quote not closed
2019-02-20 03:44:08 +01:00
Laurent Destailleur
e644de4a70
Fix for font awesome 5
2019-02-15 15:30:21 +01:00
Laurent Destailleur
c480f4be68
FIX Bad remote ip address when user is using a proxy
2019-02-15 15:17:24 +01:00
Alexandre SPANGARO
b99149b940
Move error on function dol_include_once() to LOG_WARNING
2019-02-12 16:34:52 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
ATM-Nicolas
4e35ebe52a
FIX : Default sign out icon if not using Font Awesome 5
2019-02-12 10:43:00 +01:00
Laurent Destailleur
27cad29e1e
Fix regression of right alignement
2019-02-11 15:06:52 +01:00
Laurent Destailleur
0bd30b160a
Fix picto logout with fontawesome 5
2019-02-11 11:55:48 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
522afd8e7b
Fix font awesome 5
2019-02-09 13:11:02 +01:00
Laurent Destailleur
38d4284638
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Regis Houssin
8860eab6b1
FIX wrong merged conflict
2019-02-05 07:40:50 +01:00
Frédéric FRANCE
e1e14ae6e6
wip
2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Laurent Destailleur
9fdba921b4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0
...
Fix #10317 et #10318
2019-01-30 16:43:14 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Pierre Ardoin
b6df02e795
Correction oubli date de livraison
...
Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs
2019-01-29 11:47:39 +01:00
Laurent Destailleur
08a181bfbf
Fix substitution of REF_CLIENT and REF_SUPPLIER
2019-01-29 11:00:17 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
ff39491f15
wip
2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Pierre Ardoin
6fdbded588
Update functions.lib.php
2019-01-26 14:40:00 +01:00
Pierre Ardoin
78f8607d41
Add date_livraison substitution
...
Complete the substitution for supplier orders.
2019-01-25 13:15:24 +01:00
Laurent Destailleur
e860d664d7
Fix substitution of __REF_CLIENT__
2019-01-23 11:54:20 +01:00
Laurent Destailleur
8104b7fa2d
look and feel v10
2019-01-22 15:40:51 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc
2019-01-21 18:04:48 +01:00
torvista
9b1cf648dc
more validation fixes
2019-01-21 16:19:31 +01:00
torvista
07b2bb6715
Swap of align/valign/border/width for css
...
Removal of type="text/javascript"
2019-01-20 23:36:39 +01:00
Laurent Destailleur
3ddfcbe3bb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
4ffd7de9f7
doc
2019-01-19 16:15:05 +01:00
Laurent Destailleur
f311deb405
Fix hash for gol_getprefix must not contains special char.
2019-01-19 16:14:45 +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
Laurent Destailleur
638be67f96
Fix tooltip
2019-01-16 13:56:13 +01:00
Laurent Destailleur
1f87b8bb18
FIX Position of price symbol (before) for nl_NL
2019-01-16 01:54:08 +01:00
Laurent Destailleur
126e02798a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
1306918eb0
FIX #10299
2019-01-07 16:03:55 +01:00
ldestailleur
5638ac8f4d
FIX title on picto no more visible
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-01-04 15:25:14 +01:00
ldestailleur
b4fc4b0178
FIX title on picto no more visible
2019-01-04 15:22:59 +01:00
ldestailleur
ab9fe1a757
Add option to use fontawesome 5 with fontawesome 4
2019-01-03 21:14:59 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
...
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
Laurent Destailleur
294107bba0
FIX vars for substitution must be null if not applicable (and not '')
2018-12-27 05:07:11 +01:00
Laurent Destailleur
6a708666b2
FIX vars for substitution must be null if not applicable (and not '')
2018-12-27 05:06:37 +01:00
Regis Houssin
4ee09c9d5b
FIX remove old unused and deprecated function
2018-12-25 07:58:32 +01:00
Laurent Destailleur
35debd06fb
List of events show user firstname by default
2018-12-23 01:28:36 +01:00
Laurent Destailleur
623afd1020
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-12-17 18:50:06 +01:00
Laurent Destailleur
17b2fd295f
FIX Css of amount on remain to pay on expense report
2018-12-17 13:57:30 +01:00
Laurent Destailleur
527ad04ae8
FIX Mandatory field feature should works on textarea
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52
FIX Mandatory field feature should works on textarea
2018-12-15 18:11:40 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc
2018-12-14 17:44:08 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Laurent Destailleur
539e2c55cd
FIX #9629 #9625
2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91
FIX #9629 #9625
2018-12-14 10:31:09 +01:00
Laurent Destailleur
3213b3be07
Standardize code: Move jabberid into social network module
2018-12-11 09:17:02 +01:00
Laurent Destailleur
138640fc63
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-12-04 14:58:11 +01:00
Laurent Destailleur
d80baaea69
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
2018-12-04 14:29:47 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Laurent Destailleur
01181ba3a4
Fix avoid warning
2018-11-28 13:06:39 +01:00
Laurent Destailleur
b9e544d291
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/resource/list.php
2018-11-26 23:08:06 +01:00
Laurent Destailleur
13e24dc894
Code comment
2018-11-23 15:35:40 +01:00
Laurent Destailleur
5bd9c14929
Update demo data for 8.0 and 9.0
2018-11-23 14:05:45 +01:00
Laurent Destailleur
1d4c756783
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-22 11:44:37 +01:00
Laurent Destailleur
5e9abe6aad
Fix getLanguageCodeFromCountryCode
2018-11-21 16:28:36 +01:00
Laurent Destailleur
b6dac7da20
FIX Remote ip detection was wrong with proxy (example: cloudflare)
2018-11-21 15:40:15 +01:00
Thibault Descamps
1cc130e5f6
NEW : conf to change concat desc order
2018-11-21 09:57:44 +01:00
Laurent Destailleur
1ecdaa548c
Remove the no more used and deprecated dol_print_graph function
2018-11-20 20:28:46 +01:00
Regis Houssin
7cba680f38
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-18 17:07:03 +01:00
Laurent Destailleur
6b8a3094f0
Fix missing some keys in substitution arrays
2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584
Fix trackid must contains an id of instance
2018-11-16 16:43:13 +01:00
Regis Houssin
2350908d4e
FIX change getEntity doc and changelog
2018-11-15 19:00:14 +01:00
Laurent Destailleur
85cdc44105
Several fixes in project creation, cache of dolGetIfFromCode, ...
2018-11-15 13:39:12 +01:00
Laurent Destailleur
77582b2a41
FIX the autofocus feature
2018-11-13 11:36:57 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
9a0b5fb599
Fix extrafields
2018-11-07 12:25:22 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
763f3cd518
Debug modulebuilder
2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
d65bf1fbc7
Fix emailcollector
2018-11-05 15:31:41 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
c9d00848e6
Merge pull request #9914 from frederic34/patch-27
...
make play and playdisable equals
2018-10-30 14:49:54 +01:00
Laurent Destailleur
4a71374cf7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
7a268d8d9f
Clean code
2018-10-30 14:27:14 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email
...
FIX the member e-mail on resign and validation.
2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php
2018-10-30 12:41:06 +01:00
Frédéric FRANCE
450a837393
make play and playdisable equals
2018-10-29 18:50:15 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Regis Houssin
866a7df510
FIX $forceentity is not used, replace by $currentobject if needed
2018-10-26 18:23:48 +02:00
De Coninck Laurent
d347cf3a85
set a message
2018-10-26 16:18:27 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-26 15:31:24 +02:00
Laurent Destailleur
d28c9ddea5
Merge pull request #9872 from laudeco/feature/improvement_module_picto
...
improve img_picto by returning ASAP
2018-10-26 15:20:40 +02:00
De Coninck Laurent
70cd68ebef
improve img_picto by returning ASAP
...
We do not need an else each time some times, return is good enough. I also remove some line of comments since it's only code in it. We have GIT to find the code back we do not need to put it in comment ;-).
2018-10-25 18:21:00 +02:00
atm-ph
f41e7e05e1
Fix PHP warnings printed in javascript
2018-10-25 12:01:17 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
de4ead2558
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
2018-10-19 14:16:53 +02:00
Frédéric FRANCE
70a98743e8
Update functions.lib.php
2018-10-14 10:48:06 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +02:00