Laurent Destailleur
56426ad3d9
Merge pull request #7228 from aspangaro/6.0-d2
...
Fix v6: SQL error in payment list and remove function length_accountg in bank index
2017-08-04 15:18:43 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Marc de Lima Lucio
adbb41799c
FIX: calculate correct remain to pay for planned bank transactions
2017-08-01 11:08:58 +02:00
Alexandre SPANGARO
e41543c22e
Fix v6: Debug various_payment
2017-08-01 06:44:37 +02:00
Alexandre SPANGARO
efd24cc1a2
Fix: function length_accountg has been moved in getNomUrl
2017-08-01 06:16:23 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
Laurent Destailleur
8c287174b0
Merge pull request #7215 from aspangaro/6.0-d1
...
Debug various_payment
2017-07-31 02:32:46 +02:00
GUERRIER Kevin
b6b3ab3f1b
NEW Add Next/Previous button on operation date of bank line
...
Operation date has to be frequently updated because some bank change them in many case. With this feature, this value can be updated simply like the value date.
2017-07-29 15:07:27 +02:00
GUERRIER Kevin
ded6b40489
Add possibility to propose last num releve in conciliation
2017-07-29 14:21:58 +02:00
Alexandre SPANGARO
d8c6bc4a67
Fix: informations (Add account & correct tooltip)
2017-07-28 07:42:02 +02:00
Alexandre SPANGARO
5a932f993d
Fix: function length_accountg has been moved in getNomUrl
2017-07-28 07:27:04 +02:00
Alexandre SPANGARO
66067f980b
Fix: cancel in create mode
2017-07-28 07:00:52 +02:00
Alexandre SPANGARO
95672e3bf0
Merge remote-tracking branch 'uptream/6.0' into 6.0-d1
2017-07-28 06:40:47 +02:00
Alexandre SPANGARO
0e86bfb6d4
Fix : delete function
2017-07-28 06:40:15 +02:00
Laurent Destailleur
bdfb0b7561
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
2017-07-26 21:22:53 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
florian HENRY
d6d454edc8
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:32:27 +02:00
florian HENRY
b9d5f4ba10
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-24 09:02:32 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
84d76f26f2
Fix missing picto
2017-07-15 21:55:05 +02:00
Laurent Destailleur
3cd21ee659
Fix sort order
2017-07-15 21:19:39 +02:00
Laurent Destailleur
bab963ec07
FIX Pagination on the ledger page.
2017-07-15 19:19:12 +02:00
Laurent Destailleur
cb87b314be
FIX Maxi debug of journalization of bank journal.
2017-07-15 03:41:07 +02:00
Laurent Destailleur
24ecd48b22
Minor fix
2017-07-15 03:40:37 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
florian HENRY
262e23bc41
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_fixtransfert
Conflicts:
htdocs/compta/bank/transfer.php
2017-07-10 13:48:22 +02:00
Laurent Destailleur
1d35c87c18
Merge pull request #7125 from aspangaro/6.0-fec3
...
Fix some problems
2017-07-07 20:32:27 +02:00
Laurent Destailleur
749e5eb7f4
Fix link
2017-07-07 20:24:39 +02:00
Alexandre SPANGARO
0c5febfb4d
Fix: Accountancy
2017-07-07 06:09:49 +02:00
florian HENRY
ffb8c684d0
NEW : Can transmer from bank account to bank account with different
...
currency
2017-07-06 13:40:26 +02:00
florian HENRY
7f869b4840
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
2017-07-03 14:36:50 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
534ec0d44a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/bankentries.php
2017-06-24 16:26:29 +02:00
Laurent Destailleur
e79f3715b4
FIX #7048 #6075
2017-06-24 16:21:25 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
cffb368bbd
Merge pull request #7030 from aspangaro/6.0-fec3
...
Fix : Accountancy - Debug and add information in database
2017-06-19 15:02:30 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Alexandre SPANGARO
b240f536b5
Fix : Accountancy - Debug and add information in database
2017-06-17 07:54:35 +02:00
Laurent Destailleur
f39fb5187a
Fix component to select journal
2017-06-15 20:27:40 +02:00
Regis Houssin
cc75916599
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:26:24 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Regis Houssin
58b3d86b49
Fix: errors
2017-06-09 09:40:43 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
