Commit Graph

57589 Commits

Author SHA1 Message Date
Laurent Destailleur
ff4fa9977c FIX #5895 2016-11-20 15:47:05 +01:00
Laurent Destailleur
fa3a8deade Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-20 15:39:05 +01:00
Laurent Destailleur
e3c529d483 FIX javascript error when using on mobile/smartphone 2016-11-20 15:38:48 +01:00
Raphaël Doursenaud
2f424d2edb
FIX #5325 contract service triggers
Pass ContratLigne objects to the triggers when updating contract
lines
2016-11-20 13:21:43 +01:00
Laurent Destailleur
e6894eda0e Better responsive 2016-11-20 10:58:28 +01:00
IJ
66693c5268 Update products.lang 2016-11-19 22:42:03 +00:00
IJ
9bb60e8d2c Update agenda.lang 2016-11-19 22:41:35 +00:00
IJ
5a8b844c49 Update other.lang 2016-11-19 22:41:08 +00:00
Laurent Destailleur
34b42d5913 Merge pull request #6008 from defrance/patch-44
if supplier have multiple price return it several times
2016-11-19 21:08:59 +01:00
Laurent Destailleur
e6a027911d Merge pull request #5997 from fappels/develop-fix-modify-warehouse
Fix #5994 unable to update warehouse
2016-11-19 20:58:54 +01:00
Laurent Destailleur
ef18964d3c Merge pull request #6004 from atm-gauthier/FIX_wrong_var_name
FIX : wrong var name
2016-11-19 20:58:21 +01:00
Laurent Destailleur
a17345da12 Fix list of fields must be same in loop and title line. Title must come
from declaration array.
2016-11-19 20:07:35 +01:00
Laurent Destailleur
b538f13efb FIX Module gravatar was not triggered on thirdparty and contact card 2016-11-19 19:43:55 +01:00
Laurent Destailleur
77337fe0cc Fix scrutinizer warning 2016-11-19 16:23:50 +01:00
Laurent Destailleur
dd27a52a85 Fix several problems on new REST API on project/tasks 2016-11-19 16:08:27 +01:00
IJ
d5fe7b8b9c Add Search Tip for User
Add a simple tip on the search strings which could be used by the end user when they are searching from the main search box.
Tested strings are '*' and *|*
This would be very useful to the end user and new users
2016-11-19 12:21:47 +00:00
IJ
6ebafe1a87 Add Translation String for Agenda
Add translation string so it can be used independently for the top menu
2016-11-19 11:32:28 +00:00
IJ
9f28795159 Add Unique Top Menu Translation
Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text.
** Requires re-enabling module
2016-11-19 11:29:35 +00:00
IJ
5c46095fa3 Add Translation String for Tools
Add translation string so it can be used independently for the top menu
2016-11-19 10:52:30 +00:00
IJ
636fbb476c Add Unique Top Menu Translation
Add unique top menu translation for Tools so it can be better translated separately from other words/links using the same text.
2016-11-19 10:49:12 +00:00
IJ
f96fd895e3 Add Products/Services Menu Translation String
Add the translation string into language file
2016-11-19 10:40:45 +00:00
IJ
86d195fa81 Add Unique Top Menu Translation
Add unique top menu translation for products/services so it can be better translated separately from other words/links using the same text.
2016-11-19 10:37:15 +00:00
IJ
056b76a831 Better Separator for Products/Services in Top Menu
Easier to read when both modules are enabled
2016-11-19 10:34:22 +00:00
Laurent Destailleur
e9b78db1ac Several bug fixes:
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
2016-11-19 02:16:12 +01:00
Laurent Destailleur
7ac96da0d4 Several fix in warehouse stock change (rounding, api rest) 2016-11-18 16:34:03 +01:00
phf
e4ded18477 Merge branch '3.9' of https://github.com/Dolibarr/dolibarr into 3.9 2016-11-18 14:44:49 +01:00
Laurent Destailleur
0b3765dd9a Fix phpcs 2016-11-18 13:17:24 +01:00
Laurent Destailleur
9b66f8c320 Complete REST services 2016-11-18 13:12:44 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
BENKE Charlie
8a37db3f1c if supplier have multiple price return it several times 2016-11-18 08:23:12 +01:00
Laurent Destailleur
0af0aa89bb Debug 2016-11-17 19:49:33 +01:00
Laurent Destailleur
b3b395df42 Backport a file to make migration easier 2016-11-17 19:28:19 +01:00
Laurent Destailleur
979632fdc8 Uniformize code 2016-11-17 19:27:29 +01:00
Laurent Destailleur
dafd7f9c55 Uniformize code 2016-11-17 19:16:37 +01:00
Laurent Destailleur
9b88ae145b Fix mass action when using no javascript 2016-11-17 19:04:10 +01:00
Laurent Destailleur
5816c86e07 Debug accountancy module 2016-11-17 17:51:10 +01:00
Laurent Destailleur
7686ac3564 Fix missing date 2016-11-17 17:22:48 +01:00
Laurent Destailleur
2d7d240c86 FIX the time spent on project was not visible in its overwiew 2016-11-17 17:03:50 +01:00
Laurent Destailleur
b73a164256 Work on accounting module 2016-11-17 16:32:19 +01:00
gauthier
8e7c0fa353 FIX : wrong var name 2016-11-17 14:21:19 +01:00
Laurent Destailleur
7f5fd3bbc0 Fix selection of fields 2016-11-16 21:24:51 +01:00
Laurent Destailleur
3dc9bc89d8 Finished the selection of fields on bank account list 2016-11-16 19:56:03 +01:00
Laurent Destailleur
4768017662 Debug of module accountancy 2016-11-16 19:23:32 +01:00
Laurent Destailleur
e5cedafdc0 Fix search on accounts 2016-11-16 18:00:37 +01:00
florian HENRY
44aa601848 again revert to fk_project instead of fk_projet 2016-11-16 11:11:50 +01:00
florian HENRY
ff734bb5d9 Fix travis 2016-11-16 09:40:29 +01:00
florian HENRY
afd17feffe Merge remote-tracking branch 'origin/develop' into franck_develop 2016-11-16 09:38:50 +01:00
florian HENRY
a251f0df51 Various fix on Loan and project link 2016-11-16 09:38:13 +01:00
fappels
ed8edfceaf code intend 2016-11-15 20:01:16 +01:00
fappels
eeb62ea2b8 Fix update entrepot
fix int for fk_parent
clean parenthesis
fix clean parameter country_id
2016-11-15 19:56:58 +01:00