Commit Graph

64295 Commits

Author SHA1 Message Date
Laurent Destailleur
f153d9c9ff Fix time spent counted twice 2017-11-16 19:41:31 +01:00
Laurent Destailleur
0d192df1fd Standardize interface 2017-11-16 18:33:56 +01:00
Laurent Destailleur
4f25bc5e3b NEW detection of edge browser 2017-11-16 14:44:55 +01:00
Frédéric FRANCE
0d79cc50b0
Merge remote-tracking branch 'upstream/develop' into patch-1 2017-11-16 13:41:24 +01:00
Laurent Destailleur
a7aa3ee438 Rename file 2017-11-16 12:21:21 +01:00
Laurent Destailleur
d7f512311b Doc 2017-11-16 12:19:31 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
Laurent Destailleur
19d0283b63 Fix doxygen 2017-11-16 12:13:23 +01:00
Laurent Destailleur
4d198534a2 Clean CSS files 2017-11-16 12:09:34 +01:00
Laurent Destailleur
e6d02cebe7 Complete templates 2017-11-16 12:09:17 +01:00
Maxime Kohlhaas
1f5c2ec13f New extrafields replicated on contract creation 2017-11-15 21:20:30 +01:00
Laurent Destailleur
612dfb91ff Add more img templates for medias dir 2017-11-15 21:01:05 +01:00
Laurent Destailleur
d4d26eac9b More templates into medias directory 2017-11-15 20:41:04 +01:00
Laurent Destailleur
5c3d8acfbb Work on website 2017-11-15 19:47:07 +01:00
Laurent Destailleur
e760568a78 Test prerequisite in DLL before unzip files 2017-11-15 13:21:56 +01:00
Laurent Destailleur
07c0b5d616 Code comment 2017-11-15 13:15:08 +01:00
Neil Orley
d97cf63a16 NEW Classify the order as invoiced in the REST API
Classify the order as invoiced
FIX variable name
2017-11-15 12:14:28 +01:00
Laurent Destailleur
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +01:00
Laurent Destailleur
33910b9cc9 Add the trackid for emails sent from leave request card. 2017-11-15 11:29:22 +01:00
dolibarr95
c6c1552c01
syntax error
bad syntax when add an url in dol_print_graph()
2017-11-15 11:11:45 +01:00
Philippe GRAND
5615416d1a better handle of errors 2017-11-15 11:09:18 +01:00
Neil Orley
42d1072dee NEW Tag the order as validated (opened) in the REST API
Tag the order as validated (opened)
2017-11-15 10:55:39 +01:00
Neil Orley
8e869688f5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-11-15 10:42:00 +01:00
Laurent Destailleur
f37320590d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-15 10:40:53 +01:00
Laurent Destailleur
924cf871a7 FIX CSS for IE10 2017-11-15 10:40:24 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
366ade4030 Code comment 2017-11-14 19:42:34 +01:00
Laurent Destailleur
77b6ef7396 Code comment 2017-11-14 19:41:57 +01:00
Laurent Destailleur
388b90a94c Fix repair of utf8 2017-11-14 19:00:52 +01:00
Laurent Destailleur
501f5b8292 Merge duplicate translation key 2017-11-14 18:26:39 +01:00
Laurent Destailleur
f789714f14 Fix translation 2017-11-14 18:16:01 +01:00
Laurent Destailleur
451d3ed8ed NEW Add API to activate/unactivate a contract 2017-11-14 17:51:04 +01:00
Regis Houssin
a4b96f00df Fix: missing encrypt datafor llx_const 2017-11-14 16:00:34 +01:00
Neil Orley
9b2611933d NEW Create an invoice using an existing order
Create an invoice using an existing order using the REST API
2017-11-14 15:49:09 +01:00
Laurent Destailleur
e37252d83a Fix div not closed 2017-11-14 15:17:10 +01:00
Laurent Destailleur
a50589c3c9 NEW Better behaviour when using a text browser 2017-11-14 15:10:46 +01:00
Neil Orley
b334428d55 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-11-14 14:44:12 +01:00
Neil Orley
e513ed09f6 Change the way pa_ht is calculated 2017-11-14 14:43:50 +01:00
Frédéric FRANCE
4dca97401d
Update llx_actioncomm.sql 2017-11-14 13:18:31 +01:00
Laurent Destailleur
0e2f64af72 CSS 2017-11-14 12:18:02 +01:00
Laurent Destailleur
fa92c53ff6 Fix pb when showing dictionaries 2017-11-14 11:13:24 +01:00
Frédéric FRANCE
96031b0787
Update listactions.php 2017-11-14 11:05:58 +01:00
Frédéric FRANCE
7a76a3f497
fix trigger when module not enabled 2017-11-14 10:20:43 +01:00
florian HENRY
e195cf0b95 fix : return vat code for supplier price 2017-11-14 09:53:06 +01:00
BENKE Charlene
0553e331fe
Update card.php
Normalize link and generate document
2017-11-14 08:48:41 +01:00
Laurent Destailleur
11cb9c0d81 Code simpler 2017-11-14 01:57:50 +01:00
Laurent Destailleur
d0d1d646fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-14 01:35:16 +01:00
Laurent Destailleur
49ca901475
Merge pull request #7803 from atm-alexis/NEW_burger_menu_list_action
NEW burger menu and hooks on list action
2017-11-14 01:35:03 +01:00
Laurent Destailleur
3dc06977af
Update listactions.php 2017-11-14 01:33:44 +01:00
Laurent Destailleur
59d9ab731e Add param $idwarehouse to settodraft 2017-11-14 01:29:28 +01:00