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

72122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c05628c746 Fix edit member module setup 2019-01-31 20:27:55 +01:00
Pierre Ardoin
2d6f5ca8ab
#Fix : Error in Total Products/Services 
Its correct an error in the total of stat Products/Services total.
 2019-01-31 20:22:56 +01:00
Laurent Destailleur
0a56069f67 Fix trans 2019-01-31 19:42:55 +01:00
Laurent Destailleur
189323ad58 Fix when using image into description 2019-01-31 18:12:34 +01:00
Laurent Destailleur
4254ad0d33 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-31 15:51:54 +01:00
Laurent Destailleur
14dea53700 FIX Missing field in import/export of users 2019-01-31 15:51:02 +01:00
Laurent Destailleur
fd67253e40 Clean package 2019-01-31 13:16:54 +01:00
Laurent Destailleur
57797b1309 Remove image 2019-01-31 12:48:51 +01:00
gauthier
caa937660d FIX : wrong test enabled 2019-01-31 12:43:39 +01:00
gauthier
bfc7265cbc FIX : better test on fetch 2019-01-31 11:53:10 +01:00
gauthier
09ba059c21 FIX : need an order by in case we found other invoice with same number but not same date 2019-01-31 11:03:06 +01:00
Laurent Destailleur
7d4475f812 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-31 10:23:16 +01:00
Laurent Destailleur
4c2b27560d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/viewimage.php
 2019-01-31 10:22:32 +01:00
Laurent Destailleur
484b4371c1 FIX XSS 
Conflicts:
	htdocs/viewimage.php
 2019-01-31 10:19:23 +01:00
Laurent Destailleur
5e46a359e0 FIX XSS 2019-01-31 10:18:06 +01:00
Laurent Destailleur
21c089fee9 FIX XSS 2019-01-31 10:17:29 +01:00
gauthier
0c4e5a6487 FIX : better test 2019-01-31 09:30:07 +01:00
Laurent Destailleur
045b8b13ed css 2019-01-30 23:20:57 +01:00
Laurent Destailleur
01f1f6162f Fix phpcs 2019-01-30 20:06:21 +01:00
Laurent Destailleur
c1f3f4c2b5 Fix: text for empty line not visible in select 2019-01-30 20:03:04 +01:00
Laurent Destailleur
f67937c59d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 18:54:29 +01:00
Laurent Destailleur
ae1c4e065b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-30 18:53:56 +01:00
Laurent Destailleur
231395dab8
Merge pull request #10398 from atm-john/fix_trigger 
Fix missing trigger
 2019-01-30 18:53:10 +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
41e20a9d4f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-30 16:44:08 +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
97248a830b FIX #10440 2019-01-30 16:28:37 +01:00
Laurent Destailleur
0fbf578edb
Merge pull request #10425 from tarrsalah/fix-css-on-disable-topmenu-images 
FIX css in the case of not showing topmenu images.
 2019-01-30 16:15:40 +01:00
Laurent Destailleur
104364ed02
Merge pull request #10459 from atm-gauthier/7.0_FIX_cmd_fourn_enabled 
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
 2019-01-30 15:51:09 +01:00
Laurent Destailleur
8d9b92698d
Merge pull request #10443 from EuskalMoneta/7.0 
FIX Fix PHP warning "count(): Parameter must be an array..."
 2019-01-30 15:48:31 +01:00
Laurent Destailleur
869159c09f Fix regression in look and feel (if empty, we do not sho value) 2019-01-30 15:31:39 +01:00
Laurent Destailleur
1a292839ca Fix regression in look and feel (if empty, we do not sho value) 2019-01-30 15:31:18 +01:00
Laurent Destailleur
17c3337c9b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 15:25:43 +01:00
Laurent Destailleur
96f46ec261
Merge pull request #10448 from hregis/8.0_mc 
FIX multicompany compatibility
 2019-01-30 15:25:16 +01:00
Laurent Destailleur
57e7df8acf
Merge pull request #10457 from atm-gauthier/8.0_FIX_commande_fourn_enabled 
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
 2019-01-30 15:03:08 +01:00
Laurent Destailleur
340412ed00 FIX generation of document for supplie rinvoice 2019-01-30 14:07:50 +01:00
Laurent Destailleur
f955f3f4ee Fix report error only if return code < 0 2019-01-30 12:23:34 +01:00
gauthier
9490929216 FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled 2019-01-30 10:49:32 +01:00
gauthier
412940b5ca FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled 2019-01-30 10:19:13 +01:00
Pierre Ardoin
99892c13b0
FIX : Erreur dans le Total 
Corrige l'erreur de calcul dans le total des produits et services
 2019-01-29 23:26:08 +01:00
Laurent Destailleur
205b7f2e95 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-29 19:04:40 +01:00
Laurent Destailleur
3d218cadb7 FIX last_main_doc var not saved 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-01-29 19:03:45 +01:00
Laurent Destailleur
3215870ae6 FIX Exclude not required field from log 2019-01-29 19:02:34 +01:00
gauthier
3477cf6bd3 FIX : must fetch member in current entity 2019-01-29 18:01:28 +01:00
Laurent Destailleur
c6755b3cf1 Fix formatting of number in quantity field 2019-01-29 15:59:41 +01:00
Pierre Ardoin
80cfe86508
Update objectline_view.tpl.php 2019-01-29 14:26:14 +01:00
Pierre Ardoin
5ea1cf0775
Update objectline_edit.tpl.php 2019-01-29 14:25:34 +01:00
Regis Houssin
9539bea68a FIX bad sql request 2019-01-29 12:17:51 +01:00
Regis Houssin
39b696af02 FIX multicompany compatibility 2019-01-29 12:01:40 +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