wdammak
|
01ba32efbc
|
Update main.inc.php
Set current modulepart
|
2019-02-04 17:52:15 +01:00 |
|
Laurent Destailleur
|
3babc11312
|
Fix phpcs
|
2019-02-04 02:06:32 +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 |
|
Laurent Destailleur
|
23866e0722
|
Merge pull request #10482 from frederic34/patch-17
FIX add missing require date.lib.php
|
2019-02-03 19:05:57 +01:00 |
|
Laurent Destailleur
|
326996d392
|
Merge pull request #10488 from frederic34/PSR2EndFileNewlineNoneFound
psr2 end file new line none found
|
2019-02-03 19:04:28 +01:00 |
|
Laurent Destailleur
|
aa821634ec
|
Merge pull request #10489 from frederic34/patch-18
$this->get($id) return array not int
|
2019-02-03 19:03:42 +01:00 |
|
Laurent Destailleur
|
f8b10e9c3d
|
Doxygen
|
2019-02-03 18:47:55 +01:00 |
|
Laurent Destailleur
|
afd53a99c2
|
Fix merge
|
2019-02-03 18:21:03 +01:00 |
|
Laurent Destailleur
|
e309261140
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-03 18:19:58 +01:00 |
|
Laurent Destailleur
|
456e78b7cf
|
FIX #10485
|
2019-02-03 17:45:31 +01:00 |
|
Frédéric FRANCE
|
e3a5d2b839
|
get return array not int
|
2019-02-03 16:39:48 +01:00 |
|
Frédéric FRANCE
|
273d68381c
|
psr2 end file new line none found
|
2019-02-03 15:21:21 +01:00 |
|
andreubisquerra
|
8b1b8bb7a3
|
CSS improvements and Takepos setup check
|
2019-02-02 23:57:38 +01:00 |
|
Maxime Kohlhaas
|
bb3225809b
|
Fix warehouse fetch was not checking parameters. Fixes #10414
|
2019-02-02 18:43:25 +01:00 |
|
Frédéric FRANCE
|
a5af92cff1
|
add missing require date.lib.php
|
2019-02-02 18:33:48 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
80b48680f6
|
clean missing spaces in the last merge
|
2019-02-02 09:49:07 +01:00 |
|
Frédéric FRANCE
|
2f40443b46
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-02 09:46:14 +01:00 |
|
Frédéric FRANCE
|
25abceb116
|
remove psr2 warning for else if usage
|
2019-02-02 08:59:37 +01:00 |
|
Frédéric FRANCE
|
96de1b175c
|
clean missing spaces in the last merge
|
2019-02-02 08:51:30 +01:00 |
|
Frédéric FRANCE
|
bd8d81a96e
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-02 07:49:41 +01:00 |
|
Laurent Destailleur
|
75845a990f
|
FIX Missing province in export of invoice
|
2019-02-01 22:55:28 +01:00 |
|
Laurent Destailleur
|
28c1b1ce58
|
Work on billing time spent
|
2019-02-01 22:39:36 +01:00 |
|
Laurent Destailleur
|
ebe30f7a0e
|
FIX error report not returned
|
2019-02-01 19:19:23 +01:00 |
|
Laurent Destailleur
|
2e5382f40d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:39:27 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Laurent Destailleur
|
c313ad6195
|
Fix phpcs
|
2019-02-01 18:19:39 +01:00 |
|
Laurent Destailleur
|
044e617667
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-01 18:17:09 +01:00 |
|