Commit Graph

49532 Commits

Author SHA1 Message Date
arnaud
aaa6f00d11 FIX export propal and order with extrafields 2015-11-12 12:37:04 +01:00
Laurent Destailleur
b0419557b1 Exclude dir 2015-11-10 00:37:30 +01:00
Laurent Destailleur
98c32fa1ec FIX The label hidden was not supported when using jmobile 2015-11-10 00:36:33 +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
98b887edae Update doc to generate ChangeLog 2015-11-08 12:23:40 +01:00
Laurent Destailleur
42ae4e10b3 Abandon package APS. Was never used. 2015-11-08 12:19:05 +01:00
Laurent Destailleur
6b98c50510 FIX Add a protection to not make release if ChangeLog was not generated. 2015-11-08 12:16:30 +01:00
Laurent Destailleur
4a96fc5f62 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-08 12:12:39 +01:00
Laurent Destailleur
972c364c37 FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.8.2
2015-11-08 12:12:28 +01:00
Juanjo Menent
57f0d0b327 Merge pull request #3944 from FHenry/3.8
FIX : Remove  column creation for table llx_product_fournisseur_price,
2015-11-08 11:24:14 +01:00
Florian HENRY
a4fafae109 FIX : Remove column creation for table llx_product_fournisseur_price,
the column use un calss is fk_supplier_price_expression, and
fk_price_expression does not exist into lx_product_fournisseur_price sql
file declaration
2015-11-07 17:19:13 +01:00
Laurent Destailleur
3d04de201e Merge pull request #3911 from FHenry/3.8
FIX : only active customer should be available into select list thirdparty on invoice creation
2015-11-06 11:21:47 +01:00
Florian HENRY
b0be2b04c7 FIX : #3912 2015-11-06 10:53:33 +01:00
Florian HENRY
f6b8c3a130 FIX : #3912 2015-11-06 10:50:08 +01:00
Florian HENRY
121d2beb80 fix spacing 2015-11-06 10:34:18 +01:00
Florian HENRY
f220f584ce Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-06 10:31:03 +01:00
Florian HENRY
126b5d6eca FIX : only active customer should be available into select list
thirdparty on invoice creation
2015-11-06 10:19:10 +01:00
Laurent Destailleur
e78ebf041a Fix deprecated code not working in jcrop. $.browser.msie and $.browser
is no more available in jquery 1.9+.
2015-11-06 02:03:41 +01:00
Laurent Destailleur
58cac2d895 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/product/stock/fiche.php
	htdocs/product/stock/valo.php
2015-11-05 22:04:18 +01:00
Laurent Destailleur
375e61de2e Merge 3.5 2015-11-05 22:01:05 +01:00
Laurent Destailleur
5777c16b72 Merge pull request #3902 from altatof/clonedorderdate
FIX: change order date on clone (as everywhere else)
2015-11-05 21:49:50 +01:00
Laurent Destailleur
fdf9617e42 Merge pull request #3900 from GPCsolutions/dolibarr-3864
Fix #3864 Really fixed invalid jQuery code
2015-11-05 21:47:40 +01:00
Laurent Destailleur
d499fafdb9 Merge pull request #3901 from altatof/3.6
FIX bad calculation for stock value
2015-11-05 21:44:21 +01:00
Laurent Destailleur
60debe31c4 Merge pull request #3894 from altatof/stockvalue
FIX bad calculation for stock value
2015-11-05 21:44:15 +01:00
Laurent Destailleur
cbff03ca08 Merge pull request #3892 from atm-alexis/3.7_FIX_data_lose_event_userassigned
FIX event's data lost on user assign update
2015-11-05 21:36:34 +01:00
Christophe Battarel
316b7453e4 FIX bad stock valo 2015-11-05 17:04:08 +01:00
Christophe Battarel
80d2445540 FIX: bad stock valorisation 2015-11-05 17:00:22 +01:00
Christophe Battarel
ad82135879 FIX: change order date on clone (as everywhere else) 2015-11-05 15:36:13 +01:00
Christophe Battarel
75bcb7e53f fix pmp 2015-11-05 15:32:56 +01:00
Christophe Battarel
f566b38296 FIX pmp 2015-11-05 15:29:51 +01:00
Christophe Battarel
fa088eb6cc FIX bad calculation for stock value 2015-11-05 14:57:58 +01:00
Raphaël Doursenaud
b0cf9bd0be Fix #3864 Really fixed invalid jQuery code 2015-11-05 14:38:11 +01:00
Juanjo Menent
63d447d1a7 Merge pull request #3893 from fmarcet/3.8
FIX: Not showing category selector
2015-11-05 13:06:18 +01:00
Christophe Battarel
9b797c1831 FIX bad calculation for stock value 2015-11-05 12:49:43 +01:00
fmarcet
015dedc3ab FIX: Show category selector if we have permission to view products or
services
2015-11-05 11:53:45 +01:00
Alexis Algoud
e1ea2215a3 FIX loss data also if update was cancel by error of ended state with no end date, try a generic patch 2015-11-05 11:25:04 +01:00
Alexis Algoud
0543a31920 FIX event's data lost on user assign update 2015-11-05 11:11:03 +01:00
Laurent Destailleur
f319976e5d FIX #3878 Storing and deleting files on emailing was done at wrong place
Conflicts:
	htdocs/comm/mailing/card.php
2015-11-05 03:08:15 +01:00
Laurent Destailleur
fb34f25701 Merge pull request #3887 from GPCsolutions/dolibarr-3864
Fix #3864 Fixed invalid jQuery code
2015-11-05 02:34:24 +01:00
Laurent Destailleur
14ec86047f Merge pull request #3886 from GPCsolutions/dolibarr-3805
Fix #3805 Enhanced Facture::is_last_in_cycle()
2015-11-05 02:33:48 +01:00
Laurent Destailleur
4bb21fd218 Merge pull request #3884 from FHenry/3.8
FIX #3880
2015-11-05 02:32:32 +01:00
Laurent Destailleur
f3421bcf6d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-05 01:13:23 +01:00
Laurent Destailleur
77371af35a FIX #3661 Margin is not selected correctly when adding a product 2015-11-05 01:08:30 +01:00
Raphaël Doursenaud
69ac75bef8 Fix #3864 Fixed invalid jQuery code 2015-11-04 22:55:14 +01:00
Raphaël Doursenaud
c534f5bcd5 Fix #3805 Enhanced Facture::is_last_in_cycle() 2015-11-04 20:35:20 +01:00
Florian HENRY
876ab4bb59 FIX : #3882 2015-11-04 18:30:09 +01:00
Florian HENRY
c0136daeb5 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-04 18:24:22 +01:00
Florian HENRY
d4ee183662 FIX : 3880 2015-11-04 18:21:59 +01:00
Laurent Destailleur
09f3cd6f1d Fix class cant be abstract 2015-11-04 16:43:24 +01:00