Laurent Destailleur
7e6ba51780
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/comment.php
2018-03-07 13:06:29 +01:00
Regis Houssin
1807bb36e2
Fix: missing global $conf
2018-03-06 13:31:13 +01:00
Regis Houssin
35703cff99
Fix: wrong entity id, already value 1 !
2018-03-06 13:23:00 +01:00
Laurent Destailleur
aac59f3e21
Fix escaping
2018-02-21 11:09:17 +01:00
Laurent Destailleur
15ba0c3b49
Close #7989 Merge manually in existing class
2018-02-20 15:35:42 +01:00
Laurent Destailleur
522caa4cf0
Merge #7989
2018-02-20 15:26:40 +01:00
Laurent Destailleur
f251113f69
Fix accounting module with multicompany
2018-02-06 01:00:35 +01:00
Laurent Destailleur
a41847d084
Fix: date of modificaiton in ledger not visible.
...
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
2018-02-02 14:27:07 +01:00
Laurent Destailleur
fd48ce11f9
Merge pull request #8085 from Darkjeff/Fixing-Lettering
...
Fixing lettering
2018-01-24 11:14:19 +01:00
Laurent Destailleur
39c4df723a
Fix error management when setting product accounts
2018-01-22 21:07:10 +01:00
Darkjeff
f47f0357d3
Fixing Subledger account in lettering
2018-01-22 15:57:17 +01:00
Laurent Destailleur
e4c02152b3
Fix navigation in bookeeping view grouped by account
2018-01-15 12:14:18 +01:00
Laurent Destailleur
15ed7584b8
Fix navigation in accounting account card
2018-01-11 17:06:06 +01:00
Laurent Destailleur
01cde59608
Fix filter on bookkeeping group view
2018-01-04 19:16:53 +01:00
Alexandre SPANGARO
7b935a96bf
FIX : Various payment
2017-12-11 07:03:37 +01:00
Alexandre SPANGARO
1269d98df2
Merge remote-tracking branch 'uptream/develop' into 7.0-7
...
# Conflicts:
# htdocs/accountancy/admin/export.php
# htdocs/accountancy/class/accountancyexport.class.php
# htdocs/accountancy/journal/expensereportsjournal.php
2017-12-09 06:14:34 +01:00
Alexandre SPANGARO
065ef4e5c2
Fix : Accountancy some cleaning
2017-12-09 06:00:13 +01:00
Laurent Destailleur
682afe8918
Fix scrutinizer
2017-11-29 16:25:12 +01:00
Laurent Destailleur
a9d3e90b70
Big debug of accountancy module
2017-11-27 21:53:22 +01:00
Laurent Destailleur
533a82187a
NEW Add a protection so we can't journalize non balanced transactions
2017-11-27 17:12:48 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
elarifr
c7129cdd71
quadra format date is wrong
...
need amount in cent without decimal symbol
need to remove accent as it give two ascii and break import
2017-11-19 19:42:16 +01:00
Laurent Destailleur
6608dd72bd
Merge pull request #7776 from frederic34/exportadmin
...
correct merge
2017-11-11 17:23:42 +01:00
Laurent Destailleur
d938a56282
Clean code
2017-11-11 01:10:17 +01:00
Frédéric FRANCE
45afbae49c
some change
2017-11-07 10:47:58 +01:00
Frédéric FRANCE
ea910adeb2
Merge branch 'develop' into accountingexport
2017-11-05 21:11:41 +01:00
Frédéric FRANCE
bb252846e3
accounting export admin config
2017-11-05 11:48:41 +01:00
Laurent Destailleur
417642ba39
Standardize interface (search on date modification)
2017-11-02 10:33:04 +01:00
Alexandre SPANGARO
f9e801b4a7
Update works
2017-11-01 08:42:17 +01:00
Alexandre SPANGARO
7c0ff3a32f
Merge remote-tracking branch 'uptream/develop' into 7.0-general_ledger
2017-11-01 07:58:20 +01:00
Alexandre SPANGARO
7a719c6be6
NEW General ledger : Add field and selected field
2017-10-29 05:37:50 +01:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
florian HENRY
b5fc559889
travis
2017-10-18 14:48:58 +02:00
florian HENRY
4273e507c5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into
...
dev_accountancy
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
htdocs/accountancy/class/lettering.class.php
2017-10-18 09:52:56 +02:00
Laurent Destailleur
ebe0664aff
Merge branch 'develop' into scrutinizer-patch-3
2017-10-16 20:54:15 +02:00
Laurent Destailleur
87814af7b6
Move function colorIsLight into functions.lib.php
...
Fix scrutinizer bugs.
2017-10-16 09:29:10 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Laurent Destailleur
d12019d1b5
Fix from scrutinizer
2017-10-13 13:10:36 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
florian HENRY
18bd2c4445
fix travis
2017-10-02 09:04:22 +02:00
Alexandre SPANGARO
6a05645295
Fix : Accountancy export model for Agiris Isacompta
2017-09-30 06:58:31 +02:00
florian HENRY
6fcfe89565
NEW : lettrage in accountancy
2017-09-26 13:02:29 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
2cdea7e37c
Fix bug reported by scrutinizer
2017-09-12 19:21:26 +02:00
Laurent Destailleur
59721bf8ed
Fix code comment
2017-09-08 13:33:52 +02:00
Laurent Destailleur
48c526f87d
Debug report for accounting module
2017-09-05 12:53:25 +02:00
Laurent Destailleur
c1d31c34cd
Work on reports per date
2017-09-05 02:26:23 +02:00
Laurent Destailleur
e1fa37f7ff
Work on reports per date
2017-09-05 02:13:02 +02:00
Laurent Destailleur
c15454e62b
Fix method to delete a bookkeeping record
2017-09-04 13:09:26 +02:00
Laurent Destailleur
31a74d448c
Work on accounting reports.
2017-08-31 22:38:30 +02:00
