2
0
forked from Wavyzz/dolibarr
Commit Graph

150 Commits

Author SHA1 Message Date
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
2021-03-10 15:35:09 +01:00
Laurent Destailleur
a0c7c6bad9 Fix selection of accounting account 2021-03-10 10:45:01 +01:00
Frédéric FRANCE
337689d5d2 code syntax 2021-02-22 21:36:42 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Florian HENRY
0fee06139a Merge github.com:Dolibarr/dolibarr into develop 2020-10-10 10:23:17 +02:00
Florian HENRY
705b029608 fix return on filtered page when modify accountancy code 2020-10-10 10:22:58 +02:00
Laurent Destailleur
967e7997e6 Trans and clean code 2020-10-09 19:34:57 +02:00
Laurent Destailleur
4188a21c6b css 2020-10-09 17:59:22 +02:00
Laurent Destailleur
a3e3e0e45c Navigation in chart of account 2020-10-09 17:55:26 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Laurent Destailleur
31a68cfc18 FIX #yogosha4483 2020-09-17 14:30:10 +02:00
Alexandre SPANGARO
a4c581b34d Modify link on chart of accounts 2020-09-08 04:44:04 +02:00
Frédéric FRANCE
5aa84c64d0 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
stickler-ci
74662d3ecd Fixing style errors. 2020-05-23 08:18:41 +00:00
Philippe Grand
e7c2bd830a fix merge issue 2020-05-23 10:17:48 +02:00
Philippe Grand
b137775046 fix merge issue 2020-05-23 10:12:14 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Philippe GRAND
23282acfbc update 2020-05-21 11:20:01 +02:00
Frédéric FRANCE
43dcd9beb5 add new rule 2020-05-21 00:02:33 +02:00
Laurent Destailleur
ebbd4413f5 Fix scrutinizer error 2020-05-13 00:47:27 +02:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Alexandre SPANGARO
191374cc8f Work on reconcilation of accouting account 2020-03-16 08:07:05 +01:00
Alexandre SPANGARO
af5444806d Work on reconcilation of accouting account 2020-03-16 06:41:14 +01:00
Alexandre SPANGARO
bc717bc6ae Work on reconciliation of accouting account 2020-03-15 07:49:24 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
f2dba4f621 Merge pull request #13227 from aspangaro/12.0_a16
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +01:00
Alexandre SPANGARO
86d9622360 NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality 2020-02-27 10:44:04 +01:00
Laurent Destailleur
1583bed0e4 FIX #13146 #13198 2020-02-26 15:41:46 +01:00
Laurent Destailleur
d172a95dfe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-25 14:37:04 +01:00
Laurent Destailleur
4b4d1bcce2 Fix disable accountancy chart that is deprecated. 2020-02-24 03:05:58 +01:00
Philippe GRAND
95228ae01c fix merging 2020-02-22 12:21:17 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Philippe GRAND
c736d9ae25 fix merging 2020-01-27 09:48:38 +01:00
Laurent Destailleur
d329c4ad38 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 22:39:30 +01:00
Laurent Destailleur
69fae5a679 Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:38:03 +01:00
Laurent Destailleur
c7617279de Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 22:27:00 +01:00
Laurent Destailleur
80648db7fc Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:26:37 +01:00
Laurent Destailleur
ff9a2608d8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
2020-01-21 22:22:16 +01:00
Laurent Destailleur
8f1737952d Fix search on accounting account when option to padd 0 is on. 2020-01-21 22:20:32 +01:00
Laurent Destailleur
a36b0ea4f5 Fix filter on parent account in list of accounting accounts 2020-01-21 21:36:40 +01:00
Alexandre SPANGARO
c3518426bd NEW Accountancy - Add possibility to manage an short alternative label - use to simplify 2020-01-03 22:05:49 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Philippe GRAND
4acc107191 fix bad setEventMessages 2019-11-05 10:01:21 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
edfedbb818 FIX Load chart of account only if we click or select button "Load chart" 2019-10-06 21:13:55 +02:00
Laurent Destailleur
80c1a92872 FIX Load chart of account only if we click or select button "Load chart" 2019-10-06 21:11:29 +02:00