Commit Graph

102043 Commits

Author SHA1 Message Date
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
389660cb3a
Merge pull request #18506 from henrynopo/patch-2
Supplier Invoice - Multicurrency remainder to pay (updated)
2021-08-28 17:38:01 +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
12ce4bf7af
Merge pull request #18522 from Hystepik/develop_v13#1
Fix #18519 : Modulebuilder api permission
2021-08-28 14:39:13 +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