lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,041 Commits 43 Branches 150 Tags 886 MiB
13.0
Commit Graph

6525 Commits

Author SHA1 Message Date
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 879b4d8e7f, reversing
changes made to ddc01b4c27.
 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