Alexandre SPANGARO
|
74ba7e68da
|
Mix two systems for create and edit account from balance
|
2021-01-07 06:27:36 +01:00 |
|
Alexandre SPANGARO
|
4077565de9
|
Merge branch '13.0' into 13b5
|
2021-01-07 05:27:43 +01:00 |
|
Laurent Destailleur
|
ce035eb4ce
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/bom/bom_card.php
|
2021-01-06 21:33:59 +01:00 |
|
Laurent Destailleur
|
1aa7e4adeb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-01-06 21:32:46 +01:00 |
|
atm-lena
|
4b9bb824d0
|
FIX balance starting and ending fiscal month #14197
|
2021-01-06 11:16:51 +01:00 |
|
Alexandre SPANGARO
|
691e8580cd
|
Add date_export on new ledger & subledger to show edit or delete link when is not export yet
|
2021-01-03 05:44:07 +01:00 |
|
Alexandre SPANGARO
|
1d5089e95e
|
Repare link to create unknown account
|
2021-01-03 04:42:21 +01:00 |
|
Alexandre SPANGARO
|
1ebb018903
|
Add language file
|
2021-01-03 04:11:25 +01:00 |
|
Alexandre SPANGARO
|
2727fd70b7
|
FIX: Accountancy - Debug experimental function to validate movements
|
2021-01-02 14:00:24 +01:00 |
|
Laurent Destailleur
|
e17d4b8220
|
Fix total when no data
|
2020-12-30 23:51:55 +01:00 |
|
Laurent Destailleur
|
1eb8833356
|
Fix total when no data
|
2020-12-30 23:39:51 +01:00 |
|
Laurent Destailleur
|
057ed201a7
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
|
2020-12-30 12:08:12 +01:00 |
|
Alexandre SPANGARO
|
26791714ce
|
Fix : Introduce constant ACCOUNTANCY_SHOW_OPENING_BALANCE
|
2020-12-28 03:07:33 +01:00 |
|
Laurent Destailleur
|
81ab33ff12
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/product/list.php
|
2020-12-27 19:40:03 +01:00 |
|
Florian HENRY
|
77c335c5f3
|
fix colspan balance accountanty
|
2020-12-23 09:19:56 +01:00 |
|
Alexandre SPANGARO
|
f273273129
|
FIX: Accountancy - Retire entire opening balance feature
|
2020-12-22 06:57:55 +01:00 |
|
Laurent Destailleur
|
1d6e2a01a6
|
Merge pull request #15762 from aspangaro/13b1
FIX: Accountancy - Quadra export format - Manage negative amount
|
2020-12-16 15:24:14 +01:00 |
|
Laurent Destailleur
|
ef70bdc307
|
Merge pull request #15764 from aspangaro/13b3
FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger + CSS
|
2020-12-16 15:23:14 +01:00 |
|
Alexandre SPANGARO
|
b01a9d6cc3
|
FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger
|
2020-12-16 05:32:36 +01:00 |
|
Alexandre SPANGARO
|
ca40d5e52a
|
NEW: Accountancy - Introduce FEC "2" Format to resolve conflict with some software
|
2020-12-16 05:16:08 +01:00 |
|
Alexandre SPANGARO
|
a03de433be
|
FIX: Accountancy - Quadra export format - Manage negative amount
|
2020-12-16 05:03:37 +01:00 |
|
Alexandre SPANGARO
|
ca6b8176e9
|
Merge remote-tracking branch 'upstream/develop' into 13b1
|
2020-12-16 04:32:26 +01:00 |
|
Laurent Destailleur
|
cee63335a2
|
FIX #15754 Mor complete PR
|
2020-12-15 13:38:21 +01:00 |
|
Alexandre SPANGARO
|
5ec7b01fb4
|
FIX: Link to subaccount ledger
|
2020-12-15 09:34:46 +01:00 |
|
Laurent Destailleur
|
acb73966f7
|
Clean code. Removed phpexcel library.
|
2020-12-13 16:27:44 +01:00 |
|
Laurent Destailleur
|
4f79fdb4ab
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-12-13 15:07:25 +01:00 |
|
Laurent Destailleur
|
7886a6e838
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-12-13 15:06:54 +01:00 |
|
Alexandre SPANGARO
|
35b3d4f40a
|
FIX: Export FEC - Force Carriage Return Line Feed
|
2020-12-13 14:11:04 +01:00 |
|
Laurent Destailleur
|
be249538ee
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
|
2020-12-08 18:17:02 +01:00 |
|
Laurent Destailleur
|
34e7943d09
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/fourn/class/paiementfourn.class.php
|
2020-12-08 18:14:56 +01:00 |
|
Laurent Destailleur
|
4e72543fde
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/fourn/class/paiementfourn.class.php
htdocs/fourn/paiement/card.php
|
2020-12-08 18:11:39 +01:00 |
|
Alexandre SPANGARO
|
7c77a0d84b
|
FIX : Export FEC - Remove line at zero
|
2020-12-07 23:53:09 +01:00 |
|
Laurent Destailleur
|
995afd59f2
|
Merge pull request #15672 from frederic34/patch-8
fix trans replace html
|
2020-12-07 22:35:01 +01:00 |
|
Laurent Destailleur
|
2c094fe847
|
Merge pull request #15673 from frederic34/compta_stats_index
fix trans removing html
|
2020-12-07 22:32:12 +01:00 |
|
Laurent Destailleur
|
efc3bad7c6
|
Merge pull request #15678 from frederic34/fk_element
doxygen
|
2020-12-07 22:31:08 +01:00 |
|
Frédéric FRANCE
|
eac2a42b1c
|
remove warning
|
2020-12-06 16:44:21 +01:00 |
|
Frédéric FRANCE
|
4e18f46f28
|
doxygen
|
2020-12-05 23:53:55 +01:00 |
|
stickler-ci
|
3fc4fb79e0
|
Fixing style errors.
|
2020-12-05 17:20:28 +00:00 |
|
Frédéric FRANCE
|
90a5c90a5a
|
fix trans removeing html
|
2020-12-05 18:19:33 +01:00 |
|
Frédéric FRANCE
|
18319f4fd3
|
fix trans replace html
|
2020-12-05 18:05:09 +01:00 |
|
Laurent Destailleur
|
333449ca50
|
Fix security trans
|
2020-12-05 13:40:03 +01:00 |
|
Scrutinizer Auto-Fixer
|
6df4954b20
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-12-01 01:41:19 +00:00 |
|
Laurent Destailleur
|
00ad6df395
|
Fight against $_POST
|
2020-11-30 14:47:07 +01:00 |
|
Laurent Destailleur
|
e7775d2f79
|
Fix scrutinizer errors
|
2020-11-30 12:54:47 +01:00 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01:00 |
|
Laurent Destailleur
|
52cc08f5da
|
FIX option "Show subtotal" on the balance report
|
2020-11-26 16:12:55 +01:00 |
|
Laurent Destailleur
|
e272130a6a
|
Fix phpcs
|
2020-11-26 08:40:08 +01:00 |
|
Laurent Destailleur
|
f91226a9f0
|
Merge pull request #15537 from maboelfotoh/maboelfotoh-fix-pr-13067
FIX #13067 including opening balance in calculation of displayed balance
|
2020-11-25 17:54:09 +01:00 |
|
Muhammad Aboelfotoh
|
551256b779
|
FIX #13067 including opening balance in calculation of displayed balance
|
2020-11-25 15:11:09 +00:00 |
|