Laurent Destailleur
|
04c05efafe
|
FIX Several bugs in accounting module.
|
2017-04-29 15:16:36 +02:00 |
|
Laurent Destailleur
|
faddcb28ac
|
FIX serious bugs in accounting (error management, transactions, bad
values set)
|
2017-04-29 14:53:29 +02:00 |
|
philippe grand
|
4d31759ff9
|
Update code using new css class
|
2017-04-11 14:35:10 +02:00 |
|
Laurent Destailleur
|
ad3b54b93a
|
Fix regression
|
2017-03-28 21:09:15 +02:00 |
|
Alexandre SPANGARO
|
3148841ecf
|
Fix : integration of expense report in accounatncy bank journal
|
2017-03-26 21:26:05 +02:00 |
|
Laurent Destailleur
|
5353aa6efe
|
Better error management when creating bookkeepin entries
|
2016-12-10 02:38:07 +01:00 |
|
Laurent Destailleur
|
ad981a0f07
|
FIX the key for getEntity was different for same element.
|
2016-11-18 12:54:08 +01:00 |
|
Laurent Destailleur
|
a7c6ecc177
|
Fix better compatibility with multicompany
|
2016-10-14 16:05:25 +02:00 |
|
Laurent Destailleur
|
e74718827f
|
Debug accountancy module
|
2016-10-14 15:44:33 +02:00 |
|
Laurent Destailleur
|
28e4c17730
|
Debug module accountancy expert
|
2016-10-06 19:59:33 +02:00 |
|
Laurent Destailleur
|
5a8a0fb79a
|
Debug
|
2016-10-04 21:33:47 +02:00 |
|
Laurent Destailleur
|
31ce725d73
|
Maxi debug of accountancy expert module
|
2016-10-04 19:31:05 +02:00 |
|
aspangaro
|
9a3305abf9
|
Fix: Accountancy - Problem on Cegid Export Format & presentation
|
2016-09-20 21:12:28 +02:00 |
|
aspangaro
|
d0b2068ab1
|
FIX: Accountancy - Upgrade Cegid Bank export
|
2016-04-24 14:41:14 +02:00 |
|
aspangaro
|
f5c1406beb
|
FIX: Accountancy - Fix on bank journal to support subcription
|
2016-04-24 06:10:15 +02:00 |
|
aspangaro
|
3dc991974c
|
FIX: Accountancy Bank journal Fix some problem with other module
|
2016-03-25 15:57:46 +01:00 |
|
Laurent Destailleur
|
91caea5707
|
Code was corrupted with very bad commits. I restore files manually.
|
2016-03-25 15:53:44 +01:00 |
|
aspangaro
|
8aed039ad3
|
FIX: Accountancy Bank journal Fix some problem with other module
|
2016-03-22 22:32:02 +01:00 |
|
Marcos García de La Fuente
|
89bd173c2f
|
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
2016-03-21 21:51:29 +01:00 |
|
Marcos García de La Fuente
|
5a046125db
|
Missing changes from previous commits
|
2016-03-20 14:24:49 +01:00 |
|
Laurent Destailleur
|
543f5cef63
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
dev/initdata/initdemo.sh
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/commande/card.php
htdocs/compta/facture.php
|
2016-03-13 01:31:12 +01:00 |
|
Florian HENRY
|
d7065751a1
|
fix error messages
|
2016-03-11 17:18:25 +01:00 |
|
Florian HENRY
|
33c5658209
|
fix error return
|
2016-03-11 17:17:06 +01:00 |
|
Florian HENRY
|
bb06356afb
|
qs
|
2016-03-10 11:43:07 +01:00 |
|
Laurent Destailleur
|
3a58613e45
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
|
2016-03-02 23:40:11 +01:00 |
|
aspangaro
|
0136a1742e
|
Spaces !!!
|
2016-02-27 16:21:59 +01:00 |
|
Laurent Destailleur
|
3a5846ea7f
|
Fix bad link to bank account
|
2016-02-07 14:45:49 +01:00 |
|
Laurent Destailleur
|
47e2e33fb7
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
|
2016-02-03 03:27:17 +01:00 |
|
Florian HENRY
|
eb7b71e3ab
|
Fix accountancy
|
2016-02-02 11:10:38 +01:00 |
|
Florian HENRY
|
2887eb8c70
|
fix accountancy
|
2016-02-02 11:02:58 +01:00 |
|
Florian HENRY
|
22ce2872ac
|
Fix journal
|
2016-02-02 11:01:15 +01:00 |
|
Florian HENRY
|
564594c3d7
|
Fix accountancy
|
2016-02-02 10:58:12 +01:00 |
|
Florian HENRY
|
fb5aba6de2
|
Accountancy
|
2016-02-01 15:07:12 +01:00 |
|
Florian HENRY
|
65162ae8e9
|
Accountancy modules
|
2016-02-01 14:59:13 +01:00 |
|
Florian HENRY
|
165b553a79
|
Format code
|
2016-02-01 14:50:25 +01:00 |
|
Laurent Destailleur
|
e3a4124a58
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/fr_FR/bills.lang
|
2016-01-30 16:13:06 +01:00 |
|
Laurent Destailleur
|
c6a6889d79
|
Merge pull request #4389 from aspangaro/3.9-p6
Fix: Some problems presentation on accountancy module
|
2016-01-30 13:04:22 +01:00 |
|
bobby
|
19bec6b0b3
|
Manual merge from 3.8 backported
|
2016-01-14 18:24:02 +01:00 |
|
aspangaro
|
a88773cb81
|
Fix: Some problems presentation on accountancy module
|
2016-01-10 15:44:14 +01:00 |
|
bobby
|
46532ccb55
|
FIX/NEW : Accountancy
|
2015-12-28 11:08:14 +01:00 |
|
Florian HENRY
|
8006baf592
|
ry
|
2015-12-21 13:09:22 +01:00 |
|
Laurent Destailleur
|
1a58624775
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-11 17:05:38 +01:00 |
|
philippe grand
|
9b0dd8159e
|
[Qual] Close database handler should be after Footer
|
2015-12-11 12:29:19 +01:00 |
|
Florian HENRY
|
96a95d6ae1
|
Debug accountancy on 3.9
|
2015-12-09 12:55:08 +01:00 |
|
aspangaro
|
0899e7392b
|
Fix: typo on finance journal
|
2015-11-22 22:11:22 +01:00 |
|
philippe grand
|
3767ab437e
|
[Qual] Uniformize code
|
2015-10-23 12:58:30 +02:00 |
|
aspangaro
|
f8ade01f0e
|
New : Add payment donation in accountancy expert
|
2015-10-07 21:48:46 +02:00 |
|
Laurent Destailleur
|
94723a9b83
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
|
2015-09-12 15:23:02 +02:00 |
|
Laurent Destailleur
|
7fd01d4aa3
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/paiement/cheque/class/remisecheque.class.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/list.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
|
2015-09-09 12:45:22 +02:00 |
|
aspangaro
|
671018c5cc
|
New Accountancy Uniformize code & rename a constant
|
2015-09-06 21:53:28 +02:00 |
|
aspangaro
|
a4a72d64c0
|
New: Accountancy Add message when general ledger is witten
|
2015-09-06 06:43:40 +02:00 |
|
aspangaro
|
b268ccf064
|
Fix #3455 In advanced accounting module, button transfer to general ledger don't work
|
2015-09-06 04:52:03 +02:00 |
|
Laurent Destailleur
|
ce2e5e7862
|
Little debug of accounting module
|
2015-09-03 11:54:03 +02:00 |
|
aspangaro
|
59e88590e0
|
Move my address email to new one
|
2015-07-15 20:30:33 +02:00 |
|
aspangaro
|
fc3995c0be
|
Accountancy: Bank journal - Show user on salary payment & user new account to pay vat
|
2015-07-04 16:39:52 +02:00 |
|
aspangaro
|
47045e0746
|
Accountancy: Review presentation
|
2015-05-28 21:34:35 +02:00 |
|
Laurent Destailleur
|
daabc113a5
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
|
2015-02-26 13:36:07 +01:00 |
|
aspangaro
|
4ba095cb5c
|
FIXED: Bankjournal is generated from id_account now
|
2015-02-22 15:04:18 +01:00 |
|
Laurent Destailleur
|
e3713c8b6d
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
|
2015-02-19 00:01:26 +01:00 |
|
Marcos García de La Fuente
|
0d150b1d32
|
Removed unused code, misc corrections and corrected PHPDoc problems.
|
2015-02-10 10:25:59 +01:00 |
|
Laurent Destailleur
|
011d39105d
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
|
2015-02-07 03:28:36 +01:00 |
|
aspangaro
|
14a078c9a7
|
FIXED Accountancy clean code
|
2015-02-03 06:39:44 +01:00 |
|
Laurent Destailleur
|
4fdc287717
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
|
2015-01-30 15:53:06 +01:00 |
|
aspangaro
|
94a9d0159d
|
Align module with 3.7 & contrary
|
2015-01-25 15:24:16 +01:00 |
|
Laurent Destailleur
|
007f18bcf7
|
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
|
2015-01-17 15:11:12 +01:00 |
|
aspangaro
|
4951feeb8f
|
Correct rights & presentation
|
2014-11-01 07:59:52 +01:00 |
|
Laurent Destailleur
|
97eec37f1c
|
Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
|
2014-10-04 17:20:17 +02:00 |
|
Laurent Destailleur
|
cb302c16e7
|
Bad place of code
|
2014-09-29 16:22:00 +02:00 |
|
aspangaro
|
e147259e95
|
Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6
|
2014-09-21 20:30:55 +02:00 |
|
Raphaël Doursenaud
|
e87b1d68b6
|
FIX: Replaced deprecated property
|
2014-09-19 03:07:53 +02:00 |
|
Raphaël Doursenaud
|
eea9a76589
|
FIX: Variable might not be traversable
|
2014-09-19 03:07:52 +02:00 |
|
Raphaël Doursenaud
|
9a141215bb
|
FIX: Moved code to where the variable is defined
|
2014-09-19 03:05:20 +02:00 |
|
aspangaro
|
d4bcea0799
|
Correct bank journal
|
2014-09-15 20:30:03 +02:00 |
|
aspangaro
|
f9dc25cf3f
|
Patch Accounting Expert Module
|
2014-09-06 09:50:42 +02:00 |
|
aspangaro
|
de63388d33
|
Directory of file
|
2014-09-03 22:09:01 +02:00 |
|
aspangaro
|
e4f51d8f7a
|
Merge branch 'Upstream/develop'
|
2014-09-02 20:47:27 +02:00 |
|
Laurent Destailleur
|
df70450073
|
Fix: Doxygen
|
2014-09-02 20:00:10 +02:00 |
|
aspangaro
|
cb189ed83e
|
Add salary payment
|
2014-09-02 05:10:25 +02:00 |
|
aspangaro
|
def53d92bd
|
Correct error menu
|
2014-08-31 14:10:48 +02:00 |
|
aspangaro
|
f9076162b6
|
Add dynamic link into accountancy menu to bank journal
|
2014-08-31 08:56:22 +02:00 |
|
aspangaro
|
d6b2cb0b31
|
Correct travis
|
2014-08-30 06:05:02 +02:00 |
|
aspangaro
|
add4528e6c
|
Update perms
|
2014-08-28 06:48:22 +02:00 |
|
aspangaro
|
d03763f6c3
|
Update Accounting Expert integration
|
2014-08-28 06:30:01 +02:00 |
|
aspangaro
|
71265558d2
|
Integrate module Accounting Expert
|
2014-08-27 07:03:42 +02:00 |
|