Commit Graph

110296 Commits

Author SHA1 Message Date
Faustin
0f77d945a9 Conflict management 2022-06-15 15:22:54 +02:00
Faustin
9f4690eedd Conflict management 2022-06-15 15:22:54 +02:00
NASDAMI Quatadah
7f73464ecc Increasing the scope of the variable 2022-06-15 15:22:54 +02:00
Faustin
2392d1c59c replaced projet from old version by project 2022-06-15 15:22:54 +02:00
Faustin
e00e7e1faa replaced projet from old version by project 2022-06-15 15:22:54 +02:00
NASDAMI Quatadah
5b93c103a3 evaluate function checks if is empty + unit test 2022-06-15 15:18:37 +02:00
Laurent Destailleur
17133cabb0 Merge pull request #21284 from badre-agtaib/pre-commit
Ignore external libraries in precommit
2022-06-15 15:06:18 +02:00
bagtaib
7157df4fad ingnore external libraries in precommit 2022-06-15 14:53:51 +02:00
Francis Appels
8da6d4b637 Fix modulebuilder for object sharing. 2022-06-15 14:53:44 +02:00
NASDAMI Quatadah
c2213d6b1d set -e to set +e 2022-06-15 14:51:03 +02:00
Laurent Destailleur
8315d9e10d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-15 14:21:02 +02:00
Laurent Destailleur
63dd080dea Fix phpcs 2022-06-15 14:19:26 +02:00
Faustin
aa2b96fb48 Added deprecated attribute datee in class Task 2022-06-15 14:10:21 +02:00
stickler-ci
73977f8a84 Fixing style errors. 2022-06-15 12:09:40 +00:00
Faustin
e5ec06ab53 Added deprecated attribute datee in class Task 2022-06-15 14:09:00 +02:00
NASDAMI Quatadah
b713592c25 adding abstract function to Stats class 2022-06-15 14:00:24 +02:00
Faustin
eb7b0824ee Commented dead code 2022-06-15 14:00:00 +02:00
fboitel
36f890bd33 Merge branch 'Dolibarr:develop' into fboitel-dev-scrutinizer-008 2022-06-15 13:59:41 +02:00
stickler-ci
fddb6a08b4 Fixing style errors. 2022-06-15 09:19:14 +00:00
Faustin
7d02cdeb62 Declared attribute salary in class Salary 2022-06-15 11:18:27 +02:00
NASDAMI Quatadah
20ce5c5323 declaring a used abstract function in the Stats class 2022-06-15 11:10:31 +02:00
Laurent Destailleur
28234c6f44 Merge pull request #21276 from badre-agtaib/scru4
FIX bug :The properties product_tosell & product_tobuy do not exist on OrderLine
2022-06-15 11:05:34 +02:00
Laurent Destailleur
2ed0547262 Merge pull request #21234 from fboitel/fboitel-dev-scrutinizer-001
BUG FIX  'The property socid does not seem to exist on Recruitm…
2022-06-15 10:40:00 +02:00
Supermanu
f39c8e46d8 Fix timezone issue in event list 2022-06-15 10:26:44 +02:00
Alexandre SPANGARO
86a54d5f22 Merge remote-tracking branch 'upstream/develop' into 16a12_assets_sql 2022-06-15 04:53:55 +02:00
Alexandre SPANGARO
a8e4aec5c2 Same modification on supplier invoice 2022-06-15 04:46:58 +02:00
Alexandre SPANGARO
863a18b839 Merge remote-tracking branch 'upstream/develop' into 17p2 2022-06-15 04:16:40 +02:00
Laurent Destailleur
fd0e3861b0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-15 03:34:08 +02:00
Laurent Destailleur
25ecbe3401 Debug v16 2022-06-15 03:26:27 +02:00
bagtaib
22152dd254 declaring the propreties product_tosell & product_tobuy 2022-06-15 00:50:34 +02:00
Laurent Destailleur
cef7f6b96b Merge pull request #21279 from hregis/fix_missing_entity
FIX missing field entity
2022-06-14 21:14:56 +02:00
Laurent Destailleur
5d9e09be8e Merge pull request #21278 from bb2a/FIX---php-V8-Extrafields-checkbox-empty
FIX - php V8 Extrafields checkbox empty
2022-06-14 21:14:20 +02:00
Laurent Destailleur
7971683b60 Merge pull request #21277 from badre-agtaib/scru5
FIX BUG: timestamp type is int not tms
2022-06-14 21:10:36 +02:00
Laurent Destailleur
2370ff4dfc Clean code 2022-06-14 21:00:05 +02:00
Laurent Destailleur
b67c4b39ca Typo 2022-06-14 20:57:58 +02:00
Laurent Destailleur
1aa2e7adc7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-14 20:57:34 +02:00
Laurent Destailleur
c39c3b1cb1 Merge pull request #21271 from fboitel/fboitel-dev-scrutinizer-012
BUG FIX typo on DiscountAbsolute attribute: ref_invoice_supplier_source
2022-06-14 20:57:26 +02:00
Laurent Destailleur
55383bb032 Merge pull request #21267 from fboitel/fboitel-dev-scrutinizer-011
BUG FIX pays_code has become country_code on commonObject
2022-06-14 20:55:21 +02:00
Laurent Destailleur
4da19f6e0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-14 20:54:59 +02:00
Laurent Destailleur
0ab03ce787 Merge pull request #21266 from fboitel/fboitel-dev-scrutinizer-010
BUG FIX Class PaiementFourn does not contain oper property anymore
2022-06-14 20:54:46 +02:00
Laurent Destailleur
5bf304bf5c Merge pull request #21258 from Quatadah/dolicloud-qnasdami-scrutinizer-007
BUG FIX : variable name does not exist
2022-06-14 20:42:55 +02:00
Laurent Destailleur
6f0c9bdbf9 Doc 2022-06-14 20:42:44 +02:00
Laurent Destailleur
6bd89922b9 Merge pull request #21257 from atm-lena/develop_FIX_nobackoption_actionaddupdatedelete
FIX : $noback option
2022-06-14 19:57:03 +02:00
Laurent Destailleur
f8ac203a4d Doc 2022-06-14 19:55:04 +02:00
Laurent Destailleur
1fc64e66a7 Merge pull request #21256 from bb2a/FIX---Badge-ng-rec-tab
FIX - Record count badge in custom modules tab
2022-06-14 19:49:28 +02:00
Laurent Destailleur
2de5a9f31b Merge pull request #21253 from badre-agtaib/scru2
fix bug: The property thirdparty_id does not exist on ActionComm
2022-06-14 19:29:32 +02:00
Laurent Destailleur
b78db8df49 Merge pull request #21252 from badre-agtaib/scru1
assetmodel doesn't have socid but user does
2022-06-14 19:18:23 +02:00
Laurent Destailleur
34d3d2695e Merge pull request #21250 from Quatadah/dolicloud-qnasdami-scrutinizer-005
BUG FIX : increasing the scope of the variable
2022-06-14 19:01:47 +02:00
Laurent Destailleur
4eebfc5874 Merge pull request #21248 from fboitel/fboitel-dev-scrutinizer-006
BUG FIX Attribute socid doesnt exist on class Salary, so we use -1 on form
2022-06-14 18:45:43 +02:00
Laurent Destailleur
ac3d3528ff Doc 2022-06-14 18:19:02 +02:00