Commit Graph

70487 Commits

Author SHA1 Message Date
Laurent Destailleur
5a9f0cbff7
Merge pull request #9796 from frederic34/patch-21
do not trim int
2018-10-19 13:26:08 +02:00
Laurent Destailleur
ee4f6602cc
Merge pull request #9795 from frederic34/patch-20
do not trim int
2018-10-19 13:25:39 +02:00
Laurent Destailleur
b12769e5c1
Merge pull request #9803 from simnandez/develop
NEW Child label of variants change if parent label changes
2018-10-19 13:23:35 +02:00
Laurent Destailleur
8a88b66c9d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 13:18:28 +02:00
Laurent Destailleur
932a993b86
Merge pull request #9810 from andreubisquerra/master
Fix delete without any selected line on takepos
2018-10-19 13:18:07 +02:00
Laurent Destailleur
c13e555d5f
Merge pull request #9811 from frederic34/patch-24
use strict comparaison
2018-10-19 13:17:24 +02:00
Laurent Destailleur
24ae38abcc
Merge pull request #9797 from frederic34/patch-22
do not trim int
2018-10-19 13:03:03 +02:00
Laurent Destailleur
8af16609ca
Merge pull request #9779 from frederic34/patch-15
Update html.formmail.class.php
2018-10-19 13:02:15 +02:00
Laurent Destailleur
324f59ecc9
Merge pull request #9778 from frederic34/patch-9
add errors def to form class
2018-10-19 13:01:31 +02:00
Laurent Destailleur
0e33f18a3a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 12:58:31 +02:00
Laurent Destailleur
d086a71104
Merge pull request #9780 from frederic34/patch-16
fix phpunit
2018-10-19 12:58:15 +02:00
Laurent Destailleur
c01e6591ed
Merge pull request #9798 from frederic34/patch-23
code comment
2018-10-19 12:57:25 +02:00
Laurent Destailleur
c4e67de5c9
Merge pull request #9814 from Mavyre/patch-2
Fixed all resources displaying on add in projects, events...
2018-10-19 12:57:07 +02:00
Laurent Destailleur
b6e333876e FIX #9813 2018-10-19 12:56:21 +02:00
Laurent Destailleur
44e0bc9aed
Merge pull request #9812 from frederic34/docodt
add log and comment
2018-10-19 12:53:54 +02:00
Laurent Destailleur
9eed87da8e
Merge pull request #9794 from frederic34/patch-19
do not trim int
2018-10-19 12:51:26 +02:00
Laurent Destailleur
4bdde9ad56
Update ticketlogs.class.php 2018-10-19 12:51:14 +02:00
Laurent Destailleur
696023c1aa NEW Enhancement in the generic file manager 2018-10-19 12:47:59 +02:00
Juanjo Menent
34118bcf20 New: works with variants:
- Multiprices compatibility
2018-10-19 12:02:14 +02:00
Juanjo Menent
26dd738f3b Merge remote-tracking branch 'upstream/develop' into develop 2018-10-19 12:00:22 +02:00
Laurent Destailleur
985ab1efda FIX delete of a file in file_manager return to same dir 2018-10-19 10:59:34 +02:00
Juanjo Menent
1714bce8a1 New: works with variants:
- Better function name
2018-10-19 08:53:01 +02:00
Juanjo Menent
b57993e599 Merge remote-tracking branch 'upstream/develop' into develop 2018-10-19 08:36:12 +02:00
Mavyre
32a3779d23
Fixed all ressources displaying 2018-10-18 22:08:23 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment 2018-10-18 21:47:10 +02:00
Frédéric FRANCE
b0e24e2b8d
use strict comparaison 2018-10-18 21:24:06 +02:00
Laurent Destailleur
d4bc53660b Code comment and debug filemanager 2018-10-18 21:22:30 +02:00
Frédéric FRANCE
256ee40d0a
Merge remote-tracking branch 'upstream/develop' into patch-16 2018-10-18 21:01:49 +02:00
Frédéric FRANCE
7012b7829f
Merge remote-tracking branch 'upstream/develop' into patch-23 2018-10-18 20:51:39 +02:00
Frédéric FRANCE
c4cc58443a
Merge remote-tracking branch 'upstream/develop' into patch-22 2018-10-18 20:50:03 +02:00
Frédéric FRANCE
5a9e49ef46
Merge remote-tracking branch 'upstream/develop' into patch-21 2018-10-18 20:48:01 +02:00
Frédéric FRANCE
69d3b274aa
Merge remote-tracking branch 'upstream/develop' into patch-20 2018-10-18 20:46:47 +02:00
Frédéric FRANCE
8dd7f62a77
Merge remote-tracking branch 'upstream/develop' into patch-19 2018-10-18 20:45:36 +02:00
Frédéric FRANCE
0f7b1a04d9
Merge remote-tracking branch 'upstream/develop' into patch-15 2018-10-18 20:42:52 +02:00
Frédéric FRANCE
3437943609
Merge remote-tracking branch 'upstream/develop' into patch-9 2018-10-18 20:41:36 +02:00
Laurent Destailleur
66cb06eca9 NEW Top menu is always on screen with MD theme. 2018-10-18 17:33:14 +02:00
Laurent Destailleur
05326e271d FIX Filter on invoice type 2018-10-18 17:15:26 +02:00
Laurent Destailleur
7cafdc4d9a Fix phpcs 2018-10-18 16:56:43 +02:00
andreubisquerra
b396aaebc5 Fix delete without any selected line 2018-10-18 16:31:37 +02:00
Juanjo Menent
52ad5c5565 New: works with variants:
-To edit child price and weight impacts better to see in tab the father price and weight
2018-10-18 12:21:39 +02:00
Juanjo Menent
c588f5e6c0 New: works with variants:
-Child label with combination labels
2018-10-18 10:55:27 +02:00
Juanjo Menent
6c76f9517f New: works with variants:
-Child label with combination labels
2018-10-18 10:26:21 +02:00
Juanjo Menent
fd989230a4 New: works with variants:
-Child label change if parent changes
2018-10-18 09:09:42 +02:00
Laurent Destailleur
548fafc6e9 Fix trans 2018-10-18 01:32:06 +02:00
Laurent Destailleur
b2a7845c8a Fix trans 2018-10-18 01:28:14 +02:00
Laurent Destailleur
63f4704725 Fix translation 2018-10-18 01:05:10 +02:00
Laurent Destailleur
52840478c0 Clean code 2018-10-17 21:11:07 +02:00
Frédéric FRANCE
db732ddedd
code comment 2018-10-17 20:36:45 +02:00
Frédéric FRANCE
ebc5cb5a96
do not trim int 2018-10-17 20:24:43 +02:00
Frédéric FRANCE
393303fe31
do not trim int 2018-10-17 20:17:43 +02:00