Commit Graph

76532 Commits

Author SHA1 Message Date
ptibogxiv
9da734569d
Update config.php 2019-03-15 12:34:21 +01:00
Laurent Destailleur
1f02b74fee
Merge pull request #10843 from grandoc/new_branch_html5
update with html5 compliant code
2019-03-15 12:30:09 +01:00
Laurent Destailleur
d2c7fe3a6f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-15 11:06:54 +01:00
Laurent Destailleur
d31b632d96 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/security.lib.php
2019-03-15 11:06:49 +01:00
Laurent Destailleur
074ba0729a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 11:00:52 +01:00
Laurent Destailleur
84bff41543 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 11:00:24 +01:00
Laurent Destailleur
6c2cad3d48 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/lib/security.lib.php
2019-03-15 11:00:00 +01:00
Laurent Destailleur
8711e51bce
Merge pull request #10841 from atm-gauthier/6.0_notest_tab_documents_on_expensereport
FIX : no need to test anything to display documents tabs on expense report
2019-03-15 10:56:53 +01:00
Laurent Destailleur
ff1fc4fb59
Merge pull request #10845 from OPEN-DSI/fix-contrat-card-date
Fix dol_print_date error for real dates in cotract card
2019-03-15 10:50:34 +01:00
Laurent Destailleur
e326c4d579 Look and feel v10 2019-03-15 10:48:10 +01:00
gauthier
8375b47e74 FIX : in fact expensereport must be in $check array 2019-03-15 10:21:50 +01:00
Laurent Destailleur
32767a487b FIX Missing id in call of restrictedArea for expense report card.php 2019-03-15 10:18:58 +01:00
Philippe GRAND
bcfaf4bb1b update with html5 compliant code 2019-03-15 09:55:06 +01:00
Philippe GRAND
c958bf49d0 update with html5 compliant code 2019-03-15 09:54:10 +01:00
Philippe GRAND
14abf357e7 update with html5 compliant code 2019-03-15 09:53:06 +01:00
Philippe GRAND
6bdac445c5 update with html5 compliant code 2019-03-15 09:50:53 +01:00
Philippe GRAND
89da4fbdc1 update with html5 compliant code 2019-03-15 09:49:07 +01:00
Philippe GRAND
7c916666a6 update with html5 compliant code 2019-03-15 09:48:32 +01:00
Philippe GRAND
81510717ce update with html5 compliant code 2019-03-15 09:47:56 +01:00
Philippe GRAND
cd168a951a update with html5 compliant code 2019-03-15 09:46:39 +01:00
Philippe GRAND
2e4bf72382 update with html5 compliant code 2019-03-15 09:45:48 +01:00
Philippe GRAND
3d93fba4b8 update with html5 compliant code 2019-03-15 09:45:01 +01:00
Philippe GRAND
404872298f update with html5 compliant code 2019-03-15 09:44:17 +01:00
Philippe GRAND
f028f74c7c update with html5 compliant code 2019-03-15 09:43:33 +01:00
Philippe GRAND
6536efa81c update with html5 compliant code 2019-03-15 09:41:56 +01:00
Philippe GRAND
2463ee47ba update with html5 compliant code 2019-03-15 09:40:52 +01:00
Lionel VESSILLER
971037d755 Fix dol_print_date error for real dates in cotract card 2019-03-15 08:42:00 +01:00
Laurent Destailleur
99e67bcc21 Fix phpcs 2019-03-15 02:48:13 +01:00
Laurent Destailleur
7c59629e66 Fix phpcs 2019-03-15 02:32:21 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
0ef6fd36f9 Merge and clean TakePOS CSS 2019-03-15 00:49:44 +01:00
Laurent Destailleur
ca31f654e7 Reduce text for graph title 2019-03-14 23:42:22 +01:00
Laurent Destailleur
6aa9a5f13a Fix link to backoffice 2019-03-14 23:36:55 +01:00
Laurent Destailleur
c44d9bf8e2 Fix phpcs 2019-03-14 23:27:50 +01:00
Laurent Destailleur
f865d1c378
Merge pull request #10840 from hregis/develop_takepos
FIX wrong url
2019-03-14 19:26:16 +01:00
Laurent Destailleur
f9d76c372d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-14 19:24:11 +01:00
Laurent Destailleur
5be2c45d61 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expedition/card.php
	htdocs/expedition/shipment.php
	htdocs/livraison/card.php
2019-03-14 19:23:59 +01:00
Philippe GRAND
dc8de23c1a update with html5 compliant code 2019-03-14 19:21:27 +01:00
Philippe GRAND
3f0bd79324 update with html5 compliant code 2019-03-14 19:17:59 +01:00
Philippe GRAND
a479d536c5 update with html5 compliant code 2019-03-14 19:17:00 +01:00
Philippe GRAND
6fb85c0930 update with html5 compliant code 2019-03-14 19:09:02 +01:00
Philippe GRAND
133997b195 update with html5 compliant code 2019-03-14 19:07:22 +01:00
Laurent Destailleur
51de29458f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-14 19:06:31 +01:00
Philippe GRAND
33aa7fa309 update with html5 compliant code 2019-03-14 19:06:30 +01:00
Laurent Destailleur
a35a2faacb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/livraison/card.php
2019-03-14 19:06:21 +01:00
Philippe GRAND
309514c15c update with html5 compliant code 2019-03-14 19:03:58 +01:00
Philippe GRAND
9f420bdd08 update with html5 compliant code 2019-03-14 19:02:37 +01:00
Philippe GRAND
c61fbcf190 update with html5 compliant code 2019-03-14 19:01:47 +01:00
Philippe GRAND
e3e8e66005 update with html5 compliant code 2019-03-14 19:00:12 +01:00
Laurent Destailleur
a8bd8a2101 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-14 18:49:24 +01:00