Commit Graph

8639 Commits

Author SHA1 Message Date
florian HENRY
de87321c15 fix travcis 2019-02-13 10:28:08 +01:00
florian HENRY
e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
florian HENRY
5c059c897d fix travis (mosty for dev no conerne by my changes) 2019-02-13 09:21:14 +01:00
Laurent Destailleur
666d03f596 Fix multicompany for page to export zip of invoices 2019-02-12 18:15:30 +01:00
Laurent Destailleur
68e6f32320 css 2019-02-12 17:56:03 +01:00
Laurent Destailleur
3d3aca804f
Merge pull request #10554 from grandoc/new_branch_12_02_2019
update with html5 compliant code
2019-02-12 16:57:11 +01:00
Alexandre SPANGARO
7e60c3bf84 FIX: In various payment, subledger & accout may be alphanumeric 2019-02-12 16:27:25 +01:00
Philippe GRAND
f7a28328ed update with html5 compliant code 2019-02-12 15:40:16 +01:00
Philippe GRAND
60e503c7d1 update with html5 compliant code 2019-02-12 15:02:54 +01:00
Philippe GRAND
5007ef82c8 update with html5 compliant code 2019-02-12 14:56:38 +01:00
Philippe GRAND
fd6eaf8c3d update with html5 compliant code 2019-02-12 14:53:35 +01:00
Philippe GRAND
66e8380a4a update with html5 compliant code 2019-02-12 14:48:07 +01:00
Philippe GRAND
e10d1eb365 update with html5 compliant code 2019-02-12 14:44:25 +01:00
Philippe GRAND
8a62c9bc5f update with html5 compliant code 2019-02-12 14:40:30 +01:00
Laurent Destailleur
46941d4c20
Merge pull request #10539 from frederic34/patch-17
Update paiement.php
2019-02-12 13:43:09 +01:00
Laurent Destailleur
3e1b75e916
Merge pull request #10541 from grandoc/new_branch_10_02_2019
update with html5 compliant code
2019-02-12 13:35:27 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
6f6a767255
Merge pull request #10520 from aspangaro/develop
NEW: Add subledger in various payment
2019-02-12 13:20:58 +01:00
Laurent Destailleur
5c01ec158d Fix regression 2019-02-11 15:40:33 +01:00
Philippe Grand
d589ba4847
Update clientfourn.php
fixed...
2019-02-10 19:13:11 +01:00
Philippe GRAND
0911631b47 update with html5 compliant code 2019-02-10 16:31:34 +01:00
Philippe GRAND
0d5726b70a update with html5 compliant code 2019-02-10 16:08:03 +01:00
Philippe GRAND
5d6ebad557 update with html5 compliant code 2019-02-10 16:05:06 +01:00
Philippe GRAND
9670228f06 update with html5 compliant code 2019-02-10 16:00:59 +01:00
Philippe GRAND
d42ef14a92 update with html5 compliant code 2019-02-10 15:59:19 +01:00
Philippe GRAND
20c0af1f57 update with html5 compliant code 2019-02-10 11:04:09 +01:00
Philippe GRAND
1b25d284a2 update with html5 compliant code 2019-02-10 11:01:23 +01:00
Philippe GRAND
89351e6027 update with html5 compliant code 2019-02-10 10:56:34 +01:00
Philippe GRAND
e7f2b92eca update with html5 compliant code 2019-02-10 10:49:42 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Philippe GRAND
2624865632 update with html5 compliant code 2019-02-10 10:38:50 +01:00
Philippe GRAND
83b95ae6cc update with html5 compliant code 2019-02-10 10:25:20 +01:00
Philippe GRAND
19885cb465 update with html5 compliant code 2019-02-10 10:23:37 +01:00
Philippe GRAND
673e09d7c2 update with html5 compliant code 2019-02-10 10:21:54 +01:00
Philippe GRAND
508d6345a1 update with html5 compliant code 2019-02-10 10:16:58 +01:00
Philippe GRAND
c071e488cf update with html5 compliant code 2019-02-10 10:10:41 +01:00
Frédéric FRANCE
2020e199b2
Update paiement.php 2019-02-09 16:35:10 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Laurent Destailleur
0e42e8824b
Merge branch 'develop' into new_branch_04_02_2019 2019-02-08 09:42:18 +01:00
Alexandre SPANGARO
2ba8ae00e4 Merge remote-tracking branch 'upstream/develop' into develop 2019-02-06 21:56:01 +01:00
Alexandre SPANGARO
a28c926f03 Fix 2019-02-06 21:43:16 +01:00
Philippe GRAND
6b9b17f93e update with html5 compliant code 2019-02-04 13:57:38 +01:00
Philippe GRAND
a14332b2b0 update with html5 compliant code 2019-02-04 13:51:39 +01:00
Philippe GRAND
28a2135409 update with html5 compliant code 2019-02-04 13:45:50 +01:00
Philippe GRAND
386a4102b7 update with html5 compliant code 2019-02-04 13:44:02 +01:00
Philippe GRAND
b7605e233e update with html5 compliant code 2019-02-04 13:40:00 +01:00
Laurent Destailleur
3babc11312 Fix phpcs 2019-02-04 02:06:32 +01:00
Frédéric FRANCE
e1e14ae6e6
wip 2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00