lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,271 Commits 43 Branches 150 Tags 886 MiB
d0bbd33bb2
Commit Graph

90319 Commits

Author SHA1 Message Date
Laurent Destailleur
14ca7db5d7 Typo in log 2021-09-01 16:17:31 +02:00
Vincent Dieltiens
59e917cd5f regroup BILL_SUPPLIER_VALIDATE actions 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2021-09-01 16:14:44 +02:00
Vincent Dieltiens
65ccbb6249 Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition 2021-09-01 16:06:36 +02:00
Laurent Destailleur
46a38506a5
Merge pull request #18562 from vincentjdc/bill-supplier-validate 
Bill supplier validate
 2021-09-01 16:04:50 +02:00
Laurent Destailleur
3728cca2f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 15:23:53 +02:00
Florian HENRY
bb6dda087c Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_eventorg 2021-09-01 15:23:04 +02:00
Florian HENRY
bae73b9a52 disabled module on inactive 2021-09-01 15:16:11 +02:00
Laurent Destailleur
741bc5da20 Fix label 2021-09-01 15:13:31 +02:00
Laurent Destailleur
375557e092 FIX Menu List of project was not visible. 2021-09-01 15:10:02 +02:00
Laurent Destailleur
239599d1b1
Merge pull request #18564 from OPEN-DSI/new-agenda-ext-enable-default 
NEW can enable/disable external calendar by default
 2021-09-01 13:44:12 +02:00
Laurent Destailleur
9da82af74f
Merge pull request #18566 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2021-09-01 13:36:20 +02:00
Laurent Destailleur
fb0bd41178 Fix trans 2021-09-01 13:02:36 +02:00
Laurent Destailleur
bcd835ddbd Fix tooltips 2021-09-01 12:34:59 +02:00
Laurent Destailleur
a48473ba7a Missing trans exclude 2021-09-01 12:22:44 +02:00
Laurent Destailleur
da8dcaa0c9 Fix look and feel v14 2021-09-01 12:15:23 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00
Laurent Destailleur
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +02:00
Laurent Destailleur
f257d4372a Fix bad test 2021-08-31 20:21:20 +02:00
Scrutinizer Auto-Fixer
312ca95feb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-08-31 18:18:28 +00:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
lvessiller
163b12925a FIX stickler-ci 2021-08-31 18:37:34 +02:00
lvessiller
d64bc49d10 FIX stickler-ci 2021-08-31 18:35:56 +02:00
lvessiller
c367c1009b FIX stickler-ci 2021-08-31 18:34:26 +02:00
lvessiller
4781dca2c2 FIX stickler-ci 2021-08-31 18:30:11 +02:00
lvessiller
6c2cf4377a NEW can enable/disable external calendar by default 2021-08-31 18:14:16 +02:00
Laurent Destailleur
72131110e7 Fix protect public pages 2021-08-31 18:03:37 +02:00
Maxime Kohlhaas
d09d036f06
Fix supplier invoice pdf generation canelle 
Thirdparty wrongly fetched was causing errors on mass generation
 2021-08-31 16:10:55 +02:00
Laurent Destailleur
c7444865a1 Fix css 2021-08-31 13:16:37 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
bbf219fd7b FIX Export of website generates a package that contains a sql error 2021-08-31 13:09:52 +02:00
Vincent Dieltiens
a3f4ba11aa regroup BILL_SUPPLIER_VALIDATE actions 2021-08-31 12:47:32 +02:00
Vincent Dieltiens
19587fb88b Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition 2021-08-31 12:45:03 +02:00
Laurent Destailleur
cceba665a2 NEW Option "Add a link on the PDF to make the online payment" 2021-08-31 12:29:14 +02:00
Vincent Dieltiens
cd47bede37 FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-08-31 12:28:40 +02:00
Florian HENRY
673852c739 better line desc 2021-08-31 09:24:41 +02:00
Florian HENRY
009fa41762 add checkbox to ask detail on line desc 2021-08-31 09:10:57 +02:00
Florian HENRY
0ae4e721c4 merge 2021-08-30 23:50:33 +02:00
Florian HENRY
ff1ba623c1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_projtask_changefilterdate 2021-08-30 23:46:34 +02:00
Laurent Destailleur
b29fc5552d Fix id in link 2021-08-30 22:10:26 +02:00
Laurent Destailleur
60832c6e87 css 2021-08-30 21:48:46 +02:00
Laurent Destailleur
426894f6a6 Fix not null column 2021-08-30 21:44:09 +02:00
Laurent Destailleur
8639956b79 Fix position of information on lines of documents 2021-08-30 21:22:00 +02:00
Laurent Destailleur
3e443e9146 Fix partnership module 2021-08-30 19:47:44 +02:00
Laurent Destailleur
5549186e3a Fix link 2021-08-30 19:28:49 +02:00
Laurent Destailleur
7c9909ee12 Fix label of list of members 2021-08-30 19:21:52 +02:00
Laurent Destailleur
d9bfd72c29 Fix missing login in tooltip 2021-08-30 19:13:02 +02:00
Laurent Destailleur
d1ef4bdbd1 Fix missing login in tooltip 2021-08-30 19:10:43 +02:00
Laurent Destailleur
18e7a5efa9 Trans 2021-08-30 19:00:15 +02:00
Laurent Destailleur
3c029d0ccf Fix sort on company on member list. 2021-08-30 18:57:41 +02:00
Laurent Destailleur
b78771f8c4 Fix select empty value for thirdparties select combo 2021-08-30 18:56:52 +02:00
Laurent Destailleur
9db5f85d4e Fix responsive 2021-08-30 18:42:41 +02:00
Laurent Destailleur
9c3ba22b02 Fix label of company of a thirdparty 2021-08-30 18:38:31 +02:00
Laurent Destailleur
d2f3d134df Code comment. Better _checkFilters 2021-08-30 16:54:45 +02:00
lmarcouiller
31abb98a91 Fix : KnowledgeManagement menu permission 2021-08-30 14:38:36 +02:00
Alexandre SPANGARO
0132788266 NEW Invoice list - Use complete country select field with EEC or not 2021-08-30 13:56:31 +02:00
henrynopo
3240a3652d
Update card.php 2021-08-30 15:34:59 +08:00
henrynopo
7bf6daaca7
Update card.php 2021-08-30 15:33:26 +08:00
stickler-ci
01a44760a8 Fixing style errors. 2021-08-29 20:14:19 +00:00
lainwir3d
4381f67a64 FIX #18544 Shipment REST API: load thirdparty object into the shipment before validating. 2021-08-30 00:08:43 +04:00
lainwir3d
359dae6af8 FIX #18542 REST API: set global $user variable to DolibarrApiAccess::user. 2021-08-29 23:13:41 +04:00
Laurent Destailleur
74ad0586a9 Fix disabled 2021-08-29 20:42:14 +02:00
Laurent Destailleur
47b96e07b7 Fix init 2021-08-29 20:36:54 +02:00
Laurent Destailleur
daf32e9f14 Fix modules disabled in demo must remains disabled 2021-08-29 20:36:08 +02:00
Laurent Destailleur
581efd0847 Fix the cancel action (good practices recommended by modulebuilder). 2021-08-29 19:40:04 +02:00
Laurent Destailleur
92defbc449 Fix warning 2021-08-29 19:39:37 +02:00
Laurent Destailleur
fbdee1316a Code comment 2021-08-29 19:36:11 +02:00
stickler-ci
6417d3ddf7 Fixing style errors. 2021-08-29 14:48:25 +00:00
GurvanKervern
b242387c43 Fix undef4-2 
PHP8 warnings
 2021-08-29 22:46:39 +08:00
GurvanKervern
ebd1b49d2a Fix undef 4-1 
PHP8 warnings
 2021-08-29 22:41:22 +08:00
Gurvan Kervern
66d1e5c74d
Update eldy.lib.php 2021-08-29 18:15:09 +08:00
henrynopo
c9db6bfdf6
Update remx.php 2021-08-29 08:51:02 +08:00
henrynopo
71f6b472e3
Update stocks.lang 2021-08-29 07:51:29 +08:00
Laurent Destailleur
3336b5c405 Fixed implementation for #18373 2021-08-28 21:19:04 +02:00
Laurent Destailleur
c188ef0438 Fixed implementation for #18373 2021-08-28 21:09:52 +02:00
Laurent Destailleur
20e681d025
Revert "[NEW] PDF Document ref in title option" 2021-08-28 20:59:12 +02:00
Laurent Destailleur
f2f3c5daf5
Merge pull request #18373 from bb2a/PDF_Ref_In_Title 
[NEW] PDF Document ref in title option
 2021-08-28 20:41:55 +02:00
Christian Foellmann
38a225a035 fix product nature on create 2021-08-28 20:28:09 +02:00
Laurent Destailleur
bd67b46138
Fix duplicate code 2021-08-28 20:18:26 +02:00
Laurent Destailleur
81a8efd856 Restore error message 2021-08-28 20:14:23 +02:00
Laurent Destailleur
8870662200
Merge pull request #18475 from OPEN-DSI/v14-fix-invoice-fetch-not-found-syslog-level 
FIX invoice fetch not found syslog debug level instead of error
 2021-08-28 20:12:45 +02:00
Laurent Destailleur
feb2e71f0c Fix regression 2021-08-28 18:59:12 +02:00
Laurent Destailleur
8ab9c96b7e Fix 0 insert instead of null 2021-08-28 18:56:48 +02:00
Laurent Destailleur
e2eaa9b46e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:54:48 +02:00
Laurent Destailleur
5f08ed84f8 Fix 0 insert instead of null 2021-08-28 18:53:57 +02:00
Laurent Destailleur
97ee69e88f Fix 0 insert instead of null 2021-08-28 18:52:43 +02:00
Gurvan Kervern
39fcc53fa7
Update peruser.php 2021-08-29 00:51:01 +08:00
Gurvan Kervern
5fd0e6ac28
Update eldy.lib.php 2021-08-29 00:50:00 +08:00
Laurent Destailleur
de44dcb691 Fix var init 2021-08-28 18:48:24 +02:00
Laurent Destailleur
e71ff148ba Fix phpcs 2021-08-28 18:42:26 +02:00
Laurent Destailleur
a8f4eef0f6
Merge pull request #18445 from erikvanberkum/develop 
Fix: TechnicalID displayed 2 times in both MO and BOM the PR hides 1.
 2021-08-28 18:40:54 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
8b996627eb
Merge pull request #18462 from grandoc/new_branch_22_08_2021 
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…
 2021-08-28 18:35:40 +02:00
Laurent Destailleur
79bd3e0b24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:40 +02:00
Laurent Destailleur
c1d3ddf10b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:06 +02:00
Laurent Destailleur
6afe9c88f6
Merge pull request #18491 from daraelmin/patch-3 
Fix : conditiion always wrong when on following link
 2021-08-28 18:21:37 +02:00
Laurent Destailleur
1c1caaccde
Update member.php 2021-08-28 18:21:23 +02:00
Laurent Destailleur
3ce5674b76 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-28 18:01:06 +02:00
Laurent Destailleur
978511e127 Update fournisseur.facture.class.php 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-08-28 17:59:45 +02:00
Laurent Destailleur
5ec286fdb7
Merge pull request #18500 from francisbesset/fix-fk_unit 
Fix bad comparison for fk_unit to avoid always null value for all case
 2021-08-28 17:57:26 +02:00
Laurent Destailleur
97064f1550
Update fournisseur.facture.class.php 2021-08-28 17:55:49 +02:00
Laurent Destailleur
fa2a4e4713
Merge pull request #18504 from vincentjdc/reception-list-printFieldListFrom-hook 
Add  hook printFieldListFrom to reception/list.php to allow add joins
 2021-08-28 17:44:53 +02:00
LVSInformatique
4f45228e7b Update list.php 2021-08-28 17:44:26 +02:00
Laurent Destailleur
ceea5cb76f
Merge pull request #18502 from plevray/patch-1 
Update list.php
 2021-08-28 17:43:52 +02:00
Laurent Destailleur
86af3ff3d7
Merge pull request #18492 from aspangaro/15a5 
NEW Task - Add From/to input on search date
 2021-08-28 17:43:15 +02:00
Laurent Destailleur
a5bb833a0a
Update peruser.php 2021-08-28 17:39:23 +02:00
Laurent Destailleur
301d7134b3
Merge branch 'develop' into patch-2 2021-08-28 17:37:54 +02:00
Laurent Destailleur
373db3a623 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 17:36:17 +02:00
Laurent Destailleur
5cd609e14e
Merge pull request #18507 from henrynopo/patch-5 
Customer Invoice - Multicurrency Remaining to Pay (updated)
 2021-08-28 17:36:01 +02:00
Laurent Destailleur
0a468e4ba9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 17:36:00 +02:00
Laurent Destailleur
4ba6b0059d Fix travis 2021-08-28 17:35:42 +02:00
Laurent Destailleur
881d176996 css 2021-08-28 17:30:53 +02:00
Laurent Destailleur
bb94ea7334 Fix debug car reception: Fill/reset link, colspan, translation 2021-08-28 17:24:05 +02:00
stickler-ci
63427638d8 Fixing style errors. 2021-08-28 14:54:16 +00:00
henrynopo
444786b34f
Update card.php 2021-08-28 22:52:06 +08:00
henrynopo
11497d4bf0
Update card.php 2021-08-28 22:38:17 +08:00
Laurent Destailleur
4c39816ce6
Merge pull request #18510 from henrynopo/patch-9 
Fix - edit shipment Qty both predefined product while batch and stock are not enabled
 2021-08-28 16:36:05 +02:00
stickler-ci
e60cf96c8e Fixing style errors. 2021-08-28 14:35:01 +00:00
Laurent Destailleur
31ca781236
Update card.php 2021-08-28 16:34:38 +02:00
stickler-ci
2ddebc123a Fixing style errors. 2021-08-28 14:32:44 +00:00
Laurent Destailleur
faf1d52d91
Update card.php 2021-08-28 16:32:22 +02:00
Laurent Destailleur
27f7ef5270
Merge pull request #18515 from mbinformatique68/develop 
NEW Added address field into contacts list
 2021-08-28 16:14:35 +02:00
Laurent Destailleur
0db67b40a0
Merge pull request #18525 from cfoellmann/PR/thirdparty-links 
change links for thirdparty to target the type customer|supplier tab
 2021-08-28 15:27:13 +02:00
Laurent Destailleur
fae0b3c8be
Update card.php 2021-08-28 15:26:36 +02:00
Laurent Destailleur
6b8f6acf32
Update card.php 2021-08-28 15:26:06 +02:00
Laurent Destailleur
28752ddca4 Fix concat 2021-08-28 15:19:54 +02:00
Laurent Destailleur
82eb118583
Merge pull request #18530 from FHenry/dev_more_inv_task_comment 
add hidden option to display date and duration in invoice generation from task time spent
 2021-08-28 15:15:21 +02:00
lmarcouiller
c509e3bc43 FIx error 500 on restler api PHP 8.0 2021-08-28 14:53:59 +02:00
Laurent Destailleur
5e94b1f1f9
Merge pull request #18512 from Hystepik/develop#1 
FIx error 500 on restler api PHP 8.0
 2021-08-28 14:53:11 +02:00
Laurent Destailleur
0e38e1e2c4 NEW Add hook hookGetEntity. 
Change name and param of hook
 2021-08-28 14:51:49 +02:00
Laurent Destailleur
9bed2557f5
Merge pull request #18514 from cfoellmann/PR/hook-functionGetEntity 
add hook 'functionGetEntity'
 2021-08-28 14:46:32 +02:00
Laurent Destailleur
2aa3eb3857
Merge pull request #18521 from Hystepik/develop#2 
Close #18074 : REST API New /order/{id}/shipment get & post
 2021-08-28 14:44:31 +02:00
Laurent Destailleur
049992aed4
Update api_orders.class.php 2021-08-28 14:44:13 +02:00
Laurent Destailleur
3585259b55
Update api_orders.class.php 2021-08-28 14:43:17 +02:00
Laurent Destailleur
d98390e675
Update api_orders.class.php 2021-08-28 14:42:31 +02:00
Laurent Destailleur
b6f6cd382d
Merge pull request #18523 from Hystepik/develop#4 
NEW : api for knowledgemanagement
 2021-08-28 14:35:29 +02:00
Laurent Destailleur
7d2ff42cd7
Merge pull request #18532 from defrance/patch-172 
Clean code (line in double)
 2021-08-28 14:34:20 +02:00
Laurent Destailleur
daf270c492
Merge pull request #18528 from elsp1991/feature/emailcollector_link_events_to_objects 
Close #18527 - Email collector link emails received to more objects
 2021-08-28 14:33:48 +02:00
Laurent Destailleur
f359bfaaf2
Update emailcollector.class.php 2021-08-28 14:31:56 +02:00
Laurent Destailleur
45515fa8b2 fix css 2021-08-28 14:28:50 +02:00
BENKE Charlene
afb8a86aff
Clean code (line in double) 2021-08-28 14:14:48 +02:00
Laurent Destailleur
20d0b0c564 Fix link in some tooltips 2021-08-28 13:56:59 +02:00
Laurent Destailleur
1fec53e7f2 Fix generate the phpunit file from modulebuilder 2021-08-28 13:37:35 +02:00
Laurent Destailleur
b2791c3103 Fix generate the phpunit file from modulebuilder 2021-08-28 13:36:47 +02:00
Laurent Destailleur
f825d3fda4 Trans 2021-08-28 13:27:55 +02:00
Laurent Destailleur
7001388159 Fix warning event late on tab Resources 2021-08-28 05:40:14 +02:00
Laurent Destailleur
64c4e25c02 Fix warning 2021-08-28 05:40:07 +02:00
Laurent Destailleur
aab6281ba6 Clean code 2021-08-28 05:38:40 +02:00
Laurent Destailleur
99b1a59a1e Fix warning event late on tab Resources 2021-08-28 05:38:12 +02:00
Laurent Destailleur
1b859fe723 Fix warning 2021-08-28 05:24:53 +02:00
Laurent Destailleur
c932ea0710 Fix syntax error 2021-08-28 05:06:14 +02:00