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

72930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b5ad35f886 Fix better test tool 2019-01-05 15:18:37 +01:00
Laurent Destailleur
c9e6074551 Code clean 2019-01-05 15:14:06 +01:00
Laurent Destailleur
59d6000e89 Code comment 2019-01-05 15:13:35 +01:00
Juanjo Menent
18f8deb6e9
Merge pull request #10300 from grandoc/new_branch_04_01_2019 
fix : bad link
 2019-01-05 14:56:10 +01:00
Juanjo Menent
e8424ebec3
Merge pull request #10304 from simnandez/7.0 
Change to 7.0.6
 2019-01-05 14:47:24 +01:00
Juanjo Menent
74442911a7 Change to 7.0.6 2019-01-05 14:45:23 +01:00
Juanjo Menent
709d173669
Merge pull request #10303 from simnandez/7.0 
Fix #8152 and prepare 7.0.5
 2019-01-05 14:00:02 +01:00
Juanjo Menent
96967100ba Prepare 7.0.5 2019-01-05 13:35:32 +01:00
Juanjo Menent
7908550937 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-05 13:05:50 +01:00
Juanjo Menent
61fbfaf356
Merge pull request #10298 from fmarcet/7.0 
FIX: Can't generate invoice pdf
 2019-01-05 13:02:58 +01:00
ldestailleur
0ce514079b FIX Button journalize grey when mandatroy setup not done 2019-01-05 12:51:08 +01:00
Philippe GRAND
c289bd5e62 fix : bad link 2019-01-04 21:33:12 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00
ldestailleur
e47cf24fa1 Try to fix chrome xss protection 2019-01-04 19:10:25 +01:00
ldestailleur
89f24f6fe8 Fix cache not working on css files 2019-01-04 18:58:36 +01:00
ldestailleur
3485d0b4e5 Fix regression when editing html source 2019-01-04 18:39:02 +01:00
ldestailleur
3b6d6eec9a Fix cach on image for website 2019-01-04 18:06:54 +01:00
mapiolca
aa10d345bd
Update societe.class.php 
Ajoute la sélection de l'entité avec Multicompagny pour les encours clients.
 2019-01-04 17:57:16 +01:00
ldestailleur
5094b6bcfc WIP Work on split of timespent 2019-01-04 16:24:56 +01:00
ldestailleur
2c474de61e FIX Update of timespent when date is empty 2019-01-04 15:44:39 +01:00
ldestailleur
b928a49b1b FIX Update of timespent when date is empty 2019-01-04 15:44:09 +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
Ferran Marcet
f3dd875fc7 FIX: Can't generate invoice pdf 2019-01-04 12:00:39 +01:00
Ferran Marcet
4694af0488 FIX: Can't generate invoice pdf 2019-01-04 11:45:02 +01:00
Ferran Marcet
3e358c90b3 Merge branch '7.0up' into 7.0 2019-01-04 11:32:19 +01:00
Ferran Marcet
15cc45b8ae FIX: Can't generate invoice pdf 2019-01-04 10:52:10 +01:00
ldestailleur
082b126c06 FIX Can't switch page when html editing without save or cancel 2019-01-03 22:39:51 +01:00
ldestailleur
1ae11c554b Fix regression if style 2019-01-03 21:35:25 +01:00
ldestailleur
66a99be097 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-03 21:15:13 +01:00
ldestailleur
ab9fe1a757 Add option to use fontawesome 5 with fontawesome 4 2019-01-03 21:14:59 +01:00
ldestailleur
cf84fdf7c7 Translate option "Simplify interface for blind persons" 2019-01-03 20:07:58 +01:00
ldestailleur
1b19f5153b Fix cash fence feature 2019-01-03 14:18:02 +01:00
ldestailleur
7c1ed5b913 FIX #9972 #10297 2019-01-03 13:28:35 +01:00
Josep Lluís
60d3cced37 FIX: delete all contact categories 
Delete all contact categories is not necessary on contact card.
Current function setCategories will do it when necessary.

Conflicts:
	htdocs/contact/card.php
 2019-01-03 13:00:06 +01:00
Laurent Destailleur
62ba4ba2cb
Merge pull request #10291 from joseplluis/patch-5 
FIX: delete all contact categories
 2019-01-03 12:58:11 +01:00
ldestailleur
aaf5408f08 Fix user/pass not mandatory 2019-01-03 12:57:03 +01:00
ldestailleur
dbbfdd984a Fix emailcollector can't be used without syntax rules 2019-01-03 11:47:27 +01:00
ldestailleur
ff582a38e1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-03 11:12:27 +01:00
ldestailleur
5f9bbbcdd7 Fix migration 2019-01-03 11:12:14 +01:00
Laurent Destailleur
66b2a82be6
Merge pull request #10292 from atm-gauthier/6.0_fix_holidays 
FIX : holidays get natural_search if search params are set only
 2019-01-02 20:04:39 +01:00
Laurent Destailleur
fad9a0cf32
Merge pull request #10287 from aspangaro/9.0_p3 
Small fix
 2019-01-02 20:02:05 +01:00
Laurent Destailleur
5ebada065f
Merge pull request #10284 from ptibogxiv/patch-101 
New Use ajax switch into setup of TakePos
 2019-01-02 20:01:16 +01:00
Laurent Destailleur
8c1d362e8d
Merge pull request #10286 from ptibogxiv/patch-103 
New Use ajax switch into on socialnetworks.php
 2019-01-02 20:00:44 +01:00
ldestailleur
f5b3ba231f Fix phpcs 2019-01-02 20:00:08 +01:00
Laurent Destailleur
d2ad38f998
Merge pull request #10283 from ptibogxiv/patch-100 
NEW Use ajax switch into setup of donation.php
 2019-01-02 19:59:25 +01:00
Laurent Destailleur
d613041703
Merge pull request #10282 from ptibogxiv/patch-99 
NEW: Use ajax swith button on setup of multi-currency module
 2019-01-02 19:58:20 +01:00
Laurent Destailleur
8b380489f2 Update commonobject.class.php 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-01-02 19:55:51 +01:00
Laurent Destailleur
e1094e6465
Merge pull request #10279 from glu000/develop 
Update commonobject.class.php
 2019-01-02 19:54:08 +01:00
Laurent Destailleur
85d60b93d6
Update commonobject.class.php 2019-01-02 19:53:59 +01:00