lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,090 Commits 43 Branches 150 Tags 886 MiB
62a1d1c4a2
Commit Graph

49090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
4bda3a3f21 Merge remote-tracking branch 'Upstream/develop' into develop-33 2015-06-19 06:04:56 +02:00
aspangaro
d959c552f2 Fix: Accountancy - SQL error 2015-06-19 06:01:42 +02:00
Laurent Destailleur
b5cc7ae1c8 Work on merge tab photos and attached files 2015-06-19 00:52:58 +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
Alexis Algoud
21f0fc8229 FIX can receive new batch product on supplier order 2015-06-18 19:49:19 +02:00
Laurent Destailleur
425d9bff48 Tooltip to make understanding better. 2015-06-18 19:33:29 +02:00
All-3kcis
c96c528d3e Correction complete_head 
Ajout de la fonction complete_head_from_modules() pour supprimer les onglets si besoin.
 2015-06-18 15:16:28 +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
aspangaro
7539ad88fa Debug 2015-06-18 06:30:48 +02:00
aspangaro
9cf06ec21c Add function set_paid 2015-06-18 06:12:05 +02:00
zachary
0ef8ea269b Adds php-gd and mysqli to dockerfile 2015-06-17 20:20:58 -04:00
zachary
f8cf0fa679 Adds dockerfile 2015-06-17 19:58:34 -04:00
Regis Houssin
9c6c3ad65d Fix: wrong user right 2015-06-17 16:33:18 +02:00
aspangaro
50aa36502c Merge remote-tracking branch 'Upstream/develop' into develop-32 
Conflicts:
	htdocs/expensereport/card.php
 2015-06-17 07:21:43 +02:00
aspangaro
8d0e7261f5 Debug 2015-06-17 07:19:25 +02:00
Laurent Destailleur
bd4d108217 Merge pull request #3058 from fmarcet/3.5 
Fix: Date filter on customer orders
 2015-06-17 00:19:03 +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
2617d28f58 Merge pull request #3057 from hregis/3.7_photos 
Fix: no error message if extrafield is require
 2015-06-17 00:18:12 +02:00
Laurent Destailleur
259fe11a1a Merge pull request #3060 from FHenry/develop 
default charset utf-8
 2015-06-17 00:17:38 +02:00
Laurent Destailleur
c023c078ae Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-17 00:07:44 +02:00
Laurent Destailleur
844ca58096 Fix: custom dir is missing 2015-06-17 00:05:41 +02:00
Marcos García de La Fuente
d8b7f3618c Updated changelog 2015-06-16 21:20:42 +02:00
Marcos García de La Fuente
1e05262884 Corrected Timezone detection by using jstz external library 2015-06-16 21:19:58 +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
fmarcet
05cb1f7ba7 Fix: Date filter on customer orders 2015-06-16 16:59:48 +02:00
Regis Houssin
3807fafc1a Fix: no error message if extrafield is require 2015-06-16 16:42:33 +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
ceb0d71f54 Merge pull request #3054 from hregis/3.7_photos 
Fix: thumb "mini" not deleted
 2015-06-16 11:38:39 +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
Regis Houssin
5e25c69891 Fix: thumb "mini" not deleted 2015-06-16 09:28:31 +02:00
Marcos García de La Fuente
45ebb18367 CodeSniffer corrections 2015-06-16 07:19:31 +02:00