lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,273 Commits 43 Branches 150 Tags 886 MiB
321933f267
Commit Graph

3430 Commits

Author SHA1 Message Date
fmarcet
e4a2b5abb3 Fix: Incorrect document link on supplier invoices's list 2016-06-30 11:27:29 +02:00
Laurent Destailleur
db2269b9dd Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:12:34 +02:00
phf
8ccda16ef3 Fix call function ldap_connect but not exists 2016-06-04 14:50:32 +02:00
Laurent Destailleur
53386e22ea Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/index.php
 2016-04-29 20:39:17 +02:00
Laurent Destailleur
0735413e7c Merge pull request #5101 from altatof/fix_fournprice_select 
FIX: end of select when no fournprice
 2016-04-29 20:36:44 +02:00
Christophe Battarel
2a0c508d47 FIX: end of select when no fournprice 2016-04-25 11:26:13 +02:00
Marcos García de La Fuente
b2f922291f FIX #4851 Project selector in supplier invoices shows the project label twice 
Close #4851
 2016-04-09 22:38:58 +02:00
Florian HENRY
1f723cb8d0 FIX : Template email must take care of positino column 2016-04-07 14:16:10 +02:00
Laurent Destailleur
00bf8caa8c FIX #4870 2016-03-25 17:55:58 +01:00
Laurent Destailleur
a9aab7545e Merge pull request #4575 from altatof/fix_ttc_display 
FIX: add missing global def for ttc column
 2016-02-15 00:14:34 +01:00
abb
834f0b20ae fix:no transaction in this place 2016-02-14 20:55:09 +01:00
Christophe Battarel
7a6c7f10a6 FIX: add missing global def for ttc column 2016-02-05 19:14:40 +01:00
Laurent Destailleur
7044e62afa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 18:37:13 +01:00
Laurent Destailleur
bf7181a064 All messages separated with , into errorsToString 2016-02-05 18:37:01 +01:00
Laurent Destailleur
02c54f4ea6 Merge pull request #4573 from altatof/fix_ttc 
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
 2016-02-05 18:34:45 +01:00
Christophe Battarel
f0aef88589 better fix 2016-02-05 13:49:19 +01:00
Frédéric FRANCE
a656607122 Update CMailFile.class.php 2016-02-04 17:12:58 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5 Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-23 11:32:06 +01:00
Marcos García de La Fuente
da637db162 FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays 2016-01-18 10:17:59 +01:00
Laurent Destailleur
6685502d5c Fix add Croatia into list of country in EEC 2016-01-10 13:05:22 +01:00
Laurent Destailleur
5afed31265 Merge pull request #4305 from marcosgdf/bug-4036 
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
 2015-12-27 17:37:29 +01:00
Marcos García de La Fuente
c40c695d20 FIX #4036 Direct printing module without any driver configured, shows an unformatted error message 2015-12-27 14:58:33 +01:00
Marcos García de La Fuente
686348a0d6 FIX #4287 SQL error when accessing an unexisting proposal 2015-12-25 11:47:48 +01:00
Laurent Destailleur
7e03aaee23 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	composer.json
	htdocs/product/ajax/products.php
	htdocs/product/class/product.class.php
 2015-12-21 12:24:24 +01:00
Laurent Destailleur
9334cf8fd1 FIX #4243 sql injection 2015-12-19 18:03:08 +01:00
Laurent Destailleur
cdc408a84c Fix: button "now" was not working on date using no javascript 2015-12-17 17:16:26 +01:00
Laurent Destailleur
3e3dbf850f Fix: bad case for function 2015-12-15 09:44:17 +01:00
Florian HENRY
10a925f7b4 FIX: WHERE 1=1 2015-12-03 11:52:41 +01:00
Florian HENRY
281eaf2987 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-03 10:27:23 +01:00
Florian HENRY
bd632cf2b0 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-02 12:12:26 +01:00
phf
cbcb79b1eb FIX jquery select of project generate js error on change event 2015-11-27 16:58:28 +01:00
Laurent Destailleur
a6d8f943df Fix several bugs into leave requets module 2015-11-26 02:12:37 +01:00
Laurent Destailleur
f353464bce Prepare code to fix #4095 2015-11-26 00:47:17 +01:00
Laurent Destailleur
7bde781206 Merge pull request #4061 from marcosgdf/bug-3231 
FIX #3231 [Members] Public subscription page displays GeoIP error
 2015-11-21 17:58:29 +01:00
Marcos García de La Fuente
a456d21249 FIX #3231 [Members] Public subscription page displays GeoIP error 2015-11-21 13:25:09 +01:00
Florian HENRY
80f19de223 fix && vs and 2015-11-19 16:32:25 +01:00
Laurent Destailleur
508b11733a Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name 
FIX 3.8 allow to search on alias name into select
 2015-11-16 23:48:18 +01:00
Laurent Destailleur
0e511027f6 Merge pull request #4003 from marcosgdf/bug-3996 
FIX #3996 Dictionnary hooks are not working in 3.8
 2015-11-16 23:41:06 +01:00
Alexis Algoud
a7d2bdc2c1 FIX 3.8 allow to search on alias name into select 2015-11-16 19:10:20 +01:00
Marcos García de La Fuente
8e9e2911ae FIX #3996 Dictionnary hooks are not working in 3.8 2015-11-16 13:18:25 +01:00
Florian HENRY
c3b7bbfb3b FIX : #3990 2015-11-15 20:00:11 +01:00
Laurent Destailleur
5b1e20494b Merge pull request #3977 from FHenry/3.8 
FIX : showrefnav htmlspecialchar instead of < >
 2015-11-13 19:22:41 +01:00
Florian HENRY
2a2155a239 FIX : showrefnav htmlspecialchar instead of < > 2015-11-13 14:40:52 +01:00
phf
81a8933256 FIX autofocus on input search product 2015-11-13 10:36:32 +01:00
Laurent Destailleur
71fa347e8e FIX Better compatibility for users that used the not supported option 
MAIN_USE_JQUERY_MULTISELECT set to 1.
 2015-11-08 18:40:12 +01:00
Laurent Destailleur
f928062e2b FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO 2015-11-02 17:56:32 +01:00
Laurent Destailleur
269fb87342 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-02 11:46:12 +01:00
Laurent Destailleur
20a1863866 FIX IF autocomplete was set on thirdparty list, it was not possible to 
open list of extrafields.
 2015-11-02 11:45:59 +01:00