Commit Graph

48113 Commits

Author SHA1 Message Date
aspangaro
ceaa71649c Review customer list ventilation page 2015-06-19 06:56:21 +02:00
aspangaro
14ad53848d Remove $linkback, lang & html 2015-06-19 06:32:51 +02:00
Laurent Destailleur
d8f86708b1 Minor look fix 2015-06-19 00:36:03 +02:00
Laurent Destailleur
bbc70004d9 Disable option that i can't understand. 2015-06-19 00:18:41 +02:00
Laurent Destailleur
425d9bff48 Tooltip to make understanding better. 2015-06-18 19:33:29 +02:00
Laurent Destailleur
1ee933c4a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-18 14:48:00 +02:00
Laurent Destailleur
7507a71121 Lenght of fields 2015-06-18 14:47:33 +02:00
Laurent Destailleur
e20a63c9f0 NEW Can use a "|" to make a OR search on several different criterias
into text filters of tables.
2015-06-18 14:38:12 +02:00
Laurent Destailleur
29422a9ff9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-18 14:25:31 +02:00
Laurent Destailleur
a2e9ebe2d1 Fix hover is ok on boxes array too. 2015-06-18 14:25:13 +02:00
Laurent Destailleur
b2c1365eca Merge pull request #3056 from defrance69/patch-65
added ref supplier bill
2015-06-17 00:18:38 +02:00
Laurent Destailleur
259fe11a1a Merge pull request #3060 from FHenry/develop
default charset utf-8
2015-06-17 00:17:38 +02:00
Florian HENRY
6819e295f5 default charset utf-8 2015-06-16 20:22:01 +02:00
Laurent Destailleur
8df56511be NEW Enhance prototype, project list and proposal list with new hook to
have an external module able to add more fields.
2015-06-16 19:36:44 +02:00
BENKE Charlie
94341e83ed added ref supplier bill
more useful to match supplier bill than internal ref
2015-06-16 15:22:13 +02:00
Laurent Destailleur
b7c777dc07 Css fix 2015-06-16 15:14:33 +02:00
Laurent Destailleur
ef5ff2f218 Use the complete popup on user in user list and hierarchy view. 2015-06-16 15:08:20 +02:00
Laurent Destailleur
a52be15722 Enhance look for left menu seach form when HTML5 is on 2015-06-16 13:09:46 +02:00
Laurent Destailleur
fb1a3f3ea3 Rename alternative name 2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6 Merge pull request #2412 from marcosgdf/commercial-name
NEW [ task #851 ] Add a new field: Commercial name
2015-06-16 11:44:03 +02:00
Laurent Destailleur
8e0d7ba24f Merge branch 'atm-gauthier-add_clone_on_event_agenda' into develop 2015-06-16 11:42:09 +02:00
Laurent Destailleur
d3549cc2a0 Merge branch 'add_clone_on_event_agenda' of
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-add_clone_on_event_agenda

Conflicts:
	htdocs/langs/en_US/agenda.lang
2015-06-16 11:41:45 +02:00
Laurent Destailleur
417eae9c4f Merge remote-tracking branch 'origin/3.7' into develop 2015-06-16 11:18:51 +02:00
Laurent Destailleur
85fee7ec49 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/product/class/product.class.php
2015-06-16 11:18:10 +02:00
Laurent Destailleur
34468644ef Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-16 11:15:16 +02:00
Laurent Destailleur
fa8defa1bf Merge pull request #3034 from marcosgdf/bug-2814-2
Fix #2814 JPEG photos are not displayed in Product photos page
2015-06-16 11:10:24 +02:00
Laurent Destailleur
9281e2a824 Merge pull request #3049 from marcosgdf/task-1191
NEW [ task 1191 ] AJAX selector for projects
2015-06-16 11:09:34 +02:00
Laurent Destailleur
dd661ca716 Merge pull request #3053 from aspangaro/develop-patch30
Fix: ER Missing language key
2015-06-16 11:08:21 +02:00
Laurent Destailleur
609eb26151 Merge pull request #3051 from aternatik/api
Changes into API
2015-06-16 11:08:14 +02:00
Marcos García de La Fuente
45ebb18367 CodeSniffer corrections 2015-06-16 07:19:31 +02:00
aspangaro
a1e383dafa Fix: ER Missing language key 2015-06-16 06:18:43 +02:00
Laurent Destailleur
c56c228c7f Merge pull request #2924 from aternatik/api_rest
Allow modify API key from user card
2015-06-15 21:25:15 +02:00
Laurent Destailleur
db4d92ccb6 Merge pull request #3047 from marcosgdf/patch-2
Fixed undefined variable typo
2015-06-15 21:24:57 +02:00
Laurent Destailleur
cbac2dd63c Merge pull request #3052 from aternatik/fix_crlf
Fix crlf
2015-06-15 21:24:34 +02:00
Laurent Destailleur
e8ac52a194 Merge pull request #3046 from aspangaro/develop-patch30
Typo "cibility"
2015-06-15 21:23:36 +02:00
jfefe
3bf1b60be8 Add test if module enabled before showing API information 2015-06-15 14:38:02 +02:00
jfefe
190ee35e86 Merge branch 'develop' into api_rest
Conflicts:
	htdocs/user/card.php
	htdocs/user/class/user.class.php
2015-06-15 14:29:34 +02:00
jfefe
745f0f7d7e Fix crlf 2015-06-15 14:24:24 +02:00
jfefe
80a6afc577 Add htaccess example for API usage 2015-06-15 14:11:53 +02:00
jfefe
00125d1060 Add option to set production mode to API 2015-06-15 14:11:43 +02:00
jfefe
da0fac2ac6 Minor fix into rest API : use implemented method name 2015-06-15 13:25:02 +02:00
Marcos García de La Fuente
65d3f7968a NEW [ task 1191 ] AJAX selector for projects 2015-06-15 10:04:36 +02:00
Marcos García de La Fuente
2d3ab3b658 Merge remote-tracking branch 'upstream/3.5' into bug-2814-2
Conflicts:
	ChangeLog
2015-06-15 09:39:17 +02:00
Marcos García
adc1998b73 Fixed undefined variable typo 2015-06-15 09:18:58 +02:00
aspangaro
b6958bb592 Wrong address 2015-06-15 05:22:50 +02:00
aspangaro
7ddec85fd2 Merge remote-tracking branch 'Upstream/develop' into develop-30 2015-06-15 05:22:12 +02:00
Laurent Destailleur
bcd254c137 Fix bad objet use. Add label of project into list. 2015-06-15 00:12:52 +02:00
aspangaro
a4acc867aa Typo "inra_vat" 2015-06-14 20:24:25 +02:00
aspangaro
f973a1fb43 Typo "cibility" 2015-06-14 20:15:22 +02:00
Laurent Destailleur
6263e90ddb More info on contact popup 2015-06-14 17:38:28 +02:00