Commit Graph

94532 Commits

Author SHA1 Message Date
Frédéric FRANCE
b602a1b4a7
Update paiement_vat.php 2021-02-08 20:29:09 +01:00
Frédéric FRANCE
f8f3a27b6f
remove deprecated 2021-02-08 19:18:30 +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
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
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
b59f0071ea
Merge pull request #16164 from FHenry/dev_typent_jax_workcorrectly
NEW : Normalyse Type company field with ajax combobox
2021-02-08 15:35:42 +01:00
Laurent Destailleur
ea7a0f86f7
Update 13.0.0-14.0.0.sql 2021-02-08 15:34:55 +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
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
Laurent Destailleur
7acbaad8cf
Merge pull request #16212 from Hystepik/develop#3
Fix search by statut in list of holiday module
2021-02-08 15:03:31 +01:00
Florian HENRY
c0c6047538 fix ajax product missing condigtion 2021-02-08 11:54:29 +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
lmarcouiller
13b83e3150 Fix search by statut in list of holiday module 2021-02-08 09:47:43 +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
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
e474ee4d16 Fix add missing field 2021-02-07 21:30:46 +01:00
Laurent Destailleur
1f32d4a815 Avoid warning 2021-02-07 21:21:21 +01:00
Laurent Destailleur
dbabd12745 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-07 20:16:56 +01:00
Laurent Destailleur
8bda726619 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/notify/card.php
2021-02-07 20:16:13 +01:00
Laurent Destailleur
21d3519d42 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-07 20:13:38 +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
cb94216098
Merge pull request #16205 from atm-maxime/fix_supp_inv_list_leftjoin
Fix #15940 mixing different joins
2021-02-07 19:58:33 +01:00
Laurent Destailleur
dcae054352
Merge pull request #16202 from frederic34/patch-2
remove var not used
2021-02-07 19:57:25 +01:00
Laurent Destailleur
84a4d8f8f1
Merge pull request #16201 from frederic34/patch-1
fix html
2021-02-07 19:56:56 +01:00
Laurent Destailleur
caea73b1f2
Merge pull request #16204 from frederic34/nbsp
fix html
2021-02-07 19:56:34 +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
Maxime Kohlhaas
0e1353733d Fix #15940 mixing different joins 2021-02-07 19:21:52 +01:00
Frédéric FRANCE
c3d1f3de3c
fix html 2021-02-07 19:12:26 +01:00
Frédéric FRANCE
e0b2e26da6
fix html 2021-02-07 19:05:10 +01:00
Frédéric FRANCE
8d49ca9f0d
fix html 2021-02-07 18:49:46 +01:00
Frédéric FRANCE
05c7bcf70f
Update perms.php 2021-02-07 18:45:34 +01:00