Commit Graph

719 Commits

Author SHA1 Message Date
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
f18f970b08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 13:52:36 +02:00
Laurent Destailleur
cfbe2bf995 Merge pull request #18422 from aspangaro/14p13
FIX Accountancy - SQL error on select journal on journal
2021-08-17 02:41:56 +02:00
Laurent Destailleur
352b413a17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 02:12:22 +02:00
Laurent Destailleur
8927eeff50 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-17 02:11:36 +02:00
Laurent Destailleur
15020c99e7 Update accountancyexport.class.php 2021-08-17 01:08:18 +02:00
Laurent Destailleur
9b43327af0 Update accountancyexport.class.php 2021-08-17 01:06:26 +02:00
Laurent Destailleur
091166baa7 Update accountancyexport.class.php 2021-08-17 01:03:07 +02:00
Laurent Destailleur
7784c4fcc9 Update bookkeeping.class.php 2021-08-17 00:32:33 +02:00
Alexandre SPANGARO
4b615e541b FIX Accountancy - SQL error when insert a manuel transaction 2021-08-16 21:29:28 +02:00
Alexandre SPANGARO
1bfc0004b1 Better fix 2021-08-16 08:12:24 +02:00
Alexandre SPANGARO
ba12071ea3 FIX Accountancy - SQL error on select journal on journal 2021-08-16 07:57:40 +02:00
Alexandre SPANGARO
b8da594c31 Better fix 2021-08-16 05:47:25 +02:00
Alexandre SPANGARO
abc94a397a FIX #18389 Accountancy - Bug on LDcompta10 export for supplier invoice 2021-08-15 11:12:14 +02:00
Laurent Destailleur
ce5acda635 Fix phpcs 2021-08-03 15:03:41 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Alexandre SPANGARO
cd63ede35a Correctif date 2021-07-28 16:46:57 +02:00
Alexandre SPANGARO
7acebd28ca Add information 2021-07-28 14:08:53 +02:00
Alexandre SPANGARO
712f0b897d FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT) 2021-07-28 12:02:45 +02:00
Alexandre SPANGARO
183d413b45 FIX: Accountancy - Rules to delete & modify transaction not applied in ledger & subledger 2021-07-26 04:42:35 +02:00
Laurent Destailleur
fe20217bfe Update accountancyexport.class.php 2021-07-08 16:36:53 +02:00
stickler-ci
335c3029dc Fixing style errors. 2021-07-07 15:55:07 +00:00
EpixFr
edfd40719b Gestion des longueurs des comptes variables 2021-07-07 17:53:10 +02:00
EpixFr
45d36d9134 Ajout export compta iSuite Expert 2021-07-07 17:32:48 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Alexandre SPANGARO
53d0909a7c Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-12 14:20:00 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
2021-06-04 11:20:38 +02:00
Laurent Destailleur
6f1c49abcc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
	htdocs/user/class/usergroup.class.php
2021-06-04 11:04:18 +02:00
Laurent Destailleur
9b0605f979 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-04 09:41:35 +02:00
Maxime Kohlhaas
b3a6bcd34f Fix Winfic accountancy export for due date 2021-05-26 15:01:31 +02:00
Maxime Kohlhaas
1d5b8cbb19 Fix Quadra accountancy export for due date 2021-05-26 14:59:28 +02:00
Laurent Destailleur
03e8f2aee1 Fix for performance troubles 2021-05-03 18:49:37 +02:00
Laurent Destailleur
28b1d83ae9 Make some performance enhancements 2021-05-03 18:29:21 +02:00
Laurent Destailleur
42c2fb5736 Fix sql error on new filter 2021-05-03 13:47:26 +02:00
Alexandre SPANGARO
cd6bcd14f3 NEW Accountancy - Possibility to select journals in balance 2021-05-02 02:35:16 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
2021-04-27 02:07:48 +02:00
Laurent Destailleur
42938ffe31 FIX #yogosha5879 2021-04-24 21:15:09 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
1729497d62 FIX Accountancy - Quadra export - wrong data on credit 2021-04-20 13:56:58 +02:00
Alexandre SPANGARO
305b338a11 Update notified 2021-04-19 06:03:03 +02:00