Commit Graph

54996 Commits

Author SHA1 Message Date
Laurent Destailleur
8c4324d912 FIX #5674 2016-09-02 21:15:48 +02:00
Laurent Destailleur
dc9c2f0ed7 FIX #5687 2016-09-02 21:10:46 +02:00
Laurent Destailleur
4fa94e3a25 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-02 19:25:04 +02:00
Laurent Destailleur
ba76f12a28 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/product/price.php
	htdocs/product/stock/class/mouvementstock.class.php
2016-09-02 19:24:28 +02:00
Laurent Destailleur
696b54c6c3 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-02 19:03:50 +02:00
Laurent Destailleur
70de814c3c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-02 19:03:31 +02:00
Laurent Destailleur
f4ada7f18e Merge pull request #5695 from fappels/4.0_delete_product_lot
FIX Delete product_lot data when product deleted
2016-09-02 18:44:21 +02:00
Laurent Destailleur
5c2af9b7bd Merge pull request #5694 from atm-ph/fix_3.8_address_empty
Fix lost value if use double quote
2016-09-02 18:42:32 +02:00
Laurent Destailleur
d6a4b58a68 Merge pull request #5685 from atm-gauthier/3.8_fix_header_title_commercial_area
FIX : header title in commercial area
2016-09-02 18:36:47 +02:00
Laurent Destailleur
570c228ee1 Merge pull request #5692 from fmarcet/3.9
Fix: An empty variable is used to update multiprice
2016-09-02 18:24:09 +02:00
Laurent Destailleur
5dc7c9c6e5 Merge pull request #5691 from fappels/3.9_fix_check_lot_dates
FIX #5642 Ignore time when checking lot dates
2016-09-02 18:23:04 +02:00
fappels
aedd813236 Delete product_lot when product deleted 2016-09-02 18:13:25 +02:00
phf
fcd5e1fb2c Fix lost value if use double quote 2016-09-02 15:30:42 +02:00
Juanjo Menent
328937e97a Merge pull request #5690 from aspangaro/4.0-p47
Fix: Info tab on product card - Double header
2016-09-02 13:46:14 +02:00
Juanjo Menent
fc6febee53 Merge pull request #5688 from grandoc/4.0
Fix: internationalized comments
2016-09-02 13:44:06 +02:00
Ferran Marcet
416a0892d7 Fix: An empty variable is used to update multiprice 2016-09-02 12:32:14 +02:00
fappels
1c626c01ee Ignore time when checking lot dates 2016-09-02 11:29:28 +02:00
aspangaro
a54784588b Fix: Info tab on product card - Double header 2016-09-01 22:39:01 +02:00
philippe grand
959f4d0ba0 internationalized comments 2016-09-01 19:44:49 +02:00
Laurent Destailleur
0961ce2a2c FIX Missing filter on environment 2016-09-01 01:08:01 +02:00
Laurent Destailleur
bf7a6380c9 Fix sort on wrong field 2016-09-01 01:00:28 +02:00
Laurent Destailleur
ec5bd2a8f8 Fix button create contract from order not visible sometimes 2016-09-01 00:40:48 +02:00
Laurent Destailleur
10ced563b3 Fix var $conf not defined 2016-08-31 19:39:12 +02:00
Laurent Destailleur
292993c14f Fix var $conf not defined 2016-08-31 19:37:34 +02:00
Laurent Destailleur
1360372a3c Fix hrm module 2016-08-31 18:57:27 +02:00
Laurent Destailleur
f04a3bf0c8 Fix sql error 2016-08-31 18:46:47 +02:00
Laurent Destailleur
56d6510472 Fix Quick hack to solve legal problem in some countries. 2016-08-31 18:36:32 +02:00
Laurent Destailleur
45fceaeea5 Fix another field not responsive 2016-08-31 16:14:31 +02:00
Laurent Destailleur
c4ae712bac Fix responsive design 2016-08-31 16:09:56 +02:00
Laurent Destailleur
95c2133b07 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-31 12:39:17 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
gauthier
18cf2f8f8b FIX : header title in commercial area 2016-08-31 10:19:40 +02:00
Juanjo Menent
8fb70bd0ef Merge pull request #5681 from simnandez/4.0
Fix #5641 Dolibarr 4.0 RC2 bug when create new contract
2016-08-31 10:04:39 +02:00
Juanjo Menent
bc09fb1154 Merge remote-tracking branch 'upstream/4.0' into 4.0 2016-08-31 02:50:16 +02:00
Juanjo Menent
9e6429320a Fix #5641 Dolibarr 4.0 RC2 bug when create new contract 2016-08-31 02:47:42 +02:00
Juanjo Menent
ea6daeebbb Merge pull request #5675 from aspangaro/4.0-p46
Fix: VAT Area - Problem of presentation
2016-08-31 02:12:19 +02:00
Laurent Destailleur
c2b503d90f Fix missing filter 2016-08-31 00:15:09 +02:00
Laurent Destailleur
42293089a0 Fix several fix into tab management of tasks 2016-08-30 20:16:58 +02:00
Laurent Destailleur
b06cc18568 Fix sort on amount 2016-08-30 11:53:42 +02:00
aspangaro
b85e9938e8 Fix: VATArea - Problem of presentation 2016-08-30 05:17:27 +02:00
Laurent Destailleur
216f7dbaee Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-30 00:21:56 +02:00
Laurent Destailleur
d7007bd16b Fix lang not loaded 2016-08-30 00:21:26 +02:00
Laurent Destailleur
ff0b424f74 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-29 18:18:35 +02:00
Laurent Destailleur
6b7d509e44 Fix css 2016-08-29 18:12:53 +02:00
Laurent Destailleur
b43bd371fd Merge pull request #5666 from aspangaro/4.0-p45
Fix: Wrong language key
2016-08-29 17:47:49 +02:00
Laurent Destailleur
13f61f2a63 Fix css 2016-08-29 17:36:18 +02:00
Laurent Destailleur
9c1ba67169 Fix css 2016-08-29 16:40:51 +02:00
Laurent Destailleur
8b959a09f2 Fix missing /form 2016-08-29 16:12:56 +02:00
Laurent Destailleur
2ba920a4cb Fix for jmobile 2016-08-29 11:33:48 +02:00
aspangaro
7cb4f85f6b Fix: Wrong language key 2016-08-29 07:30:39 +02:00