Laurent Destailleur
|
de8496773d
|
Merge pull request #9441 from grandoc/new_branch_09_09_2018
New branch 09 09 2018
|
2018-09-12 18:24:34 +02:00 |
|
Laurent Destailleur
|
6291f18179
|
Merge pull request #9440 from frederic34/patch-5
Upper Lower Casing
|
2018-09-12 18:24:02 +02:00 |
|
Laurent Destailleur
|
3662ebe3a3
|
Fix syntax error
|
2018-09-12 18:05:20 +02:00 |
|
Laurent Destailleur
|
fcabe67e4b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-12 13:30:28 +02:00 |
|
Maxime Kohlhaas
|
c94689e9a9
|
FIX remain to pay for credit note was wrong on invoice list
|
2018-09-12 11:53:57 +02:00 |
|
Laurent Destailleur
|
aad6a0871f
|
FIX Lose filter on payment type or category after a sort on invoice list
Conflicts:
htdocs/compta/facture/list.php
|
2018-09-12 10:59:53 +02:00 |
|
Laurent Destailleur
|
7bea9f5ffb
|
FIX Lose filter on payment type or category after a sort on invoice list
|
2018-09-12 10:57:09 +02:00 |
|
delcroix Patrick
|
2a4c65726c
|
new: delete zip after download
and correct date 2.0
|
2018-09-11 22:14:58 +02:00 |
|
delcroix Patrick
|
e36bc24dee
|
fix:copyrights
|
2018-09-11 21:55:05 +02:00 |
|
delcroix Patrick
|
e3920edb79
|
correct for invoice supplier links
|
2018-09-11 21:53:47 +02:00 |
|
Frédéric FRANCE
|
cdc5a174aa
|
Update account.class.php
|
2018-09-11 00:29:01 +02:00 |
|
Frédéric FRANCE
|
7e0b1055db
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-09 13:36:53 +02:00 |
|
Frédéric FRANCE
|
f02b2f0239
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-09 13:35:58 +02:00 |
|
Philippe GRAND
|
b40fe8e4c9
|
Standardize and update code
|
2018-09-09 12:07:14 +02:00 |
|
Frédéric FRANCE
|
a558c3bdac
|
replace select_date
|
2018-09-09 11:25:59 +02:00 |
|
Philippe GRAND
|
7fcbd0fe42
|
Standardize and update code
|
2018-09-09 11:10:32 +02:00 |
|
Frédéric FRANCE
|
c2ad09cc0e
|
replace select_date
|
2018-09-09 10:11:27 +02:00 |
|
Frédéric FRANCE
|
b2a58067d9
|
replace select_date
|
2018-09-09 09:56:33 +02:00 |
|
Frédéric FRANCE
|
a3fa13994b
|
replace select_date
|
2018-09-09 09:36:12 +02:00 |
|
Frédéric FRANCE
|
ee8d56e047
|
Update card.php
|
2018-09-08 23:18:38 +02:00 |
|
Frédéric FRANCE
|
ef2ee8a6e4
|
Update card.php
|
2018-09-08 23:17:29 +02:00 |
|
Laurent Destailleur
|
84bbe8684b
|
Fix scrutinizer
|
2018-09-08 18:38:24 +02:00 |
|
Frédéric FRANCE
|
80880d8fb9
|
replace select_date by selectDate
|
2018-09-08 13:00:39 +02:00 |
|
Frédéric FRANCE
|
2b62c4ca8f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-08 10:50:27 +02:00 |
|
Laurent Destailleur
|
bcfb5fc42e
|
Merge pull request #9425 from atm-maxime/8.0
FIX : Homepage links were using wrong topmenus
|
2018-09-07 19:35:10 +02:00 |
|
Laurent Destailleur
|
0ef17fe581
|
FIX Problems with permissions of module to record payment of salaries
|
2018-09-07 13:32:56 +02:00 |
|
Maxime Kohlhaas
|
a5f4a74ecc
|
FIX : Homepage links were using wrong topmenus
|
2018-09-06 14:49:48 +02:00 |
|
Philippe GRAND
|
9025fd5891
|
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0
|
2018-09-06 14:33:46 +02:00 |
|
Philippe GRAND
|
844333688b
|
typo
|
2018-09-06 14:33:22 +02:00 |
|
Frédéric FRANCE
|
4e619dd0ed
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-05 18:51:21 +02:00 |
|
Philippe GRAND
|
056b0b26cc
|
fix : Public member variable _fetched must not be prefixed with an underscore
|
2018-09-05 15:39:04 +02:00 |
|
Philippe GRAND
|
38ca6096b2
|
Standardize and update code
|
2018-09-05 10:31:12 +02:00 |
|
Frédéric FRANCE
|
7799774ca1
|
move phpcs:ignore
|
2018-09-04 22:52:55 +02:00 |
|
Laurent Destailleur
|
ab8155f170
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
|
2018-09-04 21:35:43 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Frédéric FRANCE
|
bdcac95761
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 15:15:23 +02:00 |
|
Philippe GRAND
|
0492492df1
|
fix merge
|
2018-09-04 12:30:06 +02:00 |
|
Laurent Destailleur
|
3ef808cb9b
|
Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken
|
2018-09-04 11:23:28 +02:00 |
|
Laurent Destailleur
|
9042d341f0
|
FIX #9316 Error when listing invoices
|
2018-09-04 11:19:31 +02:00 |
|
Laurent Destailleur
|
e7d2bcc34c
|
FIX #9316 Error when listing invoices
|
2018-09-04 11:17:08 +02:00 |
|
Laurent Destailleur
|
9697bdf3b0
|
FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES
|
2018-09-04 10:38:09 +02:00 |
|
Laurent Destailleur
|
db6f80e2ff
|
FIX invoice popup hide localtax2 and 3 if not defined
|
2018-09-04 00:42:15 +02:00 |
|
Laurent Destailleur
|
3d50c454c1
|
Code comment
|
2018-09-03 17:05:44 +02:00 |
|
Frédéric FRANCE
|
22b9632555
|
move phpcs:ignore
|
2018-09-02 21:08:57 +02:00 |
|
Frédéric FRANCE
|
35232b753a
|
move phpcs:ignore
|
2018-09-02 20:37:12 +02:00 |
|
Frédéric FRANCE
|
2a5c994009
|
move phpcs:ignore
|
2018-09-02 14:01:37 +02:00 |
|
Frédéric FRANCE
|
04c1a7d4af
|
move phpcs:ignore
|
2018-09-02 13:38:11 +02:00 |
|
Philippe GRAND
|
3de16a145e
|
Standardize and update code
|
2018-09-02 11:08:41 +02:00 |
|
Philippe GRAND
|
c4f05aff28
|
Standardize and update code
|
2018-09-02 10:42:31 +02:00 |
|
Frédéric FRANCE
|
47879d44bc
|
move phpcs:ignore
|
2018-09-02 09:57:19 +02:00 |
|