Commit Graph

73482 Commits

Author SHA1 Message Date
Laurent Destailleur
66998c4873 Fix translation 2019-02-05 19:37:22 +01:00
Laurent Destailleur
44f5223c90 Remove warning 2019-02-05 18:54:38 +01:00
Lionel VESSILLER
727213a5fd Fix margin by users when a thirdparty have many sellers 2019-02-05 17:04:46 +01:00
Lionel VESSILLER
4e08aa95bb Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix-margin-agents 2019-02-05 17:03:12 +01:00
Lionel VESSILLER
f4c5f1e3f1 Revert "Fix filter by event type Emailing in show actions done (companylib)"
This reverts commit 225e69a4de.
2019-02-05 17:02:43 +01:00
Laurent Destailleur
0345c00f0a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-05 16:45:10 +01:00
Laurent Destailleur
bb315a6f12 Fix trans 2019-02-05 16:44:10 +01:00
Lionel VESSILLER
98e9671e46 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2019-02-05 16:42:43 +01:00
Laurent Destailleur
f4e4377435 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-05 15:24:14 +01:00
Laurent Destailleur
4097d648ae Fix search with alias 2019-02-05 15:23:51 +01:00
Laurent Destailleur
d49dd8d593 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-05 15:16:44 +01:00
Laurent Destailleur
b7f2a2b3f3 Fix search alias page if page not found 2019-02-05 15:15:41 +01:00
Laurent Destailleur
fbed22050d fix syntax error 2019-02-05 14:33:36 +01:00
Laurent Destailleur
4de122d1d4 Fix date format 2019-02-05 14:33:03 +01:00
Laurent Destailleur
e3d0cb1637 Fix css 2019-02-05 14:32:23 +01:00
Laurent Destailleur
541f6e537e Fix link to pay membership renewal 2019-02-05 14:05:39 +01:00
Laurent Destailleur
e5827f77cb Fix link to pay membership renewal 2019-02-05 14:03:35 +01:00
Laurent Destailleur
6d09c85231 Fix missing button 2019-02-05 14:01:32 +01:00
Laurent Destailleur
b58c49d0bb Trans 2019-02-05 13:59:23 +01:00
Laurent Destailleur
8d40440418 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-05 13:57:08 +01:00
Laurent Destailleur
d6501d996c Missing trans 2019-02-05 13:56:55 +01:00
Laurent Destailleur
789c089e14 Code comment 2019-02-05 13:08:28 +01:00
Marc de Lima Lucio
428efa9227 FIX: line edit template: keep fk_parent_line 2019-02-05 12:02:49 +01:00
Marc de Lima Lucio
64739098ae FIX: expedition: reset status on rollback + replace hardcoded status with const 2019-02-05 11:58:49 +01:00
atm-quentin
da0c863f45 FIX supplier invoice payment total dont care about deposit or credit 2019-02-05 10:30:38 +01:00
atm-quentin
730a2a90ff FIX supplier invoice product stats total ht is line total not invoice total 2019-02-05 09:43:14 +01:00
Regis Houssin
8860eab6b1 FIX wrong merged conflict 2019-02-05 07:40:50 +01:00
Regis Houssin
4a19cba257 FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9 2019-02-05 06:34:05 +01:00
Laurent Destailleur
bb8b3d4e5c Add br 2019-02-05 00:25:42 +01:00
wdammak
f1ffae3ac5
Update main.inc.php
fix travis
2019-02-04 18:27:47 +01:00
wdammak
01ba32efbc
Update main.inc.php
Set current modulepart
2019-02-04 17:52:15 +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
Philippe GRAND
71e99e0972 update with html5 compliant code 2019-02-04 10:42:40 +01:00
Philippe GRAND
577aef54e1 update with html5 compliant code 2019-02-04 10:37:51 +01:00
Philippe GRAND
1154f9a048 update with html5 compliant code 2019-02-04 10:35:53 +01:00
Philippe GRAND
eb25d12a1b update with html5 compliant code 2019-02-04 10:32:33 +01:00
Philippe GRAND
7c8d84aa03 update with html5 compliant code 2019-02-04 10:27:26 +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
48ab519841 Fix typo 2019-02-03 21:40:56 +01:00
Laurent Destailleur
5a6e46a9c3 Doc 2019-02-03 21:40:23 +01:00
Laurent Destailleur
695a681c14 NEW Can generate invoices from timespent of a project 2019-02-03 21:35:30 +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
Laurent Destailleur
efe5cd3dd8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 21:13:06 +01:00
Laurent Destailleur
cdfeeafab9 FIX #10381 2019-02-03 21:12:05 +01:00