Cédric
|
777ed43e75
|
Remove PHP notices adding empty($page)
|
2018-01-04 17:31:59 +01:00 |
|
Cédric
|
41fec45daf
|
Fix PHP notices adding empty($page)
|
2018-01-04 16:23:25 +01:00 |
|
Laurent Destailleur
|
59ed23069c
|
Fix debug accounting module
|
2018-01-04 15:52:07 +01:00 |
|
Laurent Destailleur
|
534cbcb941
|
Debug translation
|
2018-01-03 20:59:35 +01:00 |
|
Laurent Destailleur
|
eab44f62b1
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
|
2017-12-21 14:35:33 +01:00 |
|
Laurent Destailleur
|
6a62e13960
|
FIX security vulnerability reported by ADLab of Venustech
|
2017-12-21 13:32:16 +01:00 |
|
Alexandre SPANGARO
|
7b935a96bf
|
FIX : Various payment
|
2017-12-11 07:03:37 +01:00 |
|
Laurent Destailleur
|
c6c248fa28
|
Merge pull request #7930 from aspangaro/7.0-7
Fix : Accountancy some cleaning
|
2017-12-10 21:10:30 +01:00 |
|
Alexandre SPANGARO
|
ac95ccd872
|
FIX : Debug various_payment
|
2017-12-10 14:05:36 +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
|
9b5f7099f7
|
Code comment
|
2017-12-03 19:50:15 +01:00 |
|
Laurent Destailleur
|
33032a5474
|
Look and feel v6
|
2017-11-29 18:13:22 +01:00 |
|
Laurent Destailleur
|
682afe8918
|
Fix scrutinizer
|
2017-11-29 16:25:12 +01:00 |
|
Laurent Destailleur
|
b14cb7a97f
|
Debug accountancy
|
2017-11-28 11:49:11 +01:00 |
|
Laurent Destailleur
|
ef786f2271
|
Debug accountancy module
|
2017-11-28 11:31:55 +01:00 |
|
Laurent Destailleur
|
a15a57317b
|
Debug accountancy module
|
2017-11-28 11:12:13 +01:00 |
|
Laurent Destailleur
|
b63fb1f854
|
Support of VAT NPR in accounting module
|
2017-11-27 22:18:10 +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
|
57d4f28cba
|
Enhance usability of accounting module
|
2017-11-27 15:51:28 +01:00 |
|
Laurent Destailleur
|
0b9a3087ea
|
Fix bug reported by scrutinizer
|
2017-11-25 12:11:02 +01:00 |
|
Laurent Destailleur
|
aaf08ade2f
|
Fix bug reported by scrutinizer
|
2017-11-25 11:21:31 +01:00 |
|
Laurent Destailleur
|
06de67cb8a
|
Update purchasesjournal.php
|
2017-11-24 16:37:19 +01:00 |
|
John
|
d8f18e18ce
|
Add new doActions hook
|
2017-11-23 12:08:33 +01:00 |
|
Laurent Destailleur
|
1509a4f125
|
Merge pull request #7840 from frederic34/bankjournal
align export bankjournal on others
|
2017-11-22 11:57:27 +01:00 |
|
Frédéric FRANCE
|
6d33cc3980
|
align export bankjournal on others
|
2017-11-20 15:02:11 +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
|
f68b2bdeca
|
Use the confirmation when deleting from mass action everywhere.
|
2017-11-15 11:39:11 +01:00 |
|
Laurent Destailleur
|
f33182acc5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-11-12 20:49:53 +01:00 |
|
Laurent Destailleur
|
6608dd72bd
|
Merge pull request #7776 from frederic34/exportadmin
correct merge
|
2017-11-11 17:23:42 +01:00 |
|
Laurent Destailleur
|
d1860b87f8
|
NEW Add a confirmation for all mass action 'delete'
|
2017-11-11 16:34:11 +01:00 |
|
Laurent Destailleur
|
d938a56282
|
Clean code
|
2017-11-11 01:10:17 +01:00 |
|
Frédéric FRANCE
|
fe3ce78ae4
|
Update card.php
|
2017-11-08 11:24:33 +01:00 |
|
Frédéric FRANCE
|
45afbae49c
|
some change
|
2017-11-07 10:47:58 +01:00 |
|
Laurent Destailleur
|
2ab943f85a
|
Fix size of image by using fa picto
|
2017-11-07 00:18:55 +01:00 |
|
Frédéric FRANCE
|
7f44faf0be
|
correct merge
|
2017-11-06 20:29:57 +01:00 |
|
Frédéric FRANCE
|
ea910adeb2
|
Merge branch 'develop' into accountingexport
|
2017-11-05 21:11:41 +01:00 |
|
Laurent Destailleur
|
a329f7dc75
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
|
2017-11-05 18:50:14 +01:00 |
|
Laurent Destailleur
|
d4d370d8c4
|
Merge pull request #7769 from aspangaro/7.0-7
Small code improve on bookkeeping card movement
|
2017-11-05 18:40:49 +01:00 |
|
Frédéric FRANCE
|
bb252846e3
|
accounting export admin config
|
2017-11-05 11:48:41 +01:00 |
|
Alexandre SPANGARO
|
7d524f3364
|
Small code improve on bookkeeping card movement
|
2017-11-05 08:45:05 +01:00 |
|
Philippe GRAND
|
c31f852f67
|
fix : Warning: A non-numeric value encountered
|
2017-11-03 19:37:54 +01:00 |
|
florian HENRY
|
bd68b94411
|
fix : missing hook in accountancy
|
2017-11-02 13:27:09 +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 |
|
Laurent Destailleur
|
2187cfeee9
|
Merge pull request #7693 from aspangaro/7.0-label_operation_on_general_ledger
Update balance export
|
2017-10-24 12:51:14 +02:00 |
|