Commit Graph

25892 Commits

Author SHA1 Message Date
Philippe GRAND
62d6666927 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:46:09 +01:00
Philippe GRAND
d9eb727c0f Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:44:46 +01:00
Philippe GRAND
f80da203e0 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:43:36 +01:00
Philippe GRAND
6b0bb90ab2 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:40:27 +01:00
Frédéric FRANCE
815f3602e3 clean deprecated modelpdf to model_pdf 2021-02-08 18:30:09 +01:00
Laurent Destailleur
925d81d1b3 Merge pull request #16002 from Hystepik/develop#1
New update of funnel of prospection
2021-02-08 18:05:48 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
2021-02-08 17:25:05 +01:00
Laurent Destailleur
c0aa7e7db5 Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
2021-02-08 17:19:40 +01:00
Laurent Destailleur
25823d7b90 Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY
Add hidden conf to display supplier in object lines
2021-02-08 16:58:28 +01:00
Laurent Destailleur
c33fb4badc Merge pull request #16219 from FHenry/dev_fix_continue
Add extrafileld value into return ajax
2021-02-08 16:57:03 +01:00
Florian HENRY
cb152b22df fix ajax 2021-02-08 15:47:37 +01:00
Laurent Destailleur
8041ef641a Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Laurent Destailleur
2440c11eec Merge pull request #16214 from FHenry/dev_fix_continue
Various fix in dev branch
2021-02-08 15:11:32 +01:00
Laurent Destailleur
fe9d23e90b Update functions.lib.php 2021-02-08 15:10:14 +01:00
Frédéric FRANCE
e15e8bcd05 Update functions.lib.php 2021-02-08 15:10:07 +01:00
Laurent Destailleur
7526bef3f8 Merge pull request #16211 from frederic34/patch-2
Update functions.lib.php
2021-02-08 15:08:46 +01:00
Laurent Destailleur
d0bbf5bf35 Update functions.lib.php 2021-02-08 15:08:24 +01:00
Laurent Destailleur
5c64173bfa Merge pull request #16209 from frederic34/barcodepicto
add barcode picto in left menu
2021-02-08 15:04:56 +01:00
Laurent Destailleur
026e454825 Merge pull request #16208 from frederic34/ecmpicto
add ecm picto in left menu
2021-02-08 15:04:42 +01:00
Florian HENRY
1e8117dc8a fix js 2021-02-08 11:49:30 +01:00
Florian HENRY
31ca17c619 fix require once 2021-02-08 11:06:21 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00
Alexandre SPANGARO
b8ea96ba57 Fix module asset in development 2021-02-08 05:39:07 +01:00
Frédéric FRANCE
c83ccb1e0f Update functions.lib.php 2021-02-08 00:46:46 +01:00
Frédéric FRANCE
e1a22b7209 add blockedlog picto in left menu 2021-02-07 22:18:34 +01:00
Frédéric FRANCE
3c8ddf917f add barcode picto in left menu 2021-02-07 22:15:20 +01:00
Frédéric FRANCE
b43dfe1139 add ecm picto in left menu 2021-02-07 22:04:46 +01:00
Laurent Destailleur
fc30b91960 Fix warning 2021-02-07 21:56:57 +01:00
Laurent Destailleur
8f4bd10a8d Merge pull request #16190 from FHenry/13_fix_checkdeposit_pdf_folder
FIX: #16189, fix download/see check deposit PDF
2021-02-07 21:34:18 +01:00
Laurent Destailleur
1f32d4a815 Avoid warning 2021-02-07 21:21:21 +01:00
Laurent Destailleur
899ae37f42 Merge pull request #16197 from CaringDev/noAutocompleteCaptcha
prevent browsers from storing / suggesting old captchas
2021-02-07 20:04:32 +01:00
Laurent Destailleur
92e67b2c54 Merge pull request #16195 from frederic34/morepictomodule
add more picto for module
2021-02-07 20:01:36 +01:00
Laurent Destailleur
92d40d065a Merge pull request #16207 from frederic34/patch-4
fix html
2021-02-07 20:01:03 +01:00
Laurent Destailleur
ec394a93f6 Merge pull request #16191 from grandoc/develop
fix typo
2021-02-07 19:59:54 +01:00
Laurent Destailleur
14241148f4 Merge pull request #16193 from frederic34/phpmin
update phpmin version
2021-02-07 19:59:35 +01:00
Laurent Destailleur
c24a8a22d5 Merge pull request #16203 from frederic34/patch-3
fix phpcs
2021-02-07 19:56:07 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems
Conflicts:
	htdocs/core/lib/company.lib.php
2021-02-07 19:47:33 +01:00
Frédéric FRANCE
dbe5c23ed5 Update box_produits_alerte_stock.php 2021-02-07 19:45:18 +01:00
Laurent Destailleur
8c71c8335e Fix TZ problems 2021-02-07 19:44:22 +01:00
Frédéric FRANCE
58a39a263b Update box_produits.php 2021-02-07 19:44:09 +01:00
Frédéric FRANCE
ebe7e1464a fix html 2021-02-07 19:38:46 +01:00
Frédéric FRANCE
b3dc87f3b7 fix phpcs 2021-02-07 18:31:31 +01:00
Laurent Destailleur
d4df62f1da Look and feel v14 2021-02-07 17:25:41 +01:00
Frédéric FRANCE
0bfe55c3d2 add picto mail 2021-02-06 17:26:16 +01:00
Frédéric FRANCE
b96e405717 add picto member 2021-02-06 17:18:00 +01:00
Raphael Schweizer
0be168561f prevent browsers from storing / suggesting old captchas 2021-02-06 16:10:05 +01:00
Frédéric FRANCE
3bcf795d55 add more picto for module 2021-02-06 14:44:08 +01:00
Frédéric FRANCE
eaaefe1382 5.5 to 5.6 2021-02-06 14:12:22 +01:00
Frédéric FRANCE
7860ffa28e update phpmin version 2021-02-06 13:48:31 +01:00