Commit Graph

51549 Commits

Author SHA1 Message Date
fappels
d36a463221 Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8 2015-11-07 09:00:51 +01:00
fappels
875d1d078d Merge remote-tracking branch 'refs/remotes/Dolibarr/3.8' into 3.8 2015-11-07 08:38:34 +01:00
Laurent Destailleur
e7554d377f Fix better error message 2015-11-06 19:07:05 +01:00
Laurent Destailleur
b2d9f21253 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-06 18:57:46 +01:00
Laurent Destailleur
d0e6db7f89 Use the new banner for first tab of products. 2015-11-06 18:57:35 +01:00
Gauthier
ef3c7f927e FIX : wrong coma in llx_opensurvey_sondage.sql creation script 2015-11-06 16:38:26 +01:00
Christophe Battarel
f52ae35dc6 NEW FEATURE PROPOSAL: on propale, order or invoice creation from
scratch, reload page after customer selection so its informations can be
loaded
2015-11-06 16:14:00 +01:00
Laurent Destailleur
9cb2d046d0 Merge pull request #3919 from marcosgdf/bug-3914
FIX #3194 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared
2015-11-06 12:32:26 +01:00
Laurent Destailleur
fdd93554ce Merge pull request #3921 from marcosgdf/fr-3898
NEW #3898 Remove deprecated Product::hidden property
2015-11-06 12:31:44 +01:00
Laurent Destailleur
b723ca7d16 Merge pull request #3920 from marcosgdf/fr-3768
NEW Deprecated Product::setPriceExpression. Use Product::update instead
2015-11-06 12:30:57 +01:00
Laurent Destailleur
2c4b0c0d24 Merge pull request #3918 from FHenry/develop
FIX: #3913
2015-11-06 12:20:22 +01:00
Marcos García de La Fuente
ac8bee28ef NEW #3898 Remove deprecated Product::hidden property
Close #3898
2015-11-06 11:40:22 +01:00
Marcos García de La Fuente
9969179267 NEW Deprecated Product::setPriceExpression. Use Product::update instead 2015-11-06 11:35:39 +01:00
Laurent Destailleur
bef4dd2bae Merge pull request #3917 from atm-maxime/develop
Fix : finally, autofocus on product search field is a bad idea...
2015-11-06 11:27:37 +01:00
Marcos García de La Fuente
610ef2359d FIX #3914 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared
Close #3914
2015-11-06 11:26:06 +01:00
Florian HENRY
28b229c83a FIX: #3916 2015-11-06 11:24:52 +01:00
Laurent Destailleur
7b81ae0886 Merge pull request #3915 from marcosgdf/updateprice-improvement
FIX Product::updatePrice() now sets new prices to Product::multiprices_* arrays
2015-11-06 11:23:27 +01:00
Laurent Destailleur
11f0cad2ab FIX #3912 2015-11-06 11:22:50 +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
d3d62f7db5 FIX: #3913 2015-11-06 11:11:23 +01:00
Maxime Kohlhaas
dac0a7bc50 Fix : finally, autofocus on product search field is a bad idea 2015-11-06 11:09:54 +01:00
Marcos García de La Fuente
f62d6d1950 FIX Product::updatePrice() now sets new prices to Product::multiprices_* arrays 2015-11-06 11:08:41 +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
Juanjo Menent
f33157033c Merge pull request #3909 from altatof/fixcloseshipping
FIX: change object statut on close shipping and remove erratic db commit
2015-11-06 10:16:00 +01:00
Juanjo Menent
87a102f5c8 Merge pull request #3910 from FHenry/3.7
FIX : only active customer should be available into select list thirdparty on invoice creation
2015-11-06 10:14:44 +01:00
Juanjo Menent
00433e9628 Merge pull request #3908 from grandoc/develop
[Qual] Uniformize code
2015-11-06 10:09:02 +01:00
Christophe Battarel
4d11205a01 FIX: change object statut on close shipping and remove erratic db commit 2015-11-06 09:51:33 +01:00
Florian HENRY
600dbced7e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-06 09:49:48 +01:00
Florian HENRY
8d829dca32 FIX : only active customer should be return into new invoice creation
select list
2015-11-06 09:49:02 +01:00
philippe grand
5f74a0f1c0 Traduction 2015-11-06 09:46:18 +01:00
philippe grand
67c9db6a51 [Qual] Uniformize code 2015-11-06 09:36:16 +01:00
Juanjo Menent
75c0331b38 Merge pull request #3907 from olsesacl/develop-fix
Maintain origin_id and origin for copy document
2015-11-06 09:15:36 +01:00
Sergio Sanchis Climent
6bf8b7f328 Default value origin_id and origin 2015-11-06 02:25:51 +01:00
Laurent Destailleur
eded4557fe Merge pull request #3906 from frederic34/escpos
Escpos
2015-11-06 02:21:58 +01:00
Laurent Destailleur
f9d0c887ae NEW Add a refresh button on page list of direct print jobs. 2015-11-06 02:20:42 +01:00
Sergio Sanchis Climent
6b01db5960 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-11-06 02:08:55 +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
0f358eea49 Fix path definition of thumbs with the new function 2015-11-06 01:56:56 +01:00
Sergio Sanchis Climent
de8e7107ee Maintain origin_id and origin for copy document
Fix any errors.
2015-11-06 01:53:20 +01:00
Laurent Destailleur
2dc644da30 Debug Direct print module using the OAuth setup. 2015-11-06 01:33:49 +01:00
frederic34
729f1c9d3a composer 2015-11-05 23:50:13 +01:00
frederic34
bd0c7c433f composer 2015-11-05 23:21:16 +01:00
Laurent Destailleur
80ec28f9c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-05 22:20:40 +01:00
Laurent Destailleur
0433f20354 Code comment 2015-11-05 22:20:31 +01:00
Laurent Destailleur
c673b1c0c8 Merge pull request #3905 from GPCsolutions/develop-3893
Fix missing category selector
2015-11-05 22:14:38 +01:00
Laurent Destailleur
04664c203d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
2015-11-05 22:13:08 +01:00