Commit Graph

50345 Commits

Author SHA1 Message Date
frederic34
01d4bd6cf5 bad invert 2015-11-11 17:19:53 +01:00
frederic34
b8a84d68ec add messages 2015-11-09 18:19:10 +01:00
frederic34
7349862b64 translations 2015-11-07 11:19:31 +01:00
frederic34
a597d6c379 allow chaining 2015-11-07 10:23:56 +01:00
frederic34
becce332dd allow chaining and remove header exit 2015-11-07 09:52:00 +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
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
e4bd99aaf3 Merge pull request #3904 from frederic34/printgcp
Google Cloud Print
2015-11-05 21:57:08 +01:00
Laurent Destailleur
a7cea65710 Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement
NEW add an option to use standard ISO location for bill in crabe model
2015-11-05 21:51:38 +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
64fb4a30bb Merge pull request #3899 from grandoc/develop
Typo
2015-11-05 21:46:33 +01:00
Laurent Destailleur
6948c65a13 Merge pull request #3895 from marcosgdf/fix-bug-pricerules
Fixed feature malfunction caused by a commit and previous changes
2015-11-05 21:46:17 +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
Laurent Destailleur
5860491b14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2015-11-05 21:33:54 +01:00
Laurent Destailleur
e689e9ed76 Debug generator de code 2015-11-05 21:33:05 +01:00
Laurent Destailleur
f3b8df3ea5 Merge pull request #3889 from frederic34/escpos
Receipt Printer conf and lang
2015-11-05 21:32:43 +01:00
Laurent Destailleur
e7ecad2912 Add function getNomUrl on skeleton class. 2015-11-05 21:11:45 +01:00
frederic34
55dfa4859f Install lib with composer 2015-11-05 21:09:14 +01:00
Laurent Destailleur
f914873094 Better code generator 2015-11-05 20:31:51 +01:00
Raphaël Doursenaud
89411541b3 Fix missing category selector
Complement to #3893
2015-11-05 18:49:39 +01:00
frederic34
3ef6a92bb1 Google Cloud Print 2015-11-05 18:04:00 +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
frederic34
8a765bf5fd wip 2015-11-05 16:20:35 +01:00
Alexis Algoud
8221817087 NEW add an option to use standard ISO location for bill in crabe model
For electronic sending solutions, it could be required
2015-11-05 16:17:09 +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
philippe grand
04238da75d Typo 2015-11-05 14:16:13 +01:00
Laurent Destailleur
1927f47eaa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-05 13:43:33 +01:00
Laurent Destailleur
d2fa580f5d The code generator can generate a list.php page with all feature
immediatly working (sort, extrafields, hooks, select fields to show...)
2015-11-05 13:43:22 +01:00
Marcos García de La Fuente
e64057c276 Removed unnecesary attribute 2015-11-05 13:07:44 +01:00
Marcos García de La Fuente
6e8a6eca7a Fixed feature malfunction caused by commit a161e6d47a and previous changes 2015-11-05 13:06:14 +01:00
Juanjo Menent
a9aca80f8d Merge pull request #3891 from grandoc/develop
[Qual] Fix : TODO:translate
2015-11-05 13:05:52 +01:00
Christophe Battarel
9b797c1831 FIX bad calculation for stock value 2015-11-05 12:49:43 +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
philippe grand
b9c0cd316f [Qual] Fix : TODO:translate 2015-11-05 11:11:51 +01:00
Alexis Algoud
0543a31920 FIX event's data lost on user assign update 2015-11-05 11:11:03 +01:00
Laurent Destailleur
41ccfc411a Better error message 2015-11-05 10:11:39 +01:00
frederic34
1a374ddd2c Receipt Printer conf and lang 2015-11-05 08:42:03 +01:00
Laurent Destailleur
fa413fea76 FIX #3813 2015-11-05 03:12:57 +01:00