Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
55,133 Commits 36 Branches 189 Tags
908bf50e69ec4010e88f73653152f4dc0c32afaa
Commit Graph

47650 Commits

Author SHA1 Message Date
BENKE Charlie
908bf50e69 new : add user id on line for tracking feature 2016-08-07 14:16:56 +02:00
Laurent Destailleur
3f87b0c225 NEW Show photo of contacts on thirdparty card. 2016-08-06 00:04:24 +02:00
Laurent Destailleur
034b08ce56 NEW Add option "Hide images in Top menu". 2016-08-05 23:40:00 +02:00
Laurent Destailleur
126d9ae6bf Merge pull request #5586 from atm-florian/dev_NEW_ClassOrderDeliverStatusOnStockVentil 
NEW : Add workflow to calculated supplier order status on stock dispatch
 2016-08-05 18:15:04 +02:00
florian HENRY
0176acd08f fix travis 2016-08-05 16:15:30 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
851f8369cf Fix padd right 2016-08-05 13:22:28 +02:00
Laurent Destailleur
0e3ec5df38 Merge branch 'remove-mysql-driver' of 
https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver

Conflicts:
	htdocs/core/db/mysql.class.php
 2016-08-05 13:12:43 +02:00
Laurent Destailleur
890e6f59c8 NEW Support mass actions for proposals 2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59 NEW Reduce nb of picto on ref into list, merging preview and download 2016-08-05 12:20:11 +02:00
florian HENRY
1e929e647d better management of dispatch status 2016-08-05 10:02:36 +02:00
florian HENRY
0780188f4e taking account @eldy remarks 2016-08-05 09:46:17 +02:00
florian HENRY
a39290022f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_NEW_ClassOrderDeliverStatusOnStockVentil

Conflicts:
	htdocs/langs/en_US/workflow.lang
 2016-08-05 09:34:27 +02:00
Laurent Destailleur
57a542d52d Fix: we still need gd 2016-08-05 04:45:05 +02:00
Laurent Destailleur
63562beb36 Fix move translation key into source language 2016-08-05 01:19:20 +02:00
Laurent Destailleur
544d5af49b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-05 01:15:35 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
7211542e41 Merge pull request #5569 from olsesacl/develop-show-preview-documents 
NEW Preview documents
 2016-08-05 01:13:35 +02:00
Laurent Destailleur
c73f962b28 Merge pull request #5585 from atm-florian/dev_NEW_workflow_ClassPropalBillOnBillValidation 
NEW : Add workflow to classifed propal bill on invoice validation
 2016-08-05 00:46:12 +02:00
Laurent Destailleur
4e483c675e Merge branch 'dev_add_color_on_select_product' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_add_color_on_select_product

Conflicts:
	htdocs/core/class/html.form.class.php
 2016-08-05 00:44:24 +02:00
Laurent Destailleur
9349f27742 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 17:10:02 +02:00
Laurent Destailleur
4b5cae0af8 Fix help 2016-08-04 17:09:49 +02:00
Laurent Destailleur
5126786d60 NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED 2016-08-04 15:48:34 +02:00
Laurent Destailleur
d688681605 Use standard prefix for supplier order for new install 2016-08-04 15:45:55 +02:00
Laurent Destailleur
81fc86ba06 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 12:10:40 +02:00
Laurent Destailleur
26f553a1a8 Fix bad position of test 2016-08-04 12:04:43 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
florian HENRY
4001bc474e NEW : Add workflow to calculated supplier order status on stock dispatch 2016-08-04 11:37:32 +02:00
Laurent Destailleur
5247faf50f Fix align 2016-08-04 10:48:19 +02:00
Laurent Destailleur
e0b9496f9e Fix link sometimes fails because of id not defined 2016-08-04 10:44:17 +02:00
Laurent Destailleur
182338beb1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 10:27:50 +02:00
Laurent Destailleur
11ab49d85d Fix bad help 2016-08-04 10:27:19 +02:00
Laurent Destailleur
af150c35fc Fix no picto on setup pages 2016-08-04 10:19:30 +02:00
Laurent Destailleur
caa987fb61 Clean obsolete comment 2016-08-04 10:13:27 +02:00
Laurent Destailleur
f14ef7b50f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-04 10:12:34 +02:00
Laurent Destailleur
da84fac390 Fix: data were lost if creation failed 2016-08-04 10:08:58 +02:00
florian HENRY
f0622139ff NEW : Add workflow to classifed propal bill on invoice validation 2016-08-04 09:55:16 +02:00
florian HENRY
13f33ab9c7 syntax 2016-08-04 09:23:10 +02:00
florian HENRY
a013e84e0e NEW : Add color regarding stock even on ajax autocompleter product 
selector
 2016-08-04 09:21:04 +02:00
Laurent Destailleur
7c97bf900f Neutral colors 2016-08-03 20:52:50 +02:00
Laurent Destailleur
b97223edd7 Fix: link to link to objects not visible 2016-08-03 19:01:51 +02:00
Juanjo Menent
51a4f9e5d7 Merge pull request #5575 from aspangaro/4.0-p36 
Fix Expense report | if VAT disable in Dolibarr, traduction of code_libelle & presentation
 2016-08-03 10:30:40 +02:00
Laurent Destailleur
abbe204c97 Fix design of option PROJECT_ADD_SUBTOTAL_LINES 2016-08-03 01:42:05 +02:00
Laurent Destailleur
a240cf30d6 Fix PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty. 2016-08-03 00:50:17 +02:00
Laurent Destailleur
6ae8d26a89 Fix max width on combo of tasks 2016-08-03 00:04:38 +02:00
Laurent Destailleur
216ec6ac4b Label week too long with some language 2016-08-02 23:33:31 +02:00
Laurent Destailleur
88dcb27981 Fix option not visible when it should 2016-08-02 21:24:14 +02:00
Laurent Destailleur
eb546cb4d4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-02 18:18:39 +02:00
Laurent Destailleur
176b52f305 Fix No modify trigger must be called during creation 2016-08-02 17:55:13 +02:00