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
|
cf6be40922
|
New: #3292 Make sure each and every page displays a title
|
2016-01-11 22:03:26 +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
|
393d528be7
|
Merge remote-tracking branch 'Upstream/develop' into develop-64
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
|
2015-09-08 21:17:54 +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 |
|
aspangaro
|
ef7df3f261
|
New: Accountancy rename llx_accountingaccount in llx_accounting_account
Fix: language key
|
2015-09-05 08:03:06 +02:00 |
|
Laurent Destailleur
|
ce2e5e7862
|
Little debug of accounting module
|
2015-09-03 11:54:03 +02:00 |
|
Florian HENRY
|
a916b75ad8
|
FIX : Better const usage in accountancy module
|
2015-08-13 11:32:31 +02:00 |
|
Florian HENRY
|
2775250ce4
|
Fix TYPE_SITUATION on sell journals
|
2015-08-13 11:23:27 +02:00 |
|
Florian HENRY
|
6806e2b36b
|
FIX : Accountancy expert module filter on column must not launch ventil
ventil
|
2015-08-13 10:27:35 +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
|
452733263d
|
Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT
|
2015-06-25 06:37:26 +02:00 |
|
aspangaro
|
d959c552f2
|
Fix: Accountancy - SQL error
|
2015-06-19 06:01:42 +02:00 |
|
aspangaro
|
47045e0746
|
Accountancy: Review presentation
|
2015-05-28 21:34:35 +02:00 |
|
jfefe
|
f5db4d5bb7
|
Fix: missing getEntity function
|
2015-04-19 03:05:37 +02:00 |
|
Laurent Destailleur
|
56a14da5d4
|
FIXME that are not bug are replaced with TODO
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
|
2015-04-12 04:01:28 +02:00 |
|
BENKE Charles
|
e7ed8ce95b
|
Update purchasesjournal.php
|
2015-03-11 10:23:33 +01:00 |
|
BENKE Charles
|
9fc83ca011
|
Update sellsjournal.php
|
2015-03-11 10:23:13 +01:00 |
|
BENKE Charles
|
f91127c92a
|
Update purchasesjournal.php
|
2015-03-10 21:48:47 +01:00 |
|
BENKE Charles
|
bf86693dcb
|
Update sellsjournal.php
|
2015-03-10 21:47:39 +01: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 |
|
aspangaro
|
cda6e7adf9
|
Delete cash journal
|
2015-02-22 14:20:42 +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
|
1664b89cef
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-01-17 19:26:19 +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 |
|