Commit Graph

848 Commits

Author SHA1 Message Date
Laurent Destailleur
3761c920eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/core/modules/modPartnership.class.php
	htdocs/modulebuilder/template/core/modules/modMyModule.class.php
2022-07-22 17:43:35 +02:00
Laurent Destailleur
d9f7a3efd1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/product/inventory/inventory.php
2022-07-22 17:38:24 +02:00
Alexandre SPANGARO
be491cc6cf FIX Accountancy - Model account list - Problem of CSRF 2022-07-15 16:22:22 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Alexandre SPANGARO
bda01fc2d1 Merge remote-tracking branch 'upstream/develop' into 17p3 2022-07-03 07:33:43 +02:00
Laurent Destailleur
67ade177c7 Fix error message 2022-06-28 20:11:18 +02:00
Laurent Destailleur
0091c31b99 Debug v16 2022-06-28 11:07:06 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
Frédéric France
9f32100fef Merge remote-tracking branch 'upstream/develop' into useismodenabled 2022-06-21 20:27:57 +02:00
Frédéric France
1f7fc7a2ae getDolGlobalString 2022-06-21 20:25:25 +02:00
Alexandre SPANGARO
e6a9d48e71 Fix code error 2022-06-19 06:41:05 +02:00
Alexandre SPANGARO
4768502773 Merge remote-tracking branch 'upstream/develop' into 16b2 2022-06-19 06:35:49 +02:00
Laurent Destailleur
18cf0c7a18 Debug v16 2022-06-17 18:57:09 +02:00
Alexandre SPANGARO
2865b72b65 Fix PHP 8.1.7 2022-06-12 21:56:15 +02:00
Alexandre SPANGARO
ae55ff6a43 Fix PHP 8.1.7 2022-06-12 21:50:09 +02:00
Alexandre SPANGARO
7e3a6116bf Remove patch - Error 2022-06-12 21:30:12 +02:00
Alexandre SPANGARO
6309dbe99b Fix PHP 8.1.7 2022-06-12 07:38:49 +02:00
Alexandre SPANGARO
02f21fae78 Fix PHP 8.1.7 - $newcardbutton not defined 2022-06-12 07:33:28 +02:00
Alexandre SPANGARO
590cb20b41 Fix PHP 8.1.7 - $search_country_id not defined 2022-06-12 07:30:09 +02:00
Alexandre SPANGARO
7967ab402a Fix PHP 8.1.7 2022-06-12 07:19:08 +02:00
Alexandre SPANGARO
4fecd01ddd NEW Accountancy - Manage customer retained warranty 2022-06-10 04:47:15 +02:00
BENKE Charlene
d14faf86a0 php V8 warning fix 2022-05-27 16:14:36 +02:00
priojk
03d60ec05e NEW #20905 add hooks for accountancy export 2022-05-20 14:54:26 +02:00
Laurent Destailleur
508cbee1a5 Fix php8 2022-05-15 22:29:19 +02:00
Laurent Destailleur
1b82340e1b Merge pull request #20785 from aspangaro/16a29-Fixcustomerdeposit
FIX Accountancy - Add an option to disable use of sub-account on deposit line
2022-05-10 11:37:24 +02:00
Laurent Destailleur
000c6f69bd Merge pull request #20801 from aspangaro/16a31
Look & feel v16
2022-05-08 18:56:23 +02:00
Alexandre SPANGARO
710f189b98 FIX SQL Error with full_group_by option enabled 2022-05-08 06:34:47 +02:00
Alexandre SPANGARO
39716dce28 Look & feel v16 2022-05-07 06:43:23 +02:00
stickler-ci
fb97f7db29 Fixing style errors. 2022-05-05 14:59:49 +00:00
Alexandre SPANGARO
7bb5ac4095 FIX Accountancy - Add an option to disable use of sub-account on deposit line 2022-05-05 16:48:01 +02:00
Alexandre SPANGARO
5dce613118 NEW Accountancy - Product admin - Add product categories 2022-04-28 05:34:02 +02:00
Laurent Destailleur
d0ed15ce5c Typo 2022-04-03 17:12:54 +02:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
77e2969411 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-22 22:27:32 +01:00
Laurent Destailleur
c7c0c75429 Clean code 2022-02-22 22:27:09 +01:00
Laurent Destailleur
d6786459b4 FIX #yogosha9054 2022-02-22 22:03:34 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
d46ef9c42a css 2021-12-18 23:51:14 +01:00
Laurent Destailleur
80a7b83956 Debug status of accounting account 2021-12-18 23:02:31 +01:00
Laurent Destailleur
fde9a6667f Fix colspan 2021-12-18 15:46:08 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Gauthier PC portable 024
7d1b409e59 NEW : accountancy massaction preselect account (productaccount page) 2021-11-15 14:35:55 +01:00
Laurent Destailleur
5b5f41606a NEW PDF generation support format PDF/A-1b and PDF/A-3b 2021-11-15 09:02:01 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Alexandre SPANGARO
da52742421 FIX Accountancy - Product admin - SQL error when we affect accounting account with product_perentity activated 2021-10-29 05:47:29 +02:00
Laurent Destailleur
e12d9ee979 Merge pull request #19156 from frederic34/defaultvaluegetglobal
can specify default in getDolGlobalString and getDolGlobalInt
2021-10-23 22:42:40 +02:00
Laurent Destailleur
dc1e57e267 Merge pull request #19155 from frederic34/patch-1
fix warnings
2021-10-23 22:41:05 +02:00