Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Laurent Destailleur
|
0827929ede
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
|
2019-01-28 16:29:34 +01:00 |
|
Laurent Destailleur
|
f7bcd1ef6d
|
Fix trans
|
2019-01-28 01:35:12 +01:00 |
|
Laurent Destailleur
|
ecc30b8ffe
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
|
2019-01-27 18:27:58 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
ba87284a90
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-26 14:30:44 +01:00 |
|
Laurent Destailleur
|
e46fb303d0
|
Merge pull request #10386 from atm-florian/dev_newhiglightinvoice_onpayment
NEW show in blod invoice amount where we came from when making payment
|
2019-01-26 14:29:20 +01:00 |
|
Laurent Destailleur
|
adb7ec7015
|
Merge pull request #10399 from grandoc/new_branch_23_01_2019
update with html5 compliant code
|
2019-01-26 14:02:26 +01:00 |
|
Laurent Destailleur
|
6b4b03e6aa
|
Merge pull request #10405 from grandoc/new_branch_24_01_2019
update with html5 compliant code
|
2019-01-26 13:52:10 +01:00 |
|
Laurent Destailleur
|
63e04823b2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-25 11:57:01 +01:00 |
|
Laurent Destailleur
|
63c66095e6
|
Work on file export
|
2019-01-25 11:56:50 +01:00 |
|
Laurent Destailleur
|
a5daa25707
|
Move common code to get sell price into a method
|
2019-01-24 19:45:17 +01:00 |
|
Philippe GRAND
|
c1b0d3667a
|
update with html5 compliant code
|
2019-01-24 16:47:19 +01:00 |
|
Philippe GRAND
|
0b353dc560
|
update with html5 compliant code
|
2019-01-24 16:43:28 +01:00 |
|
Philippe GRAND
|
7c086ba8ed
|
update with html5 compliant code
|
2019-01-24 10:02:06 +01:00 |
|
Philippe GRAND
|
1599f165ee
|
update with html5 compliant code
|
2019-01-24 09:57:39 +01:00 |
|
Philippe GRAND
|
7ff1555e58
|
update with html5 compliant code
|
2019-01-23 17:39:40 +01:00 |
|
gauthier
|
84e1f92acd
|
FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
|
2019-01-23 15:16:51 +01:00 |
|
Laurent Destailleur
|
fbf5a1c056
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-21 20:48:19 +01:00 |
|
florian HENRY
|
a5cbef7aec
|
new show in blod invoice amount where we came from for payment
|
2019-01-21 11:51:54 +01:00 |
|
Frédéric FRANCE
|
4ab19c25c8
|
add missing global $conf in bonprelevement class
|
2019-01-21 08:23:31 +01:00 |
|
Laurent Destailleur
|
c26f264cac
|
Merge pull request #10369 from mwelters/mwelters/addays
Add configurable days to SEPA Withdrawal Execution Date
|
2019-01-20 19:47:57 +01:00 |
|
markus
|
a45ea9239d
|
Rename consts and cleanup
|
2019-01-19 14:24:20 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
markus
|
de9b8f427d
|
Add configurable days to SEPA Withdrawal Execution Date
|
2019-01-18 16:16:55 +01:00 |
|
Philippe GRAND
|
0290b74495
|
update with html5 compliant code
|
2019-01-18 10:18:18 +01:00 |
|
Philippe GRAND
|
44708ce7d5
|
update with html5 compliant code
|
2019-01-18 10:16:51 +01:00 |
|
Philippe GRAND
|
539660a45d
|
update with html5 compliant code
|
2019-01-18 10:13:05 +01:00 |
|
Philippe GRAND
|
8096844062
|
update with html5 compliant code
|
2019-01-18 10:10:39 +01:00 |
|
Philippe GRAND
|
68c6ccae22
|
update with html5 compliant code
|
2019-01-18 10:06:45 +01:00 |
|
Laurent Destailleur
|
58bda12e22
|
css
|
2019-01-17 19:31:01 +01:00 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +01:00 |
|
Laurent Destailleur
|
2e55bdf087
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-17 19:11:18 +01:00 |
|
Laurent Destailleur
|
16bb85b7fa
|
Merge pull request #10348 from a-schild/9.0
Fix for issue #10333 branch 9.0
|
2019-01-17 18:58:49 +01:00 |
|
Laurent Destailleur
|
67efae20f4
|
Fix css
|
2019-01-17 17:23:54 +01:00 |
|
Laurent Destailleur
|
ab5aaa6b43
|
Start debug compta-files
|
2019-01-17 00:32:43 +01:00 |
|
Laurent Destailleur
|
889ce7fc5d
|
Start debug compta-files
|
2019-01-17 00:09:05 +01:00 |
|
Laurent Destailleur
|
8d4d1dbf99
|
Fix phpcs
|
2019-01-16 18:51:51 +01:00 |
|
Laurent Destailleur
|
3a8afafabd
|
Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice
New manage multicompany for invoice
|
2019-01-16 18:51:01 +01:00 |
|
Laurent Destailleur
|
f8973c9a22
|
Fix translation Late <> Alert
|
2019-01-16 17:44:39 +01:00 |
|
Laurent Destailleur
|
e7943ae844
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-16 16:48:52 +01:00 |
|
Laurent Destailleur
|
d3828130ab
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/adherents/class/adherent.class.php
|
2019-01-16 16:48:21 +01:00 |
|
a-schild
|
7df86cb630
|
Fix for issue #10333
paymentterm.class.php invalid SQL in fetch
|
2019-01-16 13:06:12 +01:00 |
|
a-schild
|
2f5db98a5c
|
Fix for issue #10333
paymentterm.class.php invalid SQL in fetch
|
2019-01-16 13:05:22 +01:00 |
|
atm-quentin
|
013c078c8b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
|
2019-01-16 10:52:46 +01:00 |
|
atm-quentin
|
0d384eea00
|
FIX credit note can have negative value
|
2019-01-16 09:33:24 +01:00 |
|
André Schild
|
1c0e15192d
|
Fix for issue #10333
paymentterm.class.php invalid SQL in fetch
|
2019-01-15 20:43:16 +01:00 |
|