lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,224 Commits 43 Branches 150 Tags 886 MiB
28fa0e4e5d
Commit Graph

83224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Ardoin
c7181830fc
Fix the display of the banner with multicompany 
Before : if a account of a entity require to define the Journal code, Banner displayed in all entities.

Now : Show the banner only in the entity concerned.
 2020-02-12 09:11:39 +01:00
ptibogxiv
f17c7f4cb3
fix for unit with rowid (netmeasure) 2020-02-11 20:21:53 +01:00
ptibogxiv
558ccdd8b9
Update card.php 2020-02-11 20:20:34 +01:00
ptibogxiv
5459e4b821
Fix netmeasure update and display 
nb: netmeasure is for real weight, volume or piece;

 i'll try to introduce in v12 price by unit using this value ( needed for some business ie fruits, vegetables....)
 2020-02-11 20:11:37 +01:00
Laurent Destailleur
cc6313cdf3 Fix import examples 2020-02-11 19:32:27 +01:00
Laurent Destailleur
aa9ffbba05 Fix missing fields property 2020-02-11 19:18:36 +01:00
stickler-ci
27dd9aec9f Fixing style errors. 2020-02-11 16:12:48 +00:00
John Botella
02f268ea4e FIX - hasDelay for retained warranty 2020-02-11 16:54:27 +01:00
Laurent Destailleur
3c865cbf72 Fix button cancel and re-open 2020-02-11 16:51:38 +01:00
stickler-ci
fc170c1081 Fixing style errors. 2020-02-11 15:20:46 +00:00
atm-greg
66f6d1bfd4 add missing fields 2020-02-11 15:57:49 +01:00
Laurent Destailleur
03ee488d5f Fix look and feel v11 2020-02-11 10:41:50 +01:00
Ruger
8d9de521f3 FIX: #13038 ExpenseReport PDF - custom category description is not correct 2020-02-11 09:13:15 +01:00
Regis Houssin
275b5d1f77 FIX #10309 2020-02-11 07:32:29 +01:00
Laurent Destailleur
7878fe49df Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-10 21:29:05 +01:00
Laurent Destailleur
ee7aa14247 Fix color of status 2020-02-10 21:28:49 +01:00
Alexandre SPANGARO
c77169ad87 FIX : Problem with column label in subscription list 2020-02-10 16:01:09 +01:00
Laurent Destailleur
453315bc63
Merge pull request #13073 from RubenRuCh/11.0 
FIX: #13018 Extrafields Supplier invoice
 2020-02-10 15:38:17 +01:00
Laurent Destailleur
644b27bcf9 Fix look and feel v11 2020-02-10 13:34:09 +01:00
Laurent Destailleur
b9a8d82b2f FIX Filter on list of events were lost after "Back to list" 2020-02-10 13:29:26 +01:00
Laurent Destailleur
918e570e7a FIX Picture of contact not visible in tooltip 2020-02-10 12:56:08 +01:00
AdrianDominik
5432ab3b05 FIX: #13018 Extrafields Supplier invoice 2020-02-10 11:18:59 +01:00
Laurent Destailleur
07fbaa02d1 FIX #13050 2020-02-09 19:36:12 +01:00
Laurent Destailleur
d49943ab37 FIX #13019 2020-02-09 18:38:27 +01:00
Laurent Destailleur
94d6fa06dc FIX #13022 2020-02-09 18:34:53 +01:00
Laurent Destailleur
d789dd0366 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-09 18:29:09 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
c7736dde41 FIX CVE-2019–17223 2020-02-09 18:28:34 +01:00
Laurent Destailleur
6badf724cf FIX Mail smtps truncated if content has a line with single . 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-09 16:38:19 +01:00
Laurent Destailleur
53f740c60e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-09 16:37:19 +01:00
Laurent Destailleur
5c000159c1 FIX Mail smtps truncated if content has a line with single . 2020-02-09 16:36:38 +01:00
Laurent Destailleur
6daa10b499 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-08 19:10:52 +01:00
Laurent Destailleur
c2830f9e79 FIX Look and feel v11 2020-02-08 18:18:41 +01:00
Laurent Destailleur
0a912f4e8a Fix missing class 2020-02-08 18:18:22 +01:00
Laurent Destailleur
81df5cd9ab Merge pull request #13032 from atm-florianm/FIX_11.0_select_extrafield_filtering 
FIX 11.0 - default filtering for 'select' extrafields should use "=", not "LIKE"
 2020-02-08 17:16:01 +01:00
pnueda
c083458adf Update html.formfile.class.php 
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
 2020-02-08 16:18:52 +01:00
Laurent Destailleur
102428a503 Merge pull request #13056 from atm-lena/FIX_cabyprodlist_filter 
FIX CA by prod list filter
 2020-02-08 16:09:18 +01:00
Laurent Destailleur
5fccbcc469
Merge pull request #13054 from hregis/10.0_mc 
FIX missing hook parameter
 2020-02-08 16:08:13 +01:00
Laurent Destailleur
8bcff9a0f1
Merge pull request #13052 from fappels/11_fix_expedition_ceate_line 
FIX expedition ceate line new parameter is not required.
 2020-02-08 16:07:36 +01:00
Laurent Destailleur
c27260869b FIX #13046 More complete 2020-02-08 15:59:08 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-02-08 15:42:35 +01:00
Laurent Destailleur
b01e1e7724 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-08 15:30:16 +01:00
Laurent Destailleur
4b6276ff92 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-08 15:28:59 +01:00
Laurent Destailleur
14531bf160 Fix #13046 - Bad parenthesis on test 2020-02-08 15:28:40 +01:00
Laurent Destailleur
1a167aa5b4 Update card.php 
Conflicts:
	htdocs/compta/tva/card.php
 2020-02-08 15:12:55 +01:00
Laurent Destailleur
9b9101dc2f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/tools/export_files.php
 2020-02-08 15:09:24 +01:00
Laurent Destailleur
5f5645a184
Merge pull request #13044 from ksar-ksar/10.0 
FIX : Warning on admin/export_files
 2020-02-08 15:05:44 +01:00
Laurent Destailleur
34192f25f6 Merge pull request #13042 from ksar-ksar/11.0 
FIX : Update export_files.php
 2020-02-08 15:05:26 +01:00
ksar
e951743077 Update export_files.php 
Remove Warning
 2020-02-08 15:04:27 +01:00
Laurent Destailleur
2a897ac91a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-08 15:02:49 +01:00