Laurent Destailleur
b85a835988
Prepare 3.6.1
2014-10-03 19:03:58 +02:00
Laurent Destailleur
dde3b3ef65
Fix: Event update
2014-10-03 18:25:38 +02:00
Laurent Destailleur
f9d78c0c57
Fix: edit event
...
New: Can use color of type of event into dictionnary.
2014-10-03 18:04:13 +02:00
Laurent Destailleur
e7a9447d94
Add hook formatEvent and fix bug into per user view.
2014-10-03 15:58:08 +02:00
Francis Appels
269df77873
Fix migration sql for inserting accounting records
...
Migration SQL could not insert accounting records because datec was set
to NOT NULL
2014-10-03 12:59:33 +02:00
Laurent Destailleur
844b5f30df
Minor look enhancement
2014-10-03 12:54:29 +02:00
Laurent Destailleur
cbd48f5129
Add missing picto
2014-10-03 12:48:24 +02:00
Francis Appels
bcc5bebd77
Fix deliveryorder qty and remainingqty positions
2014-10-03 12:28:42 +02:00
Francis Appels
840a98d8ac
Expedition lines from same orderline merged.
...
When there are more expedition lines from same orderline key, merge them
and get source warehouses. Usefull future possibility for creating
shippinglines with same products from multiple warehouses.
@KreizIT also changed some batch related items.
2014-10-03 12:20:02 +02:00
Laurent Destailleur
166853dd56
Fix: miscellaneous bugs
2014-10-03 12:15:21 +02:00
Laurent Destailleur
bc1279ccfa
Brighter button. We use CSS and no more image.
2014-10-03 11:27:12 +02:00
Laurent Destailleur
1b0b49cceb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-03 03:53:11 +02:00
Laurent Destailleur
494e6786b3
Fix: Translation
2014-10-03 03:52:50 +02:00
Laurent Destailleur
a853aed348
Fix: Some fields not visibles. Wrong value for calculated time.
2014-10-03 03:42:11 +02:00
Laurent Destailleur
868809caba
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
2014-10-03 03:22:37 +02:00
Laurent Destailleur
33ddbd7425
Merge pull request #1932 from Xebax/develop
...
Fix bug #1604 : "When a member is created, the birthday is not recorded" and bug #1610 : "Civility is not displayed".
2014-10-03 03:17:45 +02:00
Laurent Destailleur
c69565fd69
Fix: column name should not be an numeric
2014-10-03 03:12:39 +02:00
Laurent Destailleur
eae5e1d8f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-03 02:49:44 +02:00
Laurent Destailleur
ebd86f5388
Merge pull request #1931 from ndrosis/patch-8
...
Fix Lang for Payment Type
2014-10-03 02:47:25 +02:00
Laurent Destailleur
4c28454729
Merge pull request #1934 from GPCsolutions/deps
...
Suggest dependencies needed by PHPExcel
2014-10-03 02:46:38 +02:00
Laurent Destailleur
d455ee7b56
Merge pull request #1933 from atm-maxime/3.5
...
Fix : tva not coming from multiprice
2014-10-03 02:46:22 +02:00
Laurent Destailleur
b5be8ff620
Fix: Avoid error ErrorBadValueForParamNotAString
2014-10-03 02:45:47 +02:00
Laurent Destailleur
ae303f34a4
Merge pull request #1935 from FHenry/3.6_fix
...
3.6 fix - Fix trad currency - Return error message on category creation failure
2014-10-03 02:42:32 +02:00
Laurent Destailleur
5ac63ec534
Solve fixme.
2014-10-03 02:00:50 +02:00
Laurent Destailleur
7fb2d4d1c9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-10-03 01:48:28 +02:00
Laurent Destailleur
8bc57e38d1
Uniformize, support, install and login page with a more neutral
...
background (nearest bootstrap). Remove image background.
2014-10-03 01:48:14 +02:00
Florian HENRY
4b28ff005e
Return error message on category creation failure
2014-10-02 15:24:40 +02:00
Florian HENRY
d6fc967162
Merge branch '3.6' into 3.6_fix
2014-10-02 15:22:23 +02:00
Florian HENRY
78ec4d595b
Fix trad currency
2014-10-02 15:21:49 +02:00
Regis Houssin
4248c7bed2
Fix: strict mode paradise
2014-10-02 09:30:31 +02:00
Regis Houssin
30221ae8cf
Fix: missing fields
2014-10-02 09:00:40 +02:00
Regis Houssin
2425fdfadd
FIXME $socid is not defined (strict mode)
2014-10-02 08:44:49 +02:00
Regis Houssin
1541be8790
FIXME $key is not defined (strict mode)
2014-10-02 08:40:51 +02:00
Xebax
add55e480e
Fix bug #1610 : Civility is not displayed.
2014-10-01 22:00:45 +02:00
Raphaël Doursenaud
47538071d3
Suggest dependencies needed by PHPExcel
2014-10-01 14:40:38 +02:00
Raphaël Doursenaud
769d824e7b
Allow reporting progress along with timespent
2014-10-01 14:12:47 +02:00
BadPixxel
f178aa65ca
removed "thumb\" subdir addition
...
Category Image Thumb sub-folder now directly added by function liste_photos
2014-09-30 19:43:21 +02:00
BadPixxel
d6c8f65dad
Minor BugFix : Missing thumbs folder in Category Images List
...
Sub-folder for thumbs was missing in category image list, url was wrong....
2014-09-30 19:37:13 +02:00
BadPixxel
cf2ba78fc1
Missing Key for getNomUrl function
2014-09-30 19:11:01 +02:00
BadPixxel
12e6d1bf6c
Missing Key for getNomUrl function
2014-09-30 19:09:59 +02:00
BadPixxel
820e6e5d95
Minor BugFix : Compatibility of function getNomUrl
...
Using Ref & Label for Category Name display is necessary for compatibility
2014-09-30 19:01:43 +02:00
Maxime Kohlhaas
920c9c7251
Fix : tva not coming from multiprice
2014-09-30 17:36:01 +02:00
BadPixxel
f3eec7582e
Minor BugFix : Wrong variable reference in getNomUrl
...
Display of Category Url was incompete due to reference to "$ref" instead of "$label"
2014-09-30 16:00:04 +02:00
Xebax
11b3b94e6f
Fix bug #1604 : When a member is created, the birthday is not recorded.
2014-09-30 01:37:36 +02:00
Regis Houssin
f0551fe6d2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-09-29 20:43:34 +02:00
Regis Houssin
ba95251ea2
Fix: uniformize code
2014-09-29 20:43:20 +02:00
Laurent Destailleur
bbf07641ed
Fix: checkstyle
2014-09-29 20:39:19 +02:00
Drosis Nikos
8c6ce79d9d
Fix Lang for Payment Type
2014-09-29 18:15:09 +03:00
Laurent Destailleur
ec2a8b5551
Merge pull request #1800 from Devensys/Develop-HighlitingIBAN
...
Highliting IBAN (sepa)
2014-09-29 16:43:22 +02:00
Laurent Destailleur
8121aeb0b6
Merge pull request #1914 from aternatik/fix_ldapgrp
...
Fix: gidNumber ldap attribute was not defined
2014-09-29 16:39:36 +02:00
