Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 22:41:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

72480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
41743056bf Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 01:09:21 +01:00
Laurent Destailleur
087a4400b0 FIX Default value on sales representative on third party creation 2019-01-08 01:05:42 +01:00
Laurent Destailleur
1188540b41 Sync transifex 2019-01-07 19:39:41 +01:00
Laurent Destailleur
8b1455f29e FIX Cash fence 2019-01-07 19:35:20 +01:00
Laurent Destailleur
527ef8bdc8 Add nb of invoice to help cash fence 2019-01-07 19:02:38 +01:00
Laurent Destailleur
1306918eb0 FIX #10299 2019-01-07 16:03:55 +01:00
Laurent Destailleur
3d578cab28 Merge pull request #10308 from EuskalMoneta/7.0 
FIX Civility not saved when creating a member.
 2019-01-07 14:10:00 +01:00
Xebax
fbb1b344d1 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-06 13:44:13 +01:00
Xebax
2c496d2ac0 FIX Civility not saved when creating a member. 2019-01-06 13:42:41 +01:00
Laurent Destailleur
38ec05f2f1 Fix search filter lost 2019-01-06 01:17:11 +01:00
Laurent Destailleur
b1559dbc39 Fix perms 2019-01-05 15:22:24 +01:00
Laurent Destailleur
cbf1c30647 Fix better test tool 2019-01-05 15:19:07 +01:00
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
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 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
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
ldestailleur
2c474de61e FIX Update of timespent when date is empty 2019-01-04 15:44:39 +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
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
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
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
8b380489f2 Update commonobject.class.php 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-01-02 19:55:51 +01:00
Laurent Destailleur
c690b92410 Merge pull request #10277 from aspangaro/9.0_accountancy_html 
FIX: #10221 Html codes in accounting export
 2019-01-02 19:52:18 +01:00
Laurent Destailleur
752b73cb0d Merge pull request #10276 from aspangaro/9.0_accountancy 
FIX: Generation of FEC:CompteLib
 2019-01-02 19:51:57 +01:00
Laurent Destailleur
1202bb3173 Merge pull request #10274 from fmarcet/8.0 
FIX: Loan impossible to account
 2019-01-02 19:50:46 +01:00
Laurent Destailleur
a39336c80d Simple join is better than RIGHT JOIN 2019-01-02 19:50:23 +01:00
ldestailleur
a9e8e13bb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/user/param_ihm.php
 2019-01-02 19:41:39 +01:00