Commit Graph

73615 Commits

Author SHA1 Message Date
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
Laurent Destailleur
410b291ad8 Fix quote not closed 2019-02-03 20:52:39 +01:00
Laurent Destailleur
af9e2d07d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/paiement.php
	htdocs/fourn/facture/paiement.php
2019-02-03 20:38:47 +01:00
Laurent Destailleur
4b77b3ff23 NEW Support tag {ccc} on payment ref 2019-02-03 20:36:20 +01:00
Laurent Destailleur
72f78ecf3b FIX #10460 compatibility with MariaDB 10.4 2019-02-03 20:02:05 +01:00
Laurent Destailleur
a520642d97 FIX Price in combo list of service does not use the correct price level 2019-02-03 19:54:55 +01:00
Laurent Destailleur
4d41b1b33c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 19:45:45 +01:00
Laurent Destailleur
2c71e6b19a
Merge pull request #10426 from frederic34/nospaceaftercomma
PSR2 wants space after comma in function calls
2019-02-03 19:27:35 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
4538d13add
Merge pull request #10450 from atm-gauthier/8.0_fIX_fetch_member
FIX : wrong tests on fetch
2019-02-03 19:25:25 +01:00
Laurent Destailleur
bd2c7092a4
Update user.class.php 2019-02-03 19:25:11 +01:00
Laurent Destailleur
62d677118d
Update adherent.class.php 2019-02-03 19:24:18 +01:00
Laurent Destailleur
3a5372b59c
Merge pull request #10484 from andreubisquerra/master
CSS improvements and Takepos setup check
2019-02-03 19:16:08 +01:00
Laurent Destailleur
8dd64b0dc1
Update takepos.php 2019-02-03 19:15:41 +01:00
Laurent Destailleur
d773c74f09
Merge pull request #10483 from atm-maxime/fix_warehouse_fetch
Fix warehouse fetch was not checking parameters. Fixes #10414
2019-02-03 19:11:47 +01:00
Laurent Destailleur
9f7dfe2921
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
2019-02-03 19:11:07 +01:00
Laurent Destailleur
49d695c9b2
Merge pull request #10479 from frederic34/patch-2
remove psr2 warning for else if usage
2019-02-03 19:06:38 +01:00
Frédéric FRANCE
9c41f41c24 add missing require date.lib.php 2019-02-03 19:06:20 +01:00