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

77820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0a0fa3ec88
Merge pull request #12519 from aspangaro/10.0_p10 
Fix Ticket - Align language type with datas for translation
 2019-11-26 09:10:34 +01:00
Alexandre SPANGARO
6cc61fef9c Fix Ticket - Deprecated <center> 2019-11-26 04:32:38 +01:00
Alexandre SPANGARO
60f19d134c Fix Ticket - Align language type with datas for translation 2019-11-26 03:58:01 +01:00
Laurent Destailleur
c7aaed1264 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2019-11-24 18:14:18 +01:00
Laurent Destailleur
8656143050 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:13:02 +01:00
Laurent Destailleur
98a7a5559f Fix bad fix 2019-11-24 18:12:40 +01:00
Laurent Destailleur
f2e01834a5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:11:46 +01:00
Laurent Destailleur
27e4c66dd5 Fix empty 2019-11-24 18:11:11 +01:00
Laurent Destailleur
cf0311dd6a FIX Hook getAccessForbiddenMessage was missing parameters 2019-11-22 16:13:22 +01:00
Laurent Destailleur
186a13f101 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2019-11-22 14:51:13 +01:00
Laurent Destailleur
ece35538f0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-22 14:49:29 +01:00
Laurent Destailleur
9eb98ca94c
Merge pull request #12478 from ptibogxiv/patch-281 
FIX display job of contact list
 2019-11-22 14:26:12 +01:00
Laurent Destailleur
eeaef48349
Merge pull request #12488 from atm-gauthier/8.0_fix_recalcultva_only_if_not_ventil 
FIX : we need to be able to recalculate tva only if invoice not ventil
 2019-11-22 14:25:40 +01:00
Laurent Destailleur
4043356f3a
Update card.php 2019-11-22 14:25:32 +01:00
Laurent Destailleur
fcfe579e14
Merge pull request #12472 from atm-john/10.0_fix_extrafields_expedition 
Fix dom and showOptionals call
 2019-11-22 14:23:24 +01:00
Laurent Destailleur
5fdd6f698d More complete error message 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2019-11-21 20:46:27 +01:00
gauthier
a8d02615a8 FIX : we need to be able to recalculate tva only if invoice not ventil 2019-11-21 14:58:20 +01:00
Laurent Destailleur
3daeb24da1 Fix confusion with field name in sql 2019-11-21 13:05:13 +01:00
ptibogxiv
f73bd0e0a6
FIX display job of contact list 
can see différent contact with same name but different job
 2019-11-20 13:07:26 +01:00
Laurent Destailleur
7dba9ecdf4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-19 18:56:22 +01:00
Laurent Destailleur
2f3b4d239b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-19 18:56:12 +01:00
John Botella
8f5c8c63df Fix dom and showOptionals call 2019-11-19 16:35:31 +01:00
Laurent Destailleur
3c09bbf739
Merge pull request #12468 from atm-florian/10.0 
fix title page linked files user
 2019-11-19 10:54:41 +01:00
Laurent Destailleur
49aa6ef9fa
Merge pull request #12467 from atm-greg/Fix_ContactCardCivility 
fix bad getpost for civility_code in edit mode
 2019-11-19 10:54:17 +01:00
Laurent Destailleur
66aa367851
Merge pull request #12465 from aspangaro/10.0_p9 
Missing language key
 2019-11-19 10:53:47 +01:00
Laurent Destailleur
5b6f0cb101 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2019-11-18 21:19:10 +01:00
florian HENRY
010219bf09 fix title pasge linked files user 2019-11-18 19:47:34 +01:00
Laurent Destailleur
f696998093 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-11-18 19:02:25 +01:00
Laurent Destailleur
918f476c2b Fix backport fix not checking mandatory extrafields of type select 2019-11-18 19:02:12 +01:00
Laurent Destailleur
fffc242484 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-11-18 18:09:25 +01:00
Laurent Destailleur
74c85b742e Fix ref must be null until the generation of ref is ok 2019-11-18 18:09:12 +01:00
atm-greg
99f93dbbf5 fix bad getpost 2019-11-18 14:33:01 +01:00
Alexandre SPANGARO
79ee2b8c4d Missing language key 2019-11-18 11:48:44 +01:00
Laurent Destailleur
d86eb5cdb1
Merge pull request #12457 from aspangaro/10.0_p20191116 
#12450 Fix accountancy write social contribution in bookkeeping (Need for FEC format)
 2019-11-16 23:31:21 +01:00
Alexandre SPANGARO
3937b45c5f Core - Fix accountancy write social contribution in bookkeeping (Need for FEC format) 2019-11-16 07:51:38 +01:00
Laurent Destailleur
bb493c6515
Merge pull request #12438 from atm-gauthier/8.0_invoice_createfromclone 
FIX : wrong invoice id for fetchObjetctLinked
 2019-11-16 00:43:18 +01:00
Laurent Destailleur
7e52c70321 FIX Advisory ID: usd20190067 2019-11-14 21:16:18 +01:00
Laurent Destailleur
f7ab1498a7 FIX Advisory ID: usd20190053 2019-11-14 17:00:02 +01:00
Laurent Destailleur
80b3e27341 Fix bad name of constant 2019-11-14 14:23:48 +01:00
Laurent Destailleur
7e0ae4bf0e FIX The pdf templates were using the large logo making PDF too large 2019-11-14 14:17:22 +01:00
Laurent Destailleur
a29adc94f3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/card.php
	htdocs/langs/en_US/admin.lang
 2019-11-14 12:48:33 +01:00
Laurent Destailleur
ee800189a6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-14 12:45:00 +01:00
Laurent Destailleur
9d963a7ca6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-14 12:44:32 +01:00
gauthier
a5635825f3 FIX : wrong invoice id for fetchObjetctLinked 2019-11-14 12:09:32 +01:00
Laurent Destailleur
6b1d7f5382
Merge pull request #12432 from frederic34/patch-7 
FIX #12385
 2019-11-14 08:51:23 +01:00
Frédéric FRANCE
3ec7568559
FIX #12385 2019-11-13 20:44:21 +01:00
Laurent Destailleur
dae39e25d2
Merge pull request #12422 from aspangaro/9.0_p20191113 
Missing language key
 2019-11-13 18:33:30 +01:00
Alexandre SPANGARO
85e2546019 Missing language key 2019-11-13 15:25:23 +01:00
Alexandre SPANGARO
0497c399d7 Missing language key 2019-11-13 14:59:07 +01:00
Laurent Destailleur
74239d48bf Fix translation of extrafields when $extralabels not loaded 2019-11-13 11:11:08 +01:00