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

63209 Commits

Author SHA1 Message Date
Laurent Destailleur
5d0ff28556 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/card.php
 2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/admin/defaultvalues.php
	htdocs/societe/card.php
 2019-01-08 01:53:00 +01:00
Laurent Destailleur
9d8b084115 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/core/actions_sendmails.inc.php
	htdocs/filefunc.inc.php
 2019-01-08 01:48:54 +01:00
Laurent Destailleur
8e3df45cbf Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/holiday/define_holiday.php
 2019-01-08 01:46:03 +01:00
Laurent Destailleur
f85389ac29 Fix missing td column 2019-01-08 01:11:34 +01:00
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
126e02798a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/fr_FR/cashdesk.lang
 2019-01-07 19:49:15 +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
b7c73d9460 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-07 18:09:35 +01:00
Laurent Destailleur
1403ac3cc1 Trans 2019-01-07 18:07:56 +01:00
Laurent Destailleur
1306918eb0 FIX #10299 2019-01-07 16:03:55 +01:00
Laurent Destailleur
ca2477a250
Merge pull request #10310 from AXeL-dev/patch-5 
FIX run_sql function: support for numbers in database prefix
 2019-01-07 14:10:46 +01:00
Laurent Destailleur
45ceab8294
Merge pull request #10306 from mapiolca/patch-3 
NEW Can add more lines on situation invoices at end of project when there is extra to add.
 2019-01-07 14:09:46 +01:00
Laurent Destailleur
34413727d8 Fix 2019-01-07 13:50:59 +01:00
AXeL-dev
66e1df753e run_sql function: support for numbers in database prefix 2019-01-07 09:33:24 +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
3d4879c538 Code comment 2019-01-06 05:16:50 +01:00
Laurent Destailleur
bac598965e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-06 01:22:19 +01:00
Laurent Destailleur
6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2019-01-06 01:22:10 +01:00
Laurent Destailleur
38ec05f2f1 Fix search filter lost 2019-01-06 01:17:11 +01:00
mapiolca
bab82a77b5
Update card.php 
Permettre d'ajouter des lignes complémentaires en cas de travaux supplémentaires lors des situations de travaux.
 2019-01-05 22:42:51 +01:00
Laurent Destailleur
b1559dbc39 Fix perms 2019-01-05 15:22:24 +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
74442911a7 Change to 7.0.6 2019-01-05 14:45:23 +01:00
Juanjo Menent
7908550937 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-05 13:05:50 +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
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