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

55397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d8e394d3aa FIX Missing field 2016-12-16 17:09:15 +01:00
Laurent Destailleur
929904041d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282 FIX Security to restrict email sending was not efficient 2016-12-16 13:46:39 +01:00
Laurent Destailleur
7fdd6ccbd2 Prepare 4.0.3 2016-12-15 22:50:20 +01:00
Laurent Destailleur
8f3ce46c50 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f Better fix to add server name into email id. 2016-12-15 12:11:39 +01:00
Laurent Destailleur
d32fd7aa11 FIX javascript xss injection and a translation 2016-12-15 11:55:33 +01:00
Laurent Destailleur
d2e4888bdd Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-14 12:21:33 +01:00
Laurent Destailleur
e4dd020887 Fix bad concat 2016-12-14 11:23:55 +01:00
Laurent Destailleur
af407a094a FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 11:20:44 +01:00
Laurent Destailleur
56b3f2c011 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 10:36:11 +01:00
Laurent Destailleur
530d3503f5 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 10:32:31 +01:00
Laurent Destailleur
43d18cd70c FIX if a supplier price reference is changed after creating an order, we 
can't clone order.
 2016-12-13 13:22:24 +01:00
Juanjo Menent
5c4ab99a9a Merge pull request #6132 from simnandez/3.9 
Fix #5646 Error editing Sell Price on products/services
 2016-12-11 14:32:00 +01:00
Laurent Destailleur
95d8faef04 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 10:51:15 +01:00
Laurent Destailleur
7fd75c793a FIX Regression when deleting product 2016-12-11 10:39:48 +01:00
Laurent Destailleur
9b436ce871 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 02:51:32 +01:00
Laurent Destailleur
b42a2616bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-12-11 02:34:59 +01:00
Juanjo Menent
56aafa4660 Fix #5646 Error editing Sell Price on products/services 2016-12-10 23:25:13 +01:00
Laurent Destailleur
6e9d6b4e49 Merge pull request #6128 from simnandez/3.9 
FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1
 2016-12-10 23:17:33 +01:00
Juanjo Menent
5a2b8ff53c FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1 2016-12-10 22:41:53 +01:00
Laurent Destailleur
f49d332b73 Merge pull request #6113 from atm-maxime/3.8 
Fix : delete product was not possible if batch stock
 2016-12-10 13:16:50 +01:00
Laurent Destailleur
46d84f8f11 Merge pull request #6111 from simnandez/3.8 
Fix: Delete surplus migration file
 2016-12-10 13:16:16 +01:00
Maxime Kohlhaas
97e21cb775 Fix : delete product was not possible if batch stock 2016-12-10 13:05:46 +01:00
Juanjo Menent
829ff2299e Fix: Delete surplus migration file 2016-12-10 12:46:26 +01:00
Laurent Destailleur
08f27a5c28 Merge pull request #6076 from olsesacl/#6062 
FIX: #6062 Can't add images to the description when edit product
 2016-12-10 12:13:44 +01:00
Laurent Destailleur
45783e6bc5 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-10 12:04:56 +01:00
Laurent Destailleur
a45915e4a0 Better message after report on #5933 2016-12-10 12:04:13 +01:00
Laurent Destailleur
668937d7c9 Merge pull request #6097 from hregis/4.0_bug 
Fix: contract use "total_vat" instead "total_tva"
 2016-12-10 11:41:09 +01:00
Regis Houssin
239e42faa0 Fix: contract use "total_vat" instead "total_tva" 2016-12-09 13:04:05 +01:00
Laurent Destailleur
7a8ac224ed FIX A draft can be deleted by a user with create permission. 2016-12-09 00:18:27 +01:00
Sergio Sanchis Climent
79d6fa334b FIX: Consistent description for add or edit product 2016-12-08 13:12:10 +01:00
Sergio Sanchis Climent
863e569593 Merge branch '4.0' of https://github.com/Dolibarr/dolibarr into #6062 2016-12-08 13:11:07 +01:00
Laurent Destailleur
c2bee0f937 FIX #6088 2016-12-07 12:44:56 +01:00
Laurent Destailleur
b6463c52b6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-07 11:54:57 +01:00
Laurent Destailleur
c75a00e683 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-07 11:54:41 +01:00
Laurent Destailleur
ad467989bf Merge pull request #6065 from atm-florian/3.9 
FIX : delete contract extrafields on contract deletion
 2016-12-07 11:54:04 +01:00
Laurent Destailleur
93764b7310 Merge pull request #6079 from jfefe/patch-11 
Fix : bad function name in skeletons list
 2016-12-07 11:52:21 +01:00
Laurent Destailleur
cfff6a8cb8 FIX Export of opportunity status must be code, not id. 2016-12-06 14:05:43 +01:00
Laurent Destailleur
0d7ab3301b FIX in export. Error when using a separate extrafields. 2016-12-06 11:52:07 +01:00
Laurent Destailleur
4abd417a6a Corrupted data must be fixed by repair not by code hack. 2016-12-03 19:50:52 +01:00
Laurent Destailleur
9c47f3d3fd Restore protection to avoid errors 2016-12-03 19:41:03 +01:00
Laurent Destailleur
6e5a8b6787 FIX Some statistics not compatible with multicompany module. 2016-12-03 19:14:16 +01:00
Laurent Destailleur
b0ac0624db FIX bad permission to see contract statistics 2016-12-03 18:21:55 +01:00
Laurent Destailleur
80f2623f9f FIX bad permission to see contract on home page 2016-12-03 18:20:57 +01:00
Laurent Destailleur
fe54673a87 FIX List of people able to validate an expense report was not complete. 2016-12-03 18:13:23 +01:00
Laurent Destailleur
69b5baebc5 FIX rendering of output of estimated amount on project overview page. 2016-12-03 15:54:06 +01:00
Laurent Destailleur
7a3b309013 Fix width 2016-12-03 15:22:26 +01:00
Laurent Destailleur
a75577516d Fix pb with multicompany on expense report 2016-12-03 15:13:04 +01:00
jfefe
64f76d8cab Fix : bad function name 2016-12-02 17:02:49 +01:00